From 1389eccac3457edd52b100d2c78a7a7fde90dd77 Mon Sep 17 00:00:00 2001 From: nuphy-src Date: Mon, 1 Jan 2024 22:34:06 +0800 Subject: [PATCH] Fix some known bugs. --- keyboards/nuphy/air75_v2/ansi/info.json | 3 +-- keyboards/nuphy/air75_v2/ansi/keymaps/via/keymap.c | 2 +- keyboards/nuphy/air75_v2/ansi/readme.md | 2 +- keyboards/nuphy/air75_v2/ansi/rf.c | 6 +++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/keyboards/nuphy/air75_v2/ansi/info.json b/keyboards/nuphy/air75_v2/ansi/info.json index 99b7b77b3d5c..ffe2dea7fbb3 100644 --- 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 index 0b1cdadf8f90..b0b22c8e8d01 100644 --- 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 index f6f81909aadb..5d0c7735be4b 100644 --- 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 index 1dbe7a564222..0be290db6239 100644 --- 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();