From 8c108efb0d72d7ef6c735c25295538968c68af99 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 14 May 2025 13:00:33 +0100 Subject: [PATCH 1/2] dlip/haritev2 - Post merge fixes (#25264) --- keyboards/dlip/haritev2/dual_cirque/keyboard.json | 5 +++++ keyboards/dlip/haritev2/dual_cirque/rules.mk | 2 -- keyboards/dlip/haritev2/halconf.h | 3 --- keyboards/dlip/haritev2/info.json | 3 --- keyboards/dlip/haritev2/thumbstick_pmw3389/keyboard.json | 4 +++- keyboards/dlip/haritev2/thumbstick_pmw3389/rules.mk | 2 -- 6 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 keyboards/dlip/haritev2/dual_cirque/keyboard.json diff --git a/keyboards/dlip/haritev2/dual_cirque/keyboard.json b/keyboards/dlip/haritev2/dual_cirque/keyboard.json new file mode 100644 index 00000000000..2224a5d894f --- /dev/null +++ b/keyboards/dlip/haritev2/dual_cirque/keyboard.json @@ -0,0 +1,5 @@ +{ + "features": { + "pointing_device": true + } +} diff --git a/keyboards/dlip/haritev2/dual_cirque/rules.mk b/keyboards/dlip/haritev2/dual_cirque/rules.mk index 01e5b00480f..fb5d6497359 100644 --- a/keyboards/dlip/haritev2/dual_cirque/rules.mk +++ b/keyboards/dlip/haritev2/dual_cirque/rules.mk @@ -1,3 +1 @@ -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi - diff --git a/keyboards/dlip/haritev2/halconf.h b/keyboards/dlip/haritev2/halconf.h index 895fcc3c8c7..102ec51a6be 100644 --- a/keyboards/dlip/haritev2/halconf.h +++ b/keyboards/dlip/haritev2/halconf.h @@ -3,8 +3,5 @@ #pragma once #define HAL_USE_SPI TRUE -#define SPI_USE_WAIT TRUE -#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD #include_next - diff --git a/keyboards/dlip/haritev2/info.json b/keyboards/dlip/haritev2/info.json index df7b9035e5e..b7e12b89d51 100644 --- a/keyboards/dlip/haritev2/info.json +++ b/keyboards/dlip/haritev2/info.json @@ -6,8 +6,6 @@ "diode_direction": "COL2ROW", "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, "nkro": true @@ -23,7 +21,6 @@ "driver": "vendor" } }, - "url": "", "usb": { "device_version": "1.0.0", "pid": "0x4832", diff --git a/keyboards/dlip/haritev2/thumbstick_pmw3389/keyboard.json b/keyboards/dlip/haritev2/thumbstick_pmw3389/keyboard.json index 5ed8b2fe5ef..687c0ea3a98 100644 --- a/keyboards/dlip/haritev2/thumbstick_pmw3389/keyboard.json +++ b/keyboards/dlip/haritev2/thumbstick_pmw3389/keyboard.json @@ -1,8 +1,10 @@ { "features": { - "joystick": true + "joystick": true, + "pointing_device": true }, "joystick": { + "driver": "analog", "axes": { "x": { "high": 938, diff --git a/keyboards/dlip/haritev2/thumbstick_pmw3389/rules.mk b/keyboards/dlip/haritev2/thumbstick_pmw3389/rules.mk index 07df2b48b20..8ff6b63653a 100644 --- a/keyboards/dlip/haritev2/thumbstick_pmw3389/rules.mk +++ b/keyboards/dlip/haritev2/thumbstick_pmw3389/rules.mk @@ -1,3 +1 @@ -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pmw3389 -JOYSTICK_DRIVER = analog From cd95294a25fba190e6b3383200e178ffd0eab8d0 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 14 May 2025 13:01:08 +0100 Subject: [PATCH 2/2] Remove more USB only branches from NKRO handling (#25263) --- tmk_core/protocol/report.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tmk_core/protocol/report.c b/tmk_core/protocol/report.c index 6203a3116bb..f68334adeb2 100644 --- a/tmk_core/protocol/report.c +++ b/tmk_core/protocol/report.c @@ -32,7 +32,7 @@ uint8_t has_anykey(void) { uint8_t* p = keyboard_report->keys; uint8_t lp = sizeof(keyboard_report->keys); #ifdef NKRO_ENABLE - if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) { + if (host_can_send_nkro() && keymap_config.nkro) { p = nkro_report->bits; lp = sizeof(nkro_report->bits); } @@ -49,7 +49,7 @@ uint8_t has_anykey(void) { */ uint8_t get_first_key(void) { #ifdef NKRO_ENABLE - if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) { + if (host_can_send_nkro() && keymap_config.nkro) { uint8_t i = 0; for (; i < NKRO_REPORT_BITS && !nkro_report->bits[i]; i++) ; @@ -69,7 +69,7 @@ bool is_key_pressed(uint8_t key) { return false; } #ifdef NKRO_ENABLE - if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) { + if (host_can_send_nkro() && keymap_config.nkro) { if ((key >> 3) < NKRO_REPORT_BITS) { return nkro_report->bits[key >> 3] & 1 << (key & 7); } else { @@ -151,7 +151,7 @@ void del_key_bit(report_nkro_t* nkro_report, uint8_t code) { */ void add_key_to_report(uint8_t key) { #ifdef NKRO_ENABLE - if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) { + if (host_can_send_nkro() && keymap_config.nkro) { add_key_bit(nkro_report, key); return; } @@ -165,7 +165,7 @@ void add_key_to_report(uint8_t key) { */ void del_key_from_report(uint8_t key) { #ifdef NKRO_ENABLE - if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) { + if (host_can_send_nkro() && keymap_config.nkro) { del_key_bit(nkro_report, key); return; } @@ -180,7 +180,7 @@ void del_key_from_report(uint8_t key) { void clear_keys_from_report(void) { // not clear mods #ifdef NKRO_ENABLE - if (usb_device_state_get_protocol() == USB_PROTOCOL_REPORT && keymap_config.nkro) { + if (host_can_send_nkro() && keymap_config.nkro) { memset(nkro_report->bits, 0, sizeof(nkro_report->bits)); return; }