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

Fix: tried to fix usb

Browse source
This commit is contained in:
Thomas N Atkins 2022-06-14 00:13:32 -05:00
parent ab9dab4d09
commit 366fa20e61
2 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi
View file

@ -26,20 +26,12 @@
, <12 0 &gpio1 8 0> /* D1 - P1.08 , MicroMod pad pad 18 */ , <12 0 &gpio1 8 0> /* D1 - P1.08 , MicroMod pad pad 18 */
, <13 0 &gpio1 6 0> /* PWM0 - P0.06 , MicroMod pad pad 32 */ , <13 0 &gpio1 6 0> /* PWM0 - P0.06 , MicroMod pad pad 32 */
, <14 0 &gpio1 16 0> /* PWM1 - P0.16 , MicroMod pad pad 47 */ , <14 0 &gpio1 16 0> /* PWM1 - P0.16 , MicroMod pad pad 47 */
, <15 0 &gpio0 4 0> /* A0 - ADC0/P0.04 , MicroMod pad 34 (Input Only!) */
, <16 0 &gpio0 5 0> /* A1 - ADC1/P0.05 , MicroMod pad pad 38 (Input Only!) */
; ;
}; };
sparkfun_micromod_a: connector_a {
compatible = "sparkfun,micromod-gpio";
#gpio-cells = <2>;
gpio-map-mask = <0xffffffff 0xffffffc0>;
gpio-map-pass-thru = <0 0x3f>;
gpio-map
= <0 0 &gpio0 4 0> /* A0 - ADC0/P0.04 , MicroMod pad 34 (Input Only!) */
, <1 0 &gpio0 5 0> /* A1 - ADC1/P0.05 , MicroMod pad pad 38 (Input Only!) */
;
};
}; };

23
app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts
View file

@ -14,10 +14,10 @@
compatible = "sparkfun,micromod-gpio"; compatible = "sparkfun,micromod-gpio";
chosen { chosen {
zephyr,console = &cdc_acm_uart;
zephyr,code-partition = &code_partition; zephyr,code-partition = &code_partition;
zephyr,sram = &sram0; zephyr,sram = &sram0;
zephyr,flash = &flash0; zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
}; };
leds { leds {
@ -45,14 +45,19 @@
status = "okay"; status = "okay";
}; };
&uart0 {
compatible = "nordic,nrf-uarte";
tx-pin = <35>;
rx-pin = <42>;
};
&usbd { &usbd {
status = "okay"; status = "okay";
cdc_acm_uart: cdc_acm_uart { cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart"; compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0"; label = "CDC_ACM_0";
}; };
};
};
/** /**
@ -95,11 +100,7 @@
**/ **/
&uart0 {
compatible = "nordic,nrf-uarte";
tx-pin = <35>;
rx-pin = <42>;
};
&flash0 { &flash0 {
/* /*