commit halo96 v2

keyboards/nuphy/air60_v2/ansi/ansi.c

@@ -87,7 +87,7 @@ extern void device_reset_show(void);
 extern void device_reset_init(void);
 extern void rgb_test_show(void);
 
-extern void light_speed_contol(uint8_t fast);
+extern void light_speed_control(uint8_t fast);
 extern void light_level_control(uint8_t brighten);
 extern void side_colour_control(uint8_t dir);
 extern void side_mode_control(uint8_t dir);
@@ -400,8 +400,12 @@ void m_power_on_dial_sw_scan(void)
 /**
  * @brief  qmk process record
  */
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
+// bool process_record_user(uint16_t keycode, keyrecord_t *record)
+// {
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if(!process_record_user(keycode, record)){
+        return false;
+    }
     switch (keycode) {
         case RF_DFU:
             if (record->event.pressed) {
@@ -594,13 +598,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
 
         case SIDE_SPI:
             if (record->event.pressed) {
-                light_speed_contol(1);
+                light_speed_control(1);
             }
             return false;
 
         case SIDE_SPD:
             if (record->event.pressed) {
-                light_speed_contol(0);
+                light_speed_control(0);
             }
             return false;
 
@@ -699,7 +703,7 @@ void timer_pro(void)
  */
 void m_londing_eeprom_data(void)
 {
-    eeconfig_read_user_datablock(&user_config);
+    eeconfig_read_kb_datablock(&user_config);
     if (user_config.default_brightness_flag != 0xA5) {
         rgb_matrix_sethsv(255, 255, RGB_MATRIX_MAXIMUM_BRIGHTNESS - RGB_MATRIX_VAL_STEP * 2);
         user_config.default_brightness_flag = 0xA5;
@@ -723,7 +727,7 @@ void m_londing_eeprom_data(void)
 /**
    qmk keyboard post init
  */
-void keyboard_post_init_user(void)
+void keyboard_post_init_kb(void)
 {
     m_gpio_init();
     rf_uart_init();
@@ -733,23 +737,27 @@ void keyboard_post_init_user(void)
     m_break_all_key();
     m_londing_eeprom_data();
     m_power_on_dial_sw_scan();
+    keyboard_post_init_user();
 }
 
 /**
    rgb_matrix_indicators_user
  */
-bool rgb_matrix_indicators_user(void)
+bool rgb_matrix_indicators_kb(void)
 {
+    if(!rgb_matrix_indicators_user()){
+        return false;
+    }
     if(f_bat_num_show) {
         num_led_show();
     }
     return true;
 }
 
 /**
-   housekeeping_task_user
+   housekeeping_task_kb
  */
-void housekeeping_task_user(void)
+void housekeeping_task_kb(void)
 {
     timer_pro();
 

keyboards/nuphy/air60_v2/ansi/ansi.h

@@ -87,7 +87,7 @@ typedef enum {
 #define RF_DISCONNECT       4
 #define RF_SLEEP            5
 #define RF_SNIF             6
-#define RF_INVAILD          0XFE
+#define RF_INVALID          0XFE
 #define RF_ERR_STATE        0XFF
 
 #define CMD_POWER_UP     0XF0

keyboards/nuphy/air60_v2/ansi/rf.c

@@ -269,7 +269,7 @@ void RF_Protocol_Receive(void) {
                     if (dev_info.rf_charge & 0x01) dev_info.rf_baterry = 100;
                 }
                 else {
-                    if (dev_info.rf_state != RF_INVAILD) {
+                    if (dev_info.rf_state != RF_INVALID) {
                         if (error_cnt >= 5) {
                             error_cnt      = 0;
                             f_send_channel = 1;
@@ -548,7 +548,7 @@ void dev_sts_sync(void) {
 /**
  * @brief Uart send bytes.
  * @param Buffer data buf
- * @param Length data lenght
+ * @param Length data length
  */
 void UART_Send_Bytes(uint8_t *Buffer, uint32_t Length) {
     writePinLow(NRF_WAKEUP_PIN);
@@ -563,7 +563,7 @@ void UART_Send_Bytes(uint8_t *Buffer, uint32_t Length) {
 /**
  * @brief get checksum.
  * @param buf data buf
- * @param len data lenght
+ * @param len data length
  */
 uint8_t get_checksum(uint8_t *buf, uint8_t len) {
     uint8_t i;

keyboards/nuphy/air60_v2/ansi/rules.mk

@@ -1,6 +1,3 @@
-SRC += side.c
-SRC += rf.c
-SRC += sleep.c
-SRC += rf_driver.c
+SRC += side.c rf.c sleep.c rf_driver.c
 UART_DRIVER_REQUIRED = yes
 

keyboards/nuphy/air60_v2/ansi/side.c

@@ -151,7 +151,7 @@ void light_level_control(uint8_t brighten)
  * @param  dir: 0 - decrease, 1 - increase.
  * @note  save to eeprom.
  */
-void light_speed_contol(uint8_t fast)
+void light_speed_control(uint8_t fast)
 {
     if ((side_speed) > LIGHT_SPEED_MAX)
         (side_speed) = LIGHT_SPEED_MAX / 2;

keyboards/nuphy/air75_v2/ansi/ansi.c

@@ -73,8 +73,8 @@ void    uart_send_report_func(void);
 void    uart_receive_pro(void);
 uint8_t uart_send_cmd(uint8_t cmd, uint8_t ack_cnt, uint8_t delayms);
 void    uart_send_report(uint8_t report_type, uint8_t *report_buf, uint8_t report_size);
-void    side_speed_contol(uint8_t dir);
-void    side_light_contol(uint8_t dir);
+void    side_speed_control(uint8_t dir);
+void    side_light_control(uint8_t dir);
 void    side_colour_control(uint8_t dir);
 void    side_mode_control(uint8_t dir);
 void    side_led_show(void);
@@ -420,7 +420,7 @@ void timer_pro(void) {
  * @brief  londing eeprom data.
  */
 void londing_eeprom_data(void) {
-    eeconfig_read_user_datablock(&user_config);
+    eeconfig_read_kb_datablock(&user_config);
     if (user_config.default_brightness_flag != 0xA5) {
         /* first power on, set rgb matrix brightness at middle level*/
         rgb_matrix_sethsv(255, 255, RGB_MATRIX_MAXIMUM_BRIGHTNESS - RGB_MATRIX_VAL_STEP * 2);
@@ -442,7 +442,10 @@ void londing_eeprom_data(void) {
 }
 
 /* qmk process record */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if(!process_record_user(keycode, record)){
+        return false;
+    }
     no_act_time = 0;
     switch (keycode) {
         case RF_DFU:
@@ -617,13 +620,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
         case SIDE_VAI:
             if (record->event.pressed) {
-                side_light_contol(1);
+                side_light_control(1);
             }
             return false;
 
         case SIDE_VAD:
             if (record->event.pressed) {
-                side_light_contol(0);
+                side_light_control(0);
             }
             return false;
 
@@ -641,13 +644,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
         case SIDE_SPI:
             if (record->event.pressed) {
-                side_speed_contol(1);
+                side_speed_control(1);
             }
             return false;
 
         case SIDE_SPD:
             if (record->event.pressed) {
-                side_speed_contol(0);
+                side_speed_control(0);
             }
             return false;
 
@@ -697,8 +700,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 
-bool rgb_matrix_indicators_user(void)
+bool rgb_matrix_indicators_kb(void)
 {
+    if(!rgb_matrix_indicators_user()){
+        return false;
+    }
     if(f_bat_num_show) {
         num_led_show();
     }
@@ -707,7 +713,7 @@ bool rgb_matrix_indicators_user(void)
 }
 
 /* qmk keyboard post init */
-void keyboard_post_init_user(void) {
+void keyboard_post_init_kb(void) {
     gpio_init();
     rf_uart_init();
     wait_ms(500);
@@ -716,10 +722,11 @@ void keyboard_post_init_user(void) {
     break_all_key();
     dial_sw_fast_scan();
     londing_eeprom_data();
+    keyboard_post_init_user();
 }
 
 /* qmk housekeeping task */
-void housekeeping_task_user(void) {
+void housekeeping_task_kb(void) {
     timer_pro();
 
     uart_receive_pro();

keyboards/nuphy/air75_v2/ansi/ansi.h

@@ -77,7 +77,7 @@ typedef enum {
 #define RF_DISCONNECT           4
 #define RF_SLEEP                5
 #define RF_SNIF                 6
-#define RF_INVAILD              0XFE
+#define RF_INVALID              0XFE
 #define RF_ERR_STATE            0XFF
 
 #define CMD_POWER_UP            0XF0

keyboards/nuphy/air75_v2/ansi/rf.c

@@ -256,7 +256,7 @@ void RF_Protocol_Receive(void) {
                     if (dev_info.rf_charge & 0x01) dev_info.rf_baterry = 100;
                 }
                 else {
-                    if (dev_info.rf_state != RF_INVAILD) {
+                    if (dev_info.rf_state != RF_INVALID) {
                         if (error_cnt >= 5) {
                             error_cnt      = 0;
                             f_send_channel = 1;
@@ -535,7 +535,7 @@ void dev_sts_sync(void) {
 /**
  * @brief Uart send bytes.
  * @param Buffer data buf
- * @param Length data lenght
+ * @param Length data length
  */
 void UART_Send_Bytes(uint8_t *Buffer, uint32_t Length) {
     writePinLow(NRF_WAKEUP_PIN);
@@ -550,7 +550,7 @@ void UART_Send_Bytes(uint8_t *Buffer, uint32_t Length) {
 /**
  * @brief get checksum.
  * @param buf data buf
- * @param len data lenght
+ * @param len data length
  */
 uint8_t get_checksum(uint8_t *buf, uint8_t len) {
     uint8_t i;

keyboards/nuphy/air75_v2/ansi/rules.mk

@@ -1,7 +1,3 @@
-SRC += side.c
-SRC += rf.c
-SRC += sleep.c
-SRC += side_driver.c
-SRC += rf_driver.c
+SRC += side.c rf.c sleep.c side_driver.c rf_driver.c
 UART_DRIVER_REQUIRED = yes
 

keyboards/nuphy/air75_v2/ansi/side.c

@@ -109,7 +109,7 @@ void side_rgb_refresh(void) {
  * @param  dir: 0 - decrease, 1 - increase.
  * @note  save to eeprom.
  */
-void side_light_contol(uint8_t dir) {
+void side_light_control(uint8_t dir) {
     if (dir) {
         if (side_light > SIDE_BRIGHT_MAX) {
             return;
@@ -130,7 +130,7 @@ void side_light_contol(uint8_t dir) {
  * @param  dir: 0 - decrease, 1 - increase.
  * @note  save to eeprom.
  */
-void side_speed_contol(uint8_t dir) {
+void side_speed_control(uint8_t dir) {
     if ((side_speed) > SIDE_SPEED_MAX) (side_speed) = SIDE_SPEED_MAX / 2;
 
     if (dir) {

keyboards/nuphy/air96_v2/ansi/ansi.c

@@ -90,9 +90,8 @@ extern uint8_t uart_bit_report_buf[32];
 extern uint8_t bitkb_report_buf[32];
 extern uint8_t bytekb_report_buf[8];
 
-extern void eeconfig_read_user_datablock(void *data);
 extern void eeconfig_update_user_datablock(const void *data);
-extern void light_speed_contol(uint8_t fast);
+extern void light_speed_control(uint8_t fast);
 extern void light_level_control(uint8_t brighten);
 extern void side_colour_control(uint8_t dir);
 extern void side_mode_control(uint8_t dir);
@@ -397,8 +396,10 @@ void m_power_on_dial_sw_scan(void)
 /**
  * @brief  qmk process record
  */
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if(!process_record_user(keycode, record)){
+        return false;
+    }
     switch (keycode) {
         case RF_DFU:
             if (record->event.pressed) {
@@ -593,13 +594,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)
 
         case SIDE_SPI:
             if (record->event.pressed) {
-                light_speed_contol(1);
+                light_speed_control(1);
             }
             return false;
 
         case SIDE_SPD:
             if (record->event.pressed) {
-                light_speed_contol(0);
+                light_speed_control(0);
             }
             return false;
 
@@ -687,7 +688,7 @@ void timer_pro(void)
  */
 void m_londing_eeprom_data(void)
 {
-    eeconfig_read_user_datablock(&user_config);
+    eeconfig_read_kb_datablock(&user_config);
     if (user_config.default_brightness_flag != 0xA5) {
         rgb_matrix_sethsv(255, 255, RGB_MATRIX_MAXIMUM_BRIGHTNESS - RGB_MATRIX_VAL_STEP * 2); 
         user_config.default_brightness_flag = 0xA5;
@@ -711,7 +712,7 @@ void m_londing_eeprom_data(void)
 /** 
  *   qmk keyboard post init
  */
-void keyboard_post_init_user(void)
+void keyboard_post_init_kb(void)
 {
     m_gpio_init(); 
     rf_uart_init();               
@@ -721,23 +722,27 @@ void keyboard_post_init_user(void)
     m_break_all_key();           
     m_londing_eeprom_data();    
     m_power_on_dial_sw_scan();  
+    keyboard_post_init_user();
 }
 
 /**
    rgb_matrix_indicators_user
  */
-bool rgb_matrix_indicators_user(void)
+bool rgb_matrix_indicators_kb(void)
 {
+    if(!rgb_matrix_indicators_user()){
+        return false;
+    }
     if(f_bat_num_show) {
         num_led_show();
     }
     return true;
 }
 
 /**
-   housekeeping_task_user
+   housekeeping_task_kb
  */
-void housekeeping_task_user(void)
+void housekeeping_task_kb(void)
 {
     timer_pro();