summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Winans <nick@winans.codes>2021-08-02 21:47:11 -0500
committerPete Johanson <peter@peterjohanson.com>2021-09-25 23:09:21 -0400
commite6645882c32454251466949fa9a6447b195acd72 (patch)
tree18d4755066ac76ac9dbac06c876db53406785110
parent687e91ab18bbff88f16d30d6b88125e6d03addf4 (diff)
feat(docs): Update documentation to match new Pro Micro nodes
-rw-r--r--docs/docs/assets/pro-micro/pro-micro-pins-labelled.jpgbin115573 -> 490463 bytes
-rw-r--r--docs/docs/development/boards-shields-keymaps.md2
-rw-r--r--docs/docs/development/new-shield.md48
3 files changed, 25 insertions, 25 deletions
diff --git a/docs/docs/assets/pro-micro/pro-micro-pins-labelled.jpg b/docs/docs/assets/pro-micro/pro-micro-pins-labelled.jpg
index f72d407..88161e3 100644
--- a/docs/docs/assets/pro-micro/pro-micro-pins-labelled.jpg
+++ b/docs/docs/assets/pro-micro/pro-micro-pins-labelled.jpg
Binary files differ
diff --git a/docs/docs/development/boards-shields-keymaps.md b/docs/docs/development/boards-shields-keymaps.md
index 5391688..4444537 100644
--- a/docs/docs/development/boards-shields-keymaps.md
+++ b/docs/docs/development/boards-shields-keymaps.md
@@ -47,6 +47,6 @@ in the `app/boards/shields/${board_name}` directory, e.g. `app/boards/shields/cl
- A `Kconfig.shield` that defines the toplevel Kconfig value for the shield, which uses a supplied utility to function to default the value based on the shield list, e.g. `def_bool $(shields_list_contains,clueboard_california)`.
- A `Kconfig.defconfig` file to set default values for things like `ZMK_KEYBOARD_NAME`
- A `${shield_name}.overlay` file, which is a devicetree overlay file, that includes:
- - A [chosen](https://docs.zephyrproject.org/2.5.0/guides/dts/intro.html#aliases-and-chosen-nodes) node named `zmk,kscan` which references the configured KSCAN driver (usually a GPIO matrix). For these keyboards, to be compatible with any Pro Micro compatible boards, the KSCAN configuration should reference the [nexus node](https://docs.zephyrproject.org/2.5.0/guides/porting/shields.html#gpio-nexus-nodes) that ZMK has standardized on. In particular, the `&pro_micro_a` and `&pro_micro_d` aliases can be used to reference the standard `A#` and `D#` pins in shields.
+ - A [chosen](https://docs.zephyrproject.org/2.5.0/guides/dts/intro.html#aliases-and-chosen-nodes) node named `zmk,kscan` which references the configured KSCAN driver (usually a GPIO matrix). For these keyboards, to be compatible with any Pro Micro compatible boards, the KSCAN configuration should reference the [nexus node](https://docs.zephyrproject.org/2.5.0/guides/porting/shields.html#gpio-nexus-nodes) that ZMK has standardized on. In particular, the `&pro_micro` aliases can be used to reference the standard digital pins of a Pro Micro for shields.
- (Optional) A [chosen](https://docs.zephyrproject.org/2.5.0/guides/dts/intro.html#aliases-and-chosen-nodes) node named `zmk,matrix_transform` that defines the mapping from KSCAN row/column values to the logical key position for the keyboard.
- A `keymap/keymap.overlay` file that includes the default keymap for that keyboard. Users will be able to override this keymap in their user configs.
diff --git a/docs/docs/development/new-shield.md b/docs/docs/development/new-shield.md
index 2403261..d8b4169 100644
--- a/docs/docs/development/new-shield.md
+++ b/docs/docs/development/new-shield.md
@@ -117,7 +117,7 @@ endif
![Labelled Pro Micro pins](../assets/pro-micro/pro-micro-pins-labelled.jpg)
-ZMK uses the green color coded pin names to generate devicetree node references. For example, to refer to the node `D0` in the devicetree files, use `&pro_micro_d 0` or to refer to `A1`, use `&pro_micro_a 1`.
+ZMK uses the blue color coded pin names to generate devicetree node references. For example, to refer to the node `0` in the devicetree files, use `&pro_micro 0`.
<Tabs
defaultValue="unibody"
@@ -143,15 +143,15 @@ this might look something like:
diode-direction = "col2row";
col-gpios
- = <&pro_micro_d 15 GPIO_ACTIVE_HIGH>
- , <&pro_micro_d 14 GPIO_ACTIVE_HIGH>
- , <&pro_micro_d 16 GPIO_ACTIVE_HIGH>
+ = <&pro_micro 15 GPIO_ACTIVE_HIGH>
+ , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+ , <&pro_micro 16 GPIO_ACTIVE_HIGH>
;
row-gpios
- = <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
- , <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
- , <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ = <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
;
};
};
@@ -200,11 +200,11 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,2) RC(4,9) RC(3,6) RC(3,7)
diode-direction = "col2row";
row-gpios
- = <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row A from the schematic file
- , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row B from the schematic file
- , <&pro_micro_d 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row C from the schematic file
- , <&pro_micro_d 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row D from the schematic file
- , <&pro_micro_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row E from the schematic file
+ = <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row A from the schematic file
+ , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row B from the schematic file
+ , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row C from the schematic file
+ , <&pro_micro 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row D from the schematic file
+ , <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // Row E from the schematic file
;
};
@@ -228,12 +228,12 @@ This is exemplified with the iris .overlay files.
&kscan0 {
col-gpios
- = <&pro_micro_a 1 GPIO_ACTIVE_HIGH> // col1 in the schematic
- , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> // col2 in the schematic
- , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> // col3 in the schematic
- , <&pro_micro_d 14 GPIO_ACTIVE_HIGH> // col4 in the schematic
- , <&pro_micro_d 16 GPIO_ACTIVE_HIGH> // col5 in the schematic
- , <&pro_micro_d 10 GPIO_ACTIVE_HIGH> // col6 in the schematic
+ = <&pro_micro 19 GPIO_ACTIVE_HIGH> // col1 in the schematic
+ , <&pro_micro 18 GPIO_ACTIVE_HIGH> // col2 in the schematic
+ , <&pro_micro 15 GPIO_ACTIVE_HIGH> // col3 in the schematic
+ , <&pro_micro 14 GPIO_ACTIVE_HIGH> // col4 in the schematic
+ , <&pro_micro 16 GPIO_ACTIVE_HIGH> // col5 in the schematic
+ , <&pro_micro 10 GPIO_ACTIVE_HIGH> // col6 in the schematic
;
};
```
@@ -249,12 +249,12 @@ This is exemplified with the iris .overlay files.
&kscan0 {
col-gpios
- = <&pro_micro_d 10 GPIO_ACTIVE_HIGH> // col6 in the schematic
- , <&pro_micro_d 16 GPIO_ACTIVE_HIGH> // col5 in the schematic
- , <&pro_micro_d 14 GPIO_ACTIVE_HIGH> // col4 in the schematic
- , <&pro_micro_d 15 GPIO_ACTIVE_HIGH> // col3 in the schematic
- , <&pro_micro_a 0 GPIO_ACTIVE_HIGH> // col2 in the schematic
- , <&pro_micro_a 1 GPIO_ACTIVE_HIGH> // col1 in the schematic
+ = <&pro_micro 10 GPIO_ACTIVE_HIGH> // col6 in the schematic
+ , <&pro_micro 16 GPIO_ACTIVE_HIGH> // col5 in the schematic
+ , <&pro_micro 14 GPIO_ACTIVE_HIGH> // col4 in the schematic
+ , <&pro_micro 15 GPIO_ACTIVE_HIGH> // col3 in the schematic
+ , <&pro_micro 18 GPIO_ACTIVE_HIGH> // col2 in the schematic
+ , <&pro_micro 19 GPIO_ACTIVE_HIGH> // col1 in the schematic
;
};