Various config and structure changes

pimoroni · Aug 17, 2023 · e11b6ae · e11b6ae
1 parent 30686d6
commit e11b6ae
Show file tree

Hide file tree

Showing 7 changed files with 134 additions and 9 deletions.
diff --git a/firmware/PIMORONI_YUKON/board_init.c → firmware/PIMORONI_YUKON/board.c b/firmware/PIMORONI_YUKON/board_init.c → firmware/PIMORONI_YUKON/board.c
@@ -1,3 +1,4 @@
+#include "mpconfigboard.h"
 #include "hardware/gpio.h"
 #include "hardware/i2c.h"
 #include "drivers/tca9555/tca9555.h"

diff --git a/firmware/PIMORONI_YUKON/micropython.cmake b/firmware/PIMORONI_YUKON/micropython.cmake
@@ -17,7 +17,6 @@ include(pimoroni_bus/micropython)
 
 # Sensors & Breakouts
 include(micropython-common-breakouts)
-include(pcf85063a/micropython)
 
 # Utility
 include(adcfft/micropython)

diff --git a/firmware/PIMORONI_YUKON/mpconfigboard.cmake b/firmware/PIMORONI_YUKON/mpconfigboard.cmake
@@ -1,11 +1,11 @@
 # cmake file for Pimoroni Yukon
-set(MICROPY_BOARD "pimoroni_yukon")
+set(MICROPY_BOARD "PIMORONI_YUKON")
 
 # Allow Pico SDK to locate "pimoroni_yukon.h" in this directory.
 list(APPEND PICO_BOARD_HEADER_DIRS "${CMAKE_CURRENT_LIST_DIR}")
 
 set(MICROPY_SOURCE_BOARD
-    ${CMAKE_CURRENT_LIST_DIR}/board_init.c
+    ${CMAKE_CURRENT_LIST_DIR}/board.c
 )
 
 # Board specific version of the frozen manifest

diff --git a/firmware/PIMORONI_YUKON/mpconfigboard.h b/firmware/PIMORONI_YUKON/mpconfigboard.h
@@ -34,5 +34,5 @@
 #define MICROPY_BOARD_EARLY_INIT board_init
 void board_init(void);
 
-#define MICROPY_BOARD_PRE_RUNTIME_RESET board_reset
+#define MICROPY_BOARD_EARLY_RESET board_reset
 void board_reset(void);
diff --git a/firmware/PIMORONI_YUKON/pins.csv b/firmware/PIMORONI_YUKON/pins.csv
@@ -2,29 +2,69 @@ SLOT1_FAST1,GPIO0
 SLOT1_FAST2,GPIO1
 SLOT1_FAST3,GPIO2
 SLOT1_FAST4,GPIO3
+SLOT1_SLOW1,EXT_GPIO3
+SLOT1_SLOW2,EXT_GPIO4
+SLOT1_SLOW3,EXT_GPIO5
 SLOT2_FAST1,GPIO4
 SLOT2_FAST2,GPIO5
 SLOT2_FAST3,GPIO6
 SLOT2_FAST4,GPIO7
+SLOT2_SLOW1,EXT_GPIO0
+SLOT2_SLOW2,EXT_GPIO1
+SLOT2_SLOW3,EXT_GPIO2
 SLOT3_FAST1,GPIO8
 SLOT3_FAST2,GPIO9
 SLOT3_FAST3,GPIO10
 SLOT3_FAST4,GPIO11
+SLOT3_SLOW1,EXT_GPIO8
+SLOT3_SLOW2,EXT_GPIO9
+SLOT3_SLOW3,EXT_GPIO10
 SLOT4_FAST1,GPIO12
 SLOT4_FAST2,GPIO13
 SLOT4_FAST3,GPIO14
 SLOT4_FAST4,GPIO15
+SLOT4_SLOW1,EXT_GPIO23
+SLOT4_SLOW2,EXT_GPIO21
+SLOT4_SLOW3,EXT_GPIO22
 SLOT5_FAST1,GPIO16
 SLOT5_FAST2,GPIO17
 SLOT5_FAST3,GPIO18
 SLOT5_FAST4,GPIO19
+SLOT5_SLOW1,EXT_GPIO31
+SLOT5_SLOW2,EXT_GPIO30
+SLOT5_SLOW3,EXT_GPIO29
 SLOT6_FAST1,GPIO20
 SLOT6_FAST2,GPIO21
 SLOT6_FAST3,GPIO22
 SLOT6_FAST4,GPIO23
-GP24,GPIO24
-GP25,GPIO25
+SLOT6_SLOW1,EXT_GPIO26
+SLOT6_SLOW2,EXT_GPIO28
+SLOT6_SLOW3,EXT_GPIO27
+SDA,GPIO24
+SCL,GPIO25
+EX_I2C_SDA,GPIO26
+EX_SPI_SCK,GPIO26
+GP26_A0,GPIO26
 GP26,GPIO26
+A0,GPIO26
+EX_I2C_SCL,GPIO27
+EX_SPI_MOSI,GPIO27
+GP27_A1,GPIO27
 GP27,GPIO27
-GP28,GPIO28
-GP29,GPIO29
+A1,GPIO27
+INT,GPIO28
+SHARED_ADC,GPIO29
+MAIN_EN,EXT_GPIO6
+USER_SW,EXT_GPIO27
+ADC_ADDR_1,EXT_GPIO12
+ADC_ADDR_2,EXT_GPIO13
+ADC_ADDR_3,EXT_GPIO14
+ADC_MUX_EN_1,EXT_GPIO15
+ADC_MUX_EN_2,EXT_GPIO11
+SW_A,EXT_GPIO17
+SW_B,EXT_GPIO18
+LED_A,EXT_GPIO19
+LED_B,EXT_GPIO20
+LCD_BL,EXT_GPIO16
+LCD_DC,EXT_GPIO24
+LCD_CS,EXT_GPIO25
diff --git a/firmware/filesystem/lib/pimoroni_yukon/__init__.py b/firmware/filesystem/lib/pimoroni_yukon/__init__.py
@@ -0,0 +1,86 @@
+# The entire lib dir gets added to a LittleFS filesystem and appended to the firmware
+from machine import Pin
+from ucollections import namedtuple
+
+Slot = namedtuple("Slot", ("ID",
+                           "FAST1",
+                           "FAST2",
+                           "FAST3",
+                           "FAST4",
+                           "SLOW1",
+                           "SLOW2",
+                           "SLOW3",
+                           "ADC1_ADDR",
+                           "ADC2_TEMP_ADDR"))
+
+SLOT1 = Slot(1,
+             Pin.board.SLOT1_FAST1,
+             Pin.board.SLOT1_FAST2,
+             Pin.board.SLOT1_FAST3,
+             Pin.board.SLOT1_FAST4,
+             Pin.board.SLOT1_SLOW1,
+             Pin.board.SLOT1_SLOW2,
+             Pin.board.SLOT1_SLOW3,
+             0,  # 0b0000
+             3   # 0b0011
+             ) 
+
+SLOT2 = Slot(2,
+             Pin.board.SLOT2_FAST1,
+             Pin.board.SLOT2_FAST2,
+             Pin.board.SLOT2_FAST3,
+             Pin.board.SLOT2_FAST4,
+             Pin.board.SLOT2_SLOW1,
+             Pin.board.SLOT2_SLOW2,
+             Pin.board.SLOT2_SLOW3,
+             1,  # 0b0001
+             6   # 0b0110
+             )
+
+SLOT3 = Slot(3,
+             Pin.board.SLOT3_FAST1,
+             Pin.board.SLOT3_FAST2,
+             Pin.board.SLOT3_FAST3,
+             Pin.board.SLOT3_FAST4,
+             Pin.board.SLOT3_SLOW1,
+             Pin.board.SLOT3_SLOW2,
+             Pin.board.SLOT3_SLOW3,
+             4,  # 0b0100
+             2   # 0b0010
+             )
+
+SLOT4 = Slot(4,
+             Pin.board.SLOT4_FAST1,
+             Pin.board.SLOT4_FAST2,
+             Pin.board.SLOT4_FAST3,
+             Pin.board.SLOT4_FAST4,
+             Pin.board.SLOT4_SLOW1,
+             Pin.board.SLOT4_SLOW2,
+             Pin.board.SLOT4_SLOW3,
+             5,  # 0b0101
+             7   # 0b0111
+             )
+
+SLOT5 = Slot(5,
+             Pin.board.SLOT5_FAST1,
+             Pin.board.SLOT5_FAST2,
+             Pin.board.SLOT5_FAST3,
+             Pin.board.SLOT5_FAST4,
+             Pin.board.SLOT5_SLOW1,
+             Pin.board.SLOT5_SLOW2,
+             Pin.board.SLOT5_SLOW3,
+             8,  # 0b1000
+             11  # 0b1011
+             )
+
+SLOT6 = Slot(6,
+             Pin.board.SLOT6_FAST1,
+             Pin.board.SLOT6_FAST2,
+             Pin.board.SLOT6_FAST3,
+             Pin.board.SLOT6_FAST4,
+             Pin.board.SLOT6_SLOW1,
+             Pin.board.SLOT6_SLOW2,
+             Pin.board.SLOT6_SLOW3,
+             9,  # 0b1001
+             10  # 0b1010
+             )
diff --git a/firmware/filesystem/lib/yukon.py b/firmware/filesystem/lib/yukon.py