cleanup and adjust pin numbers

.gitignore

@@ -1,2 +1,3 @@
 build
 .directory
+.DS_Store

README.md

@@ -23,25 +23,27 @@ Flash as usual using the mass storage bootloader (hold BOOTSEL while pluggin in
 
 ## Hardware Connections
 
-    Pin 1    GP0    I2C SDA
-    Pin 2    GP1    I2C SCL
+    Pin 1    GP0    I2C0 SDA
+    Pin 2    GP1    I2C0 SCL
 
-    Pin 4    GP22    Output Channel A
-    Pin 5    GP26    Output Channel B
-    Pin 6    GP27    Output Channel C
+    Pin 29   GP22   Output Channel A
+    Pin 31   GP26   Output Channel B
+    Pin 32   GP27   Output Channel C
 
-    Pin 7    GP8    Button 1
-    Pin 9    GP9    Button 2
-    Pin 10   GP12    Button 3
-    Pin 11   GP14    Button 4
+    Pin 34   GP28   Vbat (ADC2)
 
-    Pin 12   GP17    Encoder A
-    Pin 14   GP18   Encoder B
-    Pin 15   GP16   Encoder Click
+    Pin 11   GP8    Button 1
+    Pin 12   GP9    Button 2
+    Pin 16   GP12   Button 3
+    Pin 19   GP14   Button 4
 
-    Pin 16   GP10   LED 1
-    Pin 17   GP11   LED 2
-    Pin 19   GP13   LED 3
+    Pin 22   GP17   Encoder A
+    Pin 24   GP18   Encoder B
+    Pin 21   GP16   Encoder Click
+
+    Pin 14   GP10   LED 1
+    Pin 15   GP11   LED 2
+    Pin 17   GP13   LED 3
     Pin 20   GP15   LED 4
 
 ## License

pcb/~drumkit.kicad_pcb.lck

@@ -1 +0,0 @@
-{"hostname":"air2015","username":"kauzerei"}

pcb/~drumkit.kicad_sch.lck

@@ -1 +0,0 @@
-{"hostname":"air2015","username":"kauzerei"}

src/buttons.c

@@ -24,11 +24,11 @@
 #define DEBOUNCE_DELAY_MS 50
 
 static const uint gpio_num[NUM_BTNS] = {
-    5, // BTN_A
-    6, // BTN_B
-    7, // BTN_C
-    8, // BTN_REC
-    11, // BTN_CLICK
+    8, // BTN_A
+    9, // BTN_B
+    12, // BTN_C
+    14, // BTN_REC
+    16, // BTN_CLICK
 };
 
 struct button_state {

src/encoder.c

@@ -25,7 +25,7 @@
 #define ENCODER_MODE TWO03
 
 static const uint gpio_num[2] = {
-    9, 10
+    17, 18
 };
 
 static const int8_t KNOBDIR[] = {

src/lcd.c

@@ -25,7 +25,7 @@
 #include "ssd1306.h"
 #include "lcd.h"
 
-#define LCD_I2C i2c1
+#define LCD_I2C i2c0
 static const uint gpio_num[2] = { 0, 1 };
 #define LCD_ADDR 0x3C
 

src/led.c

@@ -22,11 +22,11 @@
 #include "led.h"
 
 static const uint led_gpio_num[LED_COUNT] = {
-    12, 13, 14, 15,
+    10, 11, 13, 15,
 };
 
 static const uint ch_gpio_num[NUM_CHANNELS] = {
-    2, 3, 4,
+    22, 26, 27,
 };
 
 void led_init(void) {