Fix some known bugs.

nuphy-src · Jan 1, 2024 · 1389ecc · 1389ecc
1 parent ddd97c6
commit 1389ecc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/keyboards/nuphy/air75_v2/ansi/info.json b/keyboards/nuphy/air75_v2/ansi/info.json
@@ -4,7 +4,7 @@
     "usb":{
         "vid": "0x19F5",
         "pid": "0x3245",
-        "device_version": "0.0.1",
+        "device_version": "0.0.2",
         "no_startup_check": true
     },
     "features": {
@@ -92,7 +92,6 @@
 
             {"matrix": [1, 16], "x": 150, "y": 10, "flags": 4},
             {"matrix": [1, 13], "x": 130, "y": 10, "flags": 4},
-            {"matrix": [1, 13], "x": 130, "y": 10, "flags": 4},
             {"matrix": [1, 12], "x": 120, "y": 10, "flags": 4},
             {"matrix": [1, 11], "x": 110, "y": 10, "flags": 4},
             {"matrix": [1, 10], "x": 100, "y": 10, "flags": 4},

diff --git a/keyboards/nuphy/air75_v2/ansi/keymaps/via/keymap.c b/keyboards/nuphy/air75_v2/ansi/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // layer Mac
 [0] = LAYOUT_ansi_84(
-	KC_ESC, 	KC_BRID,  	KC_BRIU,  	MAC_TASK, 	MAC_SEARCH, MAC_VOICE,  MAC_CONSOLE,KC_MPRV,  	KC_MPLY,  	KC_MNXT, 	KC_MUTE, 	KC_VOLD, 	KC_VOLU, 	MAC_PRTA,	KC_INS,		KC_DEL,
+	KC_ESC, 	KC_BRID,  	KC_BRIU,  	MAC_TASK, 	MAC_SEARCH, MAC_VOICE,  MAC_DND,    KC_MPRV,  	KC_MPLY,  	KC_MNXT, 	KC_MUTE, 	KC_VOLD, 	KC_VOLU, 	MAC_PRTA,	KC_INS,		KC_DEL,
 	KC_GRV, 	KC_1,   	KC_2,   	KC_3,  		KC_4,   	KC_5,   	KC_6,   	KC_7,   	KC_8,   	KC_9,  		KC_0,   	KC_MINS,	KC_EQL, 				KC_BSPC,	KC_PGUP,
 	KC_TAB, 	KC_Q,   	KC_W,   	KC_E,  		KC_R,   	KC_T,   	KC_Y,   	KC_U,   	KC_I,   	KC_O,  		KC_P,   	KC_LBRC,	KC_RBRC, 				KC_BSLS,	KC_PGDN,
 	KC_CAPS,	KC_A,   	KC_S,   	KC_D,  		KC_F,   	KC_G,   	KC_H,   	KC_J,   	KC_K,   	KC_L,  		KC_SCLN,	KC_QUOT, 	 						KC_ENT,		KC_HOME,

diff --git a/keyboards/nuphy/air75_v2/ansi/readme.md b/keyboards/nuphy/air75_v2/ansi/readme.md
@@ -1,7 +1,7 @@
 c# NuPhy Air75 V2
 
 *NuPhy Air75 V2 is a standard 84 key keyboard.*
-![NuPhy Air75 V2](https://i.imgur.com/D3XVyl3h.jpeg)
+![NuPhy Air75 V2](https://bit.ly/486pSkN)
 
 * Keyboard Maintainer: [nuphy](https://github.com/nuphy-src)
 * Hardware Supported: NuPhy Air75 V2 PCB

diff --git a/keyboards/nuphy/air75_v2/ansi/rf.c b/keyboards/nuphy/air75_v2/ansi/rf.c
@@ -181,10 +181,10 @@ void uart_send_report_func(void)
         memcpy(bytekb_report_buf, keyboard_report->raw, 8);
         uart_send_report(CMD_RPT_BYTE_KB, bytekb_report_buf, 8);
     }
-    else if ((dev_info.sys_sw_state == SYS_SW_WIN) && (memcmp(bitkb_report_buf, &keyboard_report->nkro.mods, 16))) {
+    else if ((dev_info.sys_sw_state == SYS_SW_WIN) && (memcmp(bitkb_report_buf, &keyboard_report->nkro.mods, KEYBOARD_REPORT_BITS+1))) {
         no_act_time = 0;
-        uart_auto_nkey_send(bitkb_report_buf, &keyboard_report->nkro.mods, 16);
-        memcpy(&bitkb_report_buf[0], &keyboard_report->nkro.mods, 16);
+        uart_auto_nkey_send(bitkb_report_buf, &keyboard_report->nkro.mods, KEYBOARD_REPORT_BITS+1);
+        memcpy(&bitkb_report_buf[0], &keyboard_report->nkro.mods, KEYBOARD_REPORT_BITS+1);
     }
     else if (timer_elapsed32(interval_timer) > 100) {
         interval_timer = timer_read32();