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

Merge branch 'main' into bluetooth/battery-reporting

Browse source
This commit is contained in:
Nick Winans 2020-10-23 00:55:50 -05:00 • committed by GitHub
commit 70ffcca3b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
159 changed files with 22131 additions and 4208 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/boards/arm/nrfmicro/nrfmicro_13.dts
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 {