gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-17 13:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2025-05-14 12:01:47 +00:00
commit d4d7ea8375
7 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keyboards/dlip/haritev2/dual_cirque/keyboard.json Normal file
View File

@ -0,0 +1,5 @@
{
"features": {
"pointing_device": true
}
}

2
keyboards/dlip/haritev2/dual_cirque/rules.mk
View File

@ -1,3 +1 @@
POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi POINTING_DEVICE_DRIVER = cirque_pinnacle_spi

3
keyboards/dlip/haritev2/halconf.h
View File

@ -3,8 +3,5 @@
#pragma once #pragma once
#define HAL_USE_SPI TRUE #define HAL_USE_SPI TRUE
#define SPI_USE_WAIT TRUE
#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#include_next <halconf.h> #include_next <halconf.h>

3
keyboards/dlip/haritev2/info.json
View File

@ -6,8 +6,6 @@
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"command": false,
"console": false,
"extrakey": true, "extrakey": true,
"mousekey": true, "mousekey": true,
"nkro": true "nkro": true
@ -23,7 +21,6 @@
"driver": "vendor" "driver": "vendor"
} }
}, },
"url": "",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0",
"pid": "0x4832", "pid": "0x4832",

4
keyboards/dlip/haritev2/thumbstick_pmw3389/keyboard.json
View File

@ -1,8 +1,10 @@
{ {
"features": { "features": {
"joystick": true "joystick": true,
"pointing_device": true
}, },
"joystick": { "joystick": {
"driver": "analog",
"axes": { "axes": {
"x": { "x": {
"high": 938, "high": 938,

2
keyboards/dlip/haritev2/thumbstick_pmw3389/rules.mk
View File

@ -1,3 +1 @@
POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = pmw3389 POINTING_DEVICE_DRIVER = pmw3389
JOYSTICK_DRIVER = analog

12
tmk_core/protocol/report.c
View File

@ -32,7 +32,7 @@ uint8_t has_anykey(void) {
uint8_t* p = keyboard_report->keys; uint8_t* p = keyboard_report->keys;
uint8_t lp = sizeof(keyboard_report->keys); uint8_t lp = sizeof(keyboard_report->keys);
#ifdef NKRO_ENABLE #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; p = nkro_report->bits;
lp = sizeof(nkro_report->bits); lp = sizeof(nkro_report->bits);
} }
@ -49,7 +49,7 @@ uint8_t has_anykey(void) {
*/ */
uint8_t get_first_key(void) { uint8_t get_first_key(void) {
#ifdef NKRO_ENABLE #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; uint8_t i = 0;
for (; i < NKRO_REPORT_BITS && !nkro_report->bits[i]; i++) for (; i < NKRO_REPORT_BITS && !nkro_report->bits[i]; i++)
; ;
@ -69,7 +69,7 @@ bool is_key_pressed(uint8_t key) {
return false; return false;
} }
#ifdef NKRO_ENABLE #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) { if ((key >> 3) < NKRO_REPORT_BITS) {
return nkro_report->bits[key >> 3] & 1 << (key & 7); return nkro_report->bits[key >> 3] & 1 << (key & 7);
} else { } 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) { void add_key_to_report(uint8_t key) {
#ifdef NKRO_ENABLE #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); add_key_bit(nkro_report, key);
return; return;
} }
@ -165,7 +165,7 @@ void add_key_to_report(uint8_t key) {
*/ */
void del_key_from_report(uint8_t key) { void del_key_from_report(uint8_t key) {
#ifdef NKRO_ENABLE #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); del_key_bit(nkro_report, key);
return; return;
} }
@ -180,7 +180,7 @@ void del_key_from_report(uint8_t key) {
void clear_keys_from_report(void) { void clear_keys_from_report(void) {
// not clear mods // not clear mods
#ifdef NKRO_ENABLE #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)); memset(nkro_report->bits, 0, sizeof(nkro_report->bits));
return; return;
} }