Merge branch 'main' of https://github.com/zblesk/zmk
This commit is contained in:
commit
f5f1db3951
2 changed files with 2 additions and 1 deletions
|
@ -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)>;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Add table
Reference in a new issue