forked from zmkfirmware/zmk
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into corne-ish-zen-v2
- Loading branch information
Showing
85 changed files
with
1,486 additions
and
160 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright (c) 2020 The ZMK Contributors | ||
| * | ||
| * SPDX-License-Identifier: MIT | ||
| */ | ||
|
|
||
|
|
||
| / { | ||
| pro_micro: connector { | ||
| compatible = "arduino-pro-micro"; | ||
| #gpio-cells = <2>; | ||
| gpio-map-mask = <0xffffffff 0xffffffc0>; | ||
| gpio-map-pass-thru = <0 0x3f>; | ||
| gpio-map | ||
| = <0 0 &gpio0 8 0> /* D0 */ | ||
| , <1 0 &gpio0 6 0> /* D1 */ | ||
| , <2 0 &gpio0 15 0> /* D2 */ | ||
| , <3 0 &gpio0 17 0> /* D3 */ | ||
| , <4 0 &gpio0 20 0> /* D4/A6 */ | ||
| , <5 0 &gpio0 13 0> /* D5 */ | ||
| , <6 0 &gpio0 24 0> /* D6/A7 */ | ||
| , <7 0 &gpio0 9 0> /* D7 */ | ||
| , <8 0 &gpio0 10 0> /* D8/A8 */ | ||
| , <9 0 &gpio1 6 0> /* D9/A9 */ | ||
| , <10 0 &gpio1 4 0> /* D10/A10 */ | ||
| , <16 0 &gpio0 28 0> /* D16 */ | ||
| , <14 0 &gpio0 3 0> /* D14 */ | ||
| , <15 0 &gpio1 5 0> /* D15 */ | ||
| , <18 0 &gpio0 2 0> /* D18/A0 */ | ||
| , <19 0 &gpio0 29 0> /* D19/A1 */ | ||
| , <20 0 &gpio0 31 0> /* D20/A2 */ | ||
| , <21 0 &gpio0 30 0> /* D21/A3 */ | ||
| ; | ||
| }; | ||
|
|
||
| pro_micro_a: connector_a { | ||
| compatible = "arduino-pro-micro"; | ||
| #gpio-cells = <2>; | ||
| gpio-map-mask = <0xffffffff 0xffffffc0>; | ||
| gpio-map-pass-thru = <0 0x3f>; | ||
| gpio-map | ||
| = <0 0 &gpio0 2 0> /* D18/A0 */ | ||
| , <1 0 &gpio0 29 0> /* D19/A1 */ | ||
| , <2 0 &gpio0 31 0> /* D20/A2 */ | ||
| , <3 0 &gpio0 30 0> /* D21/A3 */ | ||
| , <6 0 &gpio0 20 0> /* D4/A6 */ | ||
| , <7 0 &gpio0 24 0> /* D6/A7 */ | ||
| , <8 0 &gpio0 10 0> /* D8/A8 */ | ||
| , <9 0 &gpio1 6 0> /* D9/A9 */ | ||
| , <10 0 &gpio1 11 0> /* D10/A10 */ | ||
| ; | ||
| }; | ||
| }; | ||
|
|
||
|
|
||
| pro_micro_d: &pro_micro {}; | ||
| pro_micro_i2c: &i2c0 {}; | ||
| pro_micro_spi: &spi0 {}; | ||
| pro_micro_serial: &uart0 {}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| /* | ||
| * Copyright (c) 2020 The ZMK Contributors | ||
| * | ||
| * SPDX-License-Identifier: MIT | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
| #include <nordic/nrf52833_qiaa.dtsi> | ||
| #include "arduino_pro_micro_pins_52833.dtsi" | ||
|
|
||
| / { | ||
| model = "nrfmicro"; | ||
| compatible = "joric,nrfmicro"; | ||
|
|
||
| chosen { | ||
| zephyr,code-partition = &code_partition; | ||
| zephyr,sram = &sram0; | ||
| zephyr,flash = &flash0; | ||
| zephyr,console = &cdc_acm_uart; | ||
| zmk,battery = &vbatt; | ||
| }; | ||
|
|
||
| leds { | ||
| compatible = "gpio-leds"; | ||
| blue_led: led_0 { | ||
| gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; | ||
| label = "Blue LED"; | ||
| }; | ||
| }; | ||
|
|
||
| ext-power { | ||
| compatible = "zmk,ext-power-generic"; | ||
| label = "EXT_POWER"; | ||
| control-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; | ||
| }; | ||
|
|
||
| vbatt: vbatt { | ||
| compatible = "zmk,battery-voltage-divider"; | ||
| label = "BATTERY"; | ||
| io-channels = <&adc 2>; | ||
| output-ohms = <2000000>; | ||
| full-ohms = <(2000000 + 820000)>; | ||
| }; | ||
| }; | ||
|
|
||
| &adc { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &gpiote { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &gpio0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &gpio1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &i2c0 { | ||
| compatible = "nordic,nrf-twi"; | ||
| sda-pin = <15>; | ||
| scl-pin = <17>; | ||
| }; | ||
|
|
||
| &uart0 { | ||
| compatible = "nordic,nrf-uarte"; | ||
| tx-pin = <6>; | ||
| rx-pin = <8>; | ||
| }; | ||
|
|
||
| &usbd { | ||
| status = "okay"; | ||
| cdc_acm_uart: cdc_acm_uart { | ||
| compatible = "zephyr,cdc-acm-uart"; | ||
| label = "CDC_ACM_0"; | ||
| }; | ||
| }; | ||
|
|
||
|
|
||
| &flash0 { | ||
| /* | ||
| * For more information, see: | ||
| * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html | ||
| */ | ||
| partitions { | ||
| compatible = "fixed-partitions"; | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
|
|
||
| sd_partition: partition@0 { | ||
| label = "softdevice"; | ||
| reg = <0x00000000 0x00026000>; | ||
| }; | ||
| code_partition: partition@26000 { | ||
| label = "code_partition"; | ||
| reg = <0x00026000 0x00046000>; | ||
| }; | ||
|
|
||
| /* | ||
| * The flash starting at 0x0006c000 and ending at | ||
| * 0x00073fff is reserved for use by the application. | ||
| */ | ||
|
|
||
| /* | ||
| * Storage partition will be used by FCB/LittleFS/NVS | ||
| * if enabled. | ||
| */ | ||
| storage_partition: partition@6c000 { | ||
| label = "storage"; | ||
| reg = <0x0006c000 0x00008000>; | ||
| }; | ||
|
|
||
| boot_partition: partition@74000 { | ||
| label = "adafruit_boot"; | ||
| reg = <0x00074000 0x0000c000>; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| identifier: nrfmicro_13_52833 | ||
| name: nrfmicro_13_52833 | ||
| type: mcu | ||
| arch: arm | ||
| toolchain: | ||
| - zephyr | ||
| - gnuarmemb | ||
| - xtools | ||
| supported: | ||
| - adc | ||
| - usb_device | ||
| - ble | ||
| - ieee802154 | ||
| - pwm | ||
| - watchdog |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| file_format: "1" | ||
| id: nrfmicro_13_52833 | ||
| name: nRFMicro 1.3/1.4 (nRF52833) | ||
| type: board | ||
| arch: arm | ||
| outputs: | ||
| - usb | ||
| - ble | ||
| url: https:/joric/nrfmicro/ | ||
| exposes: [pro_micro] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # SPDX-License-Identifier: MIT | ||
|
|
||
| CONFIG_SOC_SERIES_NRF52X=y | ||
| CONFIG_SOC_NRF52833_QIAA=y | ||
| CONFIG_BOARD_NRFMICRO_13_52833=y | ||
|
|
||
| # Enable MPU | ||
| CONFIG_ARM_MPU=y | ||
|
|
||
| # enable GPIO | ||
| CONFIG_GPIO=y | ||
|
|
||
| CONFIG_USE_DT_CODE_PARTITION=y | ||
| CONFIG_BUILD_OUTPUT_UF2=y | ||
|
|
||
| CONFIG_MPU_ALLOW_FLASH_WRITE=y | ||
| CONFIG_NVS=y | ||
| CONFIG_SETTINGS_NVS=y | ||
| CONFIG_FLASH=y | ||
| CONFIG_FLASH_PAGE_LAYOUT=y | ||
| CONFIG_FLASH_MAP=y | ||
| CONFIG_CLOCK_CONTROL_NRF=y | ||
| CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.