Skip to content

Commit

Permalink
Pillbug and blackpillish
Browse files Browse the repository at this point in the history
  • Loading branch information
bullwinkle3000 committed Jan 5, 2024
1 parent b2e7239 commit 8833376
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 47 deletions.
57 changes: 34 additions & 23 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions config/boards/shields/wyld_dm/wyld_dm.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,31 @@ 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)>
;

};

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";
};

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";
};
Expand All @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions config/boards/shields/wyld_dm/wyld_dm_left.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -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>
;
};

Expand Down
12 changes: 6 additions & 6 deletions config/boards/shields/wyld_dm/wyld_dm_right.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -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>
;
};

Expand Down

0 comments on commit 8833376

Please sign in to comment.