diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 907a693..db53699 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,9 +9,11 @@
-
+
-
+
+
+
@@ -37,25 +39,25 @@
- {
- "keyToString": {
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "RunOnceActivity.cidr.known.project.marker": "true",
- "RunOnceActivity.readMode.enableVisualFormatting": "true",
- "cf.first.check.clang-format": "false",
- "cidr.known.project.marker": "true",
- "git-widget-placeholder": "pillbug",
- "last_opened_file_path": "/Users/andrew/dev/wylderbuilds/zmk_customer_configs/zmk-config-nano",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "settings.editor.selected.configurable": "editor.preferences.smartKeys",
- "vue.rearranger.settings.migration": "true"
+
+}]]>
@@ -69,7 +71,7 @@
-
+
@@ -127,7 +129,15 @@
1704125927455
-
+
+
+ 1704473173092
+
+
+
+ 1704473173092
+
+
@@ -139,6 +149,7 @@
-
+
+
\ No newline at end of file
diff --git a/config/boards/shields/wyld_dm/wyld_dm.dtsi b/config/boards/shields/wyld_dm/wyld_dm.dtsi
index 28f845f..1c98b76 100644
--- a/config/boards/shields/wyld_dm/wyld_dm.dtsi
+++ b/config/boards/shields/wyld_dm/wyld_dm.dtsi
@@ -35,13 +35,13 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC
diode-direction = "col2row";
row-gpios
- = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
- , <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
- , <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
- , <&pro_micro_a 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
- , <&pro_micro_d 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
- , <&pro_micro_d 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
- , <&pro_micro_d 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ = <&blackpill 12 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&blackpill 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&blackpill 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&blackpill 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&blackpill 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&blackpill 17 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ , <&blackpill 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
;
};
@@ -49,8 +49,8 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC
left_encoder: encoder_left {
compatible = "alps,ec11";
label = "LEFT_ENCODER";
- a-gpios = <&pro_micro_d 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
- b-gpios = <&pro_micro_d 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+ a-gpios = <&blackpill 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+ b-gpios = <&blackpill 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
steps = <60>;
status = "disabled";
};
@@ -58,8 +58,8 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC
right_encoder: encoder_right {
compatible = "alps,ec11";
label = "RIGHT_ENCODER";
- a-gpios = <&pro_micro_d 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
- b-gpios = <&pro_micro_d 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+ a-gpios = <&blackpill 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+ b-gpios = <&blackpill 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
steps = <60>;
status = "disabled";
};
@@ -73,7 +73,7 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC
-&pro_micro_i2c {
+&blackpill_i2c {
status = "okay";
oled: ssd1306@3c {
diff --git a/config/boards/shields/wyld_dm/wyld_dm_left.overlay b/config/boards/shields/wyld_dm/wyld_dm_left.overlay
index 748060e..7f739d7 100644
--- a/config/boards/shields/wyld_dm/wyld_dm_left.overlay
+++ b/config/boards/shields/wyld_dm/wyld_dm_left.overlay
@@ -5,12 +5,12 @@
&kscan0 {
col-gpios
- = <&pro_micro_d 4 GPIO_ACTIVE_HIGH>
- , <&pro_micro_d 5 GPIO_ACTIVE_HIGH>
- , <&pro_micro_d 6 GPIO_ACTIVE_HIGH>
- , <&pro_micro_d 7 GPIO_ACTIVE_HIGH>
- , <&pro_micro_d 8 GPIO_ACTIVE_HIGH>
- , <&pro_micro_d 9 GPIO_ACTIVE_HIGH>
+ = <&blackpill 30 GPIO_ACTIVE_HIGH>
+ , <&blackpill 31 GPIO_ACTIVE_HIGH>
+ , <&blackpill 38 GPIO_ACTIVE_HIGH>
+ , <&blackpill 39 GPIO_ACTIVE_HIGH>
+ , <&blackpill 40 GPIO_ACTIVE_HIGH>
+ , <&blackpill 41 GPIO_ACTIVE_HIGH>
;
};
diff --git a/config/boards/shields/wyld_dm/wyld_dm_right.overlay b/config/boards/shields/wyld_dm/wyld_dm_right.overlay
index 879c65a..73cc03b 100644
--- a/config/boards/shields/wyld_dm/wyld_dm_right.overlay
+++ b/config/boards/shields/wyld_dm/wyld_dm_right.overlay
@@ -8,12 +8,12 @@
&kscan0 {
col-gpios
- = <&pro_micro_d 4 GPIO_ACTIVE_HIGH>
- , <&pro_micro_d 5 GPIO_ACTIVE_HIGH>
- , <&pro_micro_d 6 GPIO_ACTIVE_HIGH>
- , <&pro_micro_d 7 GPIO_ACTIVE_HIGH>
- , <&pro_micro_d 8 GPIO_ACTIVE_HIGH>
- , <&pro_micro_d 9 GPIO_ACTIVE_HIGH>
+ = <&blackpill 30 GPIO_ACTIVE_HIGH>
+ , <&blackpill 31 GPIO_ACTIVE_HIGH>
+ , <&blackpill 38 GPIO_ACTIVE_HIGH>
+ , <&blackpill 39 GPIO_ACTIVE_HIGH>
+ , <&blackpill 40 GPIO_ACTIVE_HIGH>
+ , <&blackpill 41 GPIO_ACTIVE_HIGH>
;
};