kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge

Browse source
This commit is contained in:
Ryan P. Bitanga 2022-09-05 22:33:22 +08:00
parent e7afd30a18
commit dce568aac1
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/usb.c
View file

@ -33,6 +33,7 @@ enum zmk_usb_conn_state zmk_usb_get_conn_state() {
switch (usb_status) { switch (usb_status) {
case USB_DC_SUSPEND: case USB_DC_SUSPEND:
case USB_DC_CONFIGURED: case USB_DC_CONFIGURED:
case USB_DC_SOF:
return ZMK_USB_CONN_HID; return ZMK_USB_CONN_HID;
case USB_DC_DISCONNECTED: case USB_DC_DISCONNECTED:

11
app/src/usb_hid.c
View file

@ -65,11 +65,6 @@ static uint8_t hid_protocol = HID_PROTOCOL_REPORT;
void zmk_usb_set_proto_cb(const struct device *dev, uint8_t protocol) { void zmk_usb_set_proto_cb(const struct device *dev, uint8_t protocol) {
hid_protocol = protocol; hid_protocol = protocol;
} }
#if IS_ENABLED(CONFIG_ZMK_USB_BOOT)
#endif
#endif #endif
static const struct device *hid_dev; static const struct device *hid_dev;
@ -142,15 +137,15 @@ static int zmk_usb_hid_init(const struct device *_arg) {
} }
#if IS_ENABLED(CONFIG_ZMK_USB_BOOT) #if IS_ENABLED(CONFIG_ZMK_USB_BOOT)
static int hid_listener(const zmk_event_t *eh) { static int usb_hid_listener(const zmk_event_t *eh) {
if (as_zmk_usb_conn_state_changed(eh) && zmk_usb_get_status() == USB_DC_RESET) { if (as_zmk_usb_conn_state_changed(eh) && zmk_usb_get_status() == USB_DC_RESET) {
hid_protocol = HID_PROTOCOL_REPORT; hid_protocol = HID_PROTOCOL_REPORT;
} }
return 0; return 0;
} }
ZMK_LISTENER(hid_listener, hid_listener); ZMK_LISTENER(usb_hid_listener, usb_hid_listener);
ZMK_SUBSCRIPTION(hid_listener, zmk_usb_conn_state_changed); ZMK_SUBSCRIPTION(usb_hid_listener, zmk_usb_conn_state_changed);
#endif #endif
SYS_INIT(zmk_usb_hid_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY); SYS_INIT(zmk_usb_hid_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);