[WIP 2]

ergogen/config.yaml

@@ -36,17 +36,17 @@ points:
       # Key rows (from bottom to top)
       rows:
         one:
-          row_net: P9
+          row_net: P5
         two:
-          row_net: P8
+          row_net: P6
           tags: [ is_key, flip_led ]
         three:
           row_net: P7
         four:
-          row_net: P6
+          row_net: P8
           tags: [ is_key, flip_led ]
         five:
-          row_net: P5
+          row_net: P9
 
       # Key columns (from left to right)
       columns:
@@ -101,6 +101,7 @@ outlines:
 
   # Rotary encoder with knob (2cm)
   # TODO: Not sure about the size and position yet
+  # TODO remove the holding pad thingies because they're too close to the MCU pins
   rotary_encoder:
     - what: rectangle
       operation: stack
@@ -121,6 +122,7 @@ outlines:
     - what: rectangle
       where: pad_three_one
       size: [ 100, 100 ]
+      # TODO move switches a bit to the top (more margin at the bottom to fit the diodes)
       adjust.shift: [ 0, 50 - 0.5cx ]
       fillet: 4
 
@@ -168,39 +170,44 @@ pcbs:
         params:
           keycaps: true
           hotswap: true
-          from: "{{column_net}}"
-          to: "{{colrow}}"
+          from: "{{colrow}}"
+          to: "{{row_net}}"
 
       # TODO: Check if the position of the rotary encoder fits with the controller board
+      #  -> probably remove the mounting pads at the sides?
       rotary_encoder:
-        what: rotary
+        what: rotary_modified
         where: is_rotary_encoder
         adjust.rotate: 90
         params:
-          from: "{{column_net}}"
-          to: "{{colrow}}"
-          # TODO: Set these to GPIO pins
-          A: "rotary_encoder_a"
-          B: "rotary_encoder_b"
-          C: "rotary_encoder_c"
+          from: "{{colrow}}"
+          to: "{{row_net}}"
+          # TODO: good GPIO pins? - check whether C or B should be GND
+          A: P3
+          B: P4
+          C: GND
 
       diode:
         what: diode_smd
         where: is_key
         # TODO: Is this a good position? Might be a bit too close to the hotswap sockets...
+        #  -> rotate and move a bit
         adjust:
-          shift: [ -8.28, -8.5 ]
-          rotate: 90
+          shift: [ 5, -2.5 ]
+          rotate: 180
         params:
           side: B
           from: "{{colrow}}"
-          to: "{{row_net}}"
+          to: "{{column_net}}"
 
       diode_rotary_encoder:
         $extends: pcbs.eepypad.footprints.diode
         where: is_rotary_encoder
-        adjust.shift: [ 0, 0 ]
+        adjust:
+          shift: [ 0, 0 ]
+          rotate: 90
 
+      # TODO: the neopixels need 5V, VCC might be only 3.3V - check this
       led_pixel:
         what: sk6812_mini_e
         # Place unrotated LEDs in all rows without the flip_led tag
@@ -209,6 +216,7 @@ pcbs:
         adjust.shift: [ 0, 4.7 ]
         params:
           side: B
+          VCC: 5V
           din: "{{led_din_net}}"
           dout: "led_dout_{{colrow}}"
 
@@ -218,16 +226,35 @@ pcbs:
         where: [ [ is_key, flip_led ] ]
         adjust.rotate: 180
 
-      # TODO: Decoupling capacitors for the LEDs?
+      led_capacitor:
+        what: cap_0805
+        where: [ [ is_key, -flip_led ] ]
+        adjust:
+          shift: [ -6, 4.5 ]
+          rotate: 90
+        params:
+          side: B
+          # TODO: the neopixels need 5V, VCC might be only 3.3V - check this
+          from: 5V
+          to: GND
+
+      led_capacitor_flipped:
+        $extends: pcbs.eepypad.footprints.led_capacitor
+        where: [ [ is_key, flip_led ] ]
+        adjust:
+          shift: [ 6, 4.9 ]
+          rotate: 270
 
       controller:
         what: promicro_modified
         where:
           ref: pad_five_five
           rotate: -90
-          shift: [ 0, 2 ]
+          shift: [ 0, 3 ]
         params:
           orientation: down
+          # TODO check if this is correct!
+          RAW: 5V
 
       reset_button:
         # TODO: Check if the footprint fits to the buttons we ordered
@@ -240,4 +267,4 @@ pcbs:
           from: GND
           to: RST
 
-# TODO: Mounting holes?
+# TODO: Mounting holes!