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

Merge branch 'zmkfirmware:main' into main

Browse source
This commit is contained in:
Ladislav Benc 2022-11-19 23:17:57 +01:00 • committed by GitHub
commit 9028bc4481
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/boards/seeeduino_xiao_ble.overlay
View file

@ -16,7 +16,7 @@
label = "BATTERY";
io-channels = <&adc 7>;
power-gpios = <&gpio0 14 (GPIO_OPEN_DRAIN | GPIO_ACTIVE_LOW)>;
output-ohms = <1000000>;
output-ohms = <510000>;
full-ohms = <(1000000 + 510000)>;
};
};

1
app/src/usb.c
View file

@ -34,6 +34,7 @@ enum zmk_usb_conn_state zmk_usb_get_conn_state() {
case USB_DC_SUSPEND:
case USB_DC_CONFIGURED:
case USB_DC_RESUME:
case USB_DC_CLEAR_HALT:
return ZMK_USB_CONN_HID;
case USB_DC_DISCONNECTED: