update

nuphy-src · Jun 6, 2024 · 07b64a6 · 07b64a6
1 parent 4cb72cd
commit 07b64a6
Show file tree

Hide file tree

Showing 8 changed files with 427 additions and 294 deletions.
diff --git a/keyboards/nuphy/air60_v2/ansi/ansi.c b/keyboards/nuphy/air60_v2/ansi/ansi.c
@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ansi.h"
 #include "usb_main.h"
+#include "rf_driver.h"
 
 user_config_t user_config;
 DEV_INFO_STRUCT dev_info =
@@ -65,6 +66,7 @@ extern uint8_t side_speed;
 extern uint8_t side_rgb;
 extern uint8_t side_colour;
 extern report_keyboard_t *keyboard_report;
+extern report_nkro_t *nkro_report;
 extern uint8_t uart_bit_report_buf[32];
 extern uint8_t bitkb_report_buf[32];
 extern uint8_t bytekb_report_buf[8];
@@ -213,8 +215,8 @@ void m_break_all_key(void)
     clear_keyboard();
 
     keymap_config.nkro = 1;
-    memset(keyboard_report, 0, sizeof(report_keyboard_t));
-    host_keyboard_send(keyboard_report);
+    memset(nkro_report, 0, sizeof(report_nkro_t));
+    host_nkro_send(nkro_report);
     wait_ms(10);
 
     keymap_config.nkro = 0;
@@ -257,7 +259,7 @@ static void switch_dev_link(uint8_t mode)
     }
     else {
         host_mode = HOST_RF_TYPE;
-        host_set_driver(0);
+        host_set_driver(&rf_host_driver);
     }
 }
 
@@ -330,7 +332,7 @@ void dial_sw_scan(void)
         f_dial_sw_init_ok = 1;
         f_first           = false;
         if (dev_info.link_mode != LINK_USB) {
-            host_set_driver(0);
+            host_set_driver(&rf_host_driver);
         }
     }
 }

diff --git a/keyboards/nuphy/air60_v2/ansi/config.h b/keyboards/nuphy/air60_v2/ansi/config.h
@@ -71,7 +71,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_LED_COUNT       (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
 #define RGB_MATRIX_DEFAULT_MODE    RGB_MATRIX_CYCLE_LEFT_RIGHT  // Sets the default mode, if none has been set
-#define RGB_DISABLE_WHEN_USB_SUSPENDED                          // turn off effects when suspended
+#define RGB_MATRIX_SLEEP                          // turn off effects when suspended
 
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES