Merge branch 'main' into bluetooth/battery-reporting

This commit is contained in:
Nick Winans
2020-10-23 00:55:50 -05:00
committed by GitHub
159 changed files with 22131 additions and 4208 deletions

View File

@@ -25,6 +25,12 @@
label = "Blue LED";
};
};
ext-power {
compatible = "zmk,ext-power-generic";
label = "EXT_POWER";
control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
};
vbatt {
compatible = "zmk,battery-voltage-divider";
@@ -33,7 +39,10 @@
output-ohms = <2000000>;
full-ohms = <(2000000 + 820000)>;
};
};
&adc {
status = "okay";
};
&gpio0 {