Machine pin

ports/psoc-edge/Makefile

@@ -56,20 +56,32 @@ LD = arm-none-eabi-gcc
 # LDFLAGS += -Wl,--cref -Wl,--gc-sections
 # LDFLAGS += -Wl,-Map,$(BUILD)/firmware.map  -Wl,--start-group -Wl,--end-group -Wl,--print-memory-usage
 
-#TODO: Add the pin generation. Check if the existing mpy scripts make sense for us
-# or we take a similar approach as for psoc6.
-#ToDo: Post adding af functionality, refactor to minimize dependent variables in py script if possible
-# GEN_PINS_SRC := $(BUILD)/pins_$(BOARD).c
-# HEADER_BUILD := $(BUILD)/genhdr
-# GEN_PINS_HDR := $(BUILD)/genhdr/pins.h
-# GEN_PINS_QSTR := $(BUILD)/pins_qstr.h
-#
-# GENERATED_PINS = $(GEN_PINS_SRC) $(GEN_PINS_HDR) $(GEN_PINS_QSTR)
-#
-# $(GENERATED_PINS): 
-# 	@echo "Generating $@"
-# 	$(MKDIR) -p $(BUILD)/genhdr
-# 	$(PYTHON) boards/make-pins.py --gen-pin-for $(PIN_PACKAGE_FILE) --hdr $(GEN_PINS_HDR) --qstr $(GEN_PINS_QSTR) > $(GEN_PINS_SRC) 
+
+# Pin generation
+HEADER_BUILD := $(BUILD)/genhdr
+MAKE_PINS = boards/make-pins.py
+BOARD_PINS = $(BOARD_DIR)/pins.csv
+PREFIX_FILE = boards/pse84_prefix.c
+GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
+GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
+
+# Making OBJ use an order-only dependency on the generated pins.h file
+# has the side effect of making the pins.h file before we actually compile
+# any of the objects. The normal dependency generation will deal with the
+# case when pins.h is modified. But when it doesn't exist, we don't know
+# which source files might need it.
+$(OBJ): | $(GEN_PINS_HDR)
+
+# With conditional pins, we may need to regenerate qstrdefs.h when config
+# options change.
+$(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h
+
+# Use a pattern rule here so that make will only call make-pins.py once to make
+# both pins_$(BOARD).c and pins.h
+$(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h : $(BOARD_DIR)/%.csv $(MAKE_PINS) $(PREFIX_FILE) | $(HEADER_BUILD)
+	$(ECHO) "GEN $@"
+	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --prefix $(PREFIX_FILE) \
+	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR)
 
 # TODO: Check required C++ additional flags.
 # Flags for optional C++ source code
@@ -88,16 +100,20 @@ SHARED_SRC_C += $(addprefix shared/,\
 	runtime/gchelper_native.c \
 	runtime/interrupt_char.c \
 	runtime/pyexec.c \
-	runtime/mpirq.c\
 	runtime/stdout_helpers.c \
 	runtime/sys_stdio_mphal.c \
 	\
 	timeutils/timeutils.c \
 	)
 
+# TODO: Add this once gc is enabled, required in machine_pin_irq -> runtime/mpirq.c\
+
+
 DRIVERS_SRC_C += 
 
 MOD_SRC_C += \
+	machine_pin.c \
+	machine_pin_irq.c \
 	machine_pdm_pcm.c\
 	\
 	modpsocedge.c
@@ -108,7 +124,7 @@ SRC_C = help.c \
 
 SRC_ASM +=
 
-SRC_QSTR += $(SHARED_SRC_C) $(MOD_SRC_C)
+SRC_QSTR += $(SHARED_SRC_C) $(MOD_SRC_C) $(GEN_PINS_SRC)
 
 OBJ += $(PY_O) 
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o)) 
@@ -117,8 +133,9 @@ OBJ += $(addprefix $(BUILD)/, $(MOD_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) 
 OBJ += $(addprefix $(BUILD)/, $(SRC_ASM:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
+OBJ += $(GEN_PINS_SRC:.c=.o)
 
-MPY_CROSS_FLAGS += -march=armv8-m.main
+MPY_CROSS_FLAGS += -march=armv8-m.main+dsp
 
 MPY_APP_NAME = mpy_edge_app_ns
 

ports/psoc-edge/boards/KIT_PSE84_AI/mpconfigboard.mk

@@ -1,4 +1,2 @@
 BOARD_VERSION=release-v1.1.0
 
-# Variables to support make-pins
-PIN_PACKAGE_FILE = gpio_pse84_bga_220.h

ports/psoc-edge/boards/KIT_PSE84_AI/pins.csv

@@ -0,0 +1,243 @@
+# QSPI flash
+,-P0_0
+,-P0_1
+,-P1_0
+,-P1_1
+,-P1_2
+,-P1_3
+
+# Not connected
+#,-P1_4
+#,-P1_5
+#,-P1_6
+#,-P1_7
+
+# QSPI flash
+,-P2_0
+
+# I3C bus
+,P3_0
+,P3_1
+
+# PSRAM
+,-P4_0
+,-P4_1
+,-P4_2
+,-P4_3
+,-P4_4
+,-P4_5
+,-P4_6
+,-P4_7
+
+# Not connected
+#,-P5_0
+
+# JTAG Debug I/O
+,-P6_0
+,-P6_1
+,-P6_2
+,-P6_3
+
+# Int magnetometer
+,P6_4
+
+# KitProg UART RX
+,-P6_5
+
+# Int IMU 
+,P6_6
+
+# KitProg UART TX
+,-P6_7
+
+# User button
+,P7_0
+
+# USB ID OGT
+,-P7_1
+
+# Not connected
+#,-P7_2
+
+# USB direction
+,-P7_3
+
+# External clock input
+,-P7_4
+
+# USB OUT1 DRP
+,-P7_5
+
+# USB OUT2 DRP
+,-P7_6
+
+# Int IMU1
+,P7_7
+
+# I2C 1.8V
+,P8_0
+,P8_1
+
+# Not connected
+#,-P8_2
+
+# USB fault signal DRP
+,-P8_3
+
+# Not connected
+#,-P8_4
+
+# PDM
+,P8_5
+,P8_6
+
+# Not connected
+#,-P8_7
+
+# J5 connector
+,P9_0
+,P9_1
+,P9_2
+,P9_3
+
+# Bluetooth
+,-P10_0
+,-P10_1
+,-P10_2
+,-P10_3
+,-P10_4
+
+# User LED2
+,P10_5
+
+# Bluetooth
+,-P10_6
+
+# User LED1
+,P10_7
+
+# Bluetooth
+,-P11_0
+
+# PCKL level translator
+,-P11_1
+
+# Bluetooth
+,-P11_2
+
+# Int pressure sensor
+,P11_3
+
+# Wifi 
+,-P11_4
+
+# Not connected
+#,-P11_5
+
+# Wifi
+,-P11_6
+
+# Not connected
+#,-P11_7
+
+# Wifi
+,-P12_0
+,-P12_1
+,-P12_2
+
+# I2S FYSYNC
+,P12_3
+
+# Wifi
+,-P12_4
+,-P12_5
+
+# J17 expansion connector
+,P13_0
+,P13_1
+,P13_2
+,P13_3
+,P13_4
+,P13_5
+,P13_6
+,P13_7
+
+# Analog microphones
+,P14_0
+,P14_1
+,P14_2
+,P14_3
+,P14_4
+,P14_5
+,P14_6
+,P14_7
+
+# J17 expansion connector
+,P15_0
+,P15_1
+,P15_2
+,P15_3
+,P15_4
+,P15_5
+,P15_6
+,P15_7
+
+# J14 connector
+,P16_0
+,P16_1
+,P16_2
+,P16_3
+,P16_4
+,P16_5
+,P16_6
+,P16_7
+,P17_0
+,P17_1
+,P17_2
+,P17_3
+,P17_4
+,P17_5
+
+# Boot
+,-P17_6
+
+# J14 connector
+,P17_7
+
+# Oscillators
+,-P18_0
+,-P18_1
+,-P19_0
+,-P19_1
+
+,-P20_0
+# Serial Int config
+,-P20_1
+,-P20_2
+
+# Int Radar
+,P20_3
+
+# USER LED RGB G
+,P20_4
+# USER LED RGB B
+,P20_5
+# USER LED RGB R
+,P20_6
+
+# Radar reset
+,P20_7
+
+# Wifi 
+,-P21_0
+
+# I2S
+,P21_1
+,P21_2
+,P21_3
+
+# Radar SPI
+,P21_4
+,P21_5
+,P21_6
+,P21_7