Merge pull request #10413 from Brandon-Hurst/ports/analog/add-busio

Add busio support for ADI MAX32xxx port

Author: dhalbert

Makefile

@@ -299,6 +299,9 @@ update-frozen-libraries:
 
 one-of-each: samd21 litex mimxrt10xx nordic stm
 
+analog:
+	$(MAKE) -C ports/analog/ BOARD=apard32690
+
 samd21:
 	$(MAKE) -C ports/atmel-samd BOARD=trinket_m0
 

locale/circuitpython.pot

@@ -130,6 +130,7 @@ msgstr ""
 msgid "%q indices must be integers, not %s"
 msgstr ""
 
+#: ports/analog/common-hal/busio/SPI.c ports/analog/common-hal/busio/UART.c
 #: shared-module/bitbangio/SPI.c
 msgid "%q init failed"
 msgstr ""
@@ -158,6 +159,10 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
+#: py/runtime.c
+msgid "%q moved from %q to %q"
+msgstr ""
+
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -237,6 +242,7 @@ msgstr ""
 msgid "%q out of bounds"
 msgstr ""
 
+#: ports/analog/common-hal/busio/SPI.c
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c
 #: ports/cxd56/common-hal/pulseio/PulseIn.c
 #: ports/nordic/common-hal/pulseio/PulseIn.c
@@ -498,7 +504,8 @@ msgstr ""
 msgid "All SPI peripherals are in use"
 msgstr ""
 
-#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c
+#: ports/analog/common-hal/busio/UART.c ports/espressif/common-hal/busio/UART.c
+#: ports/nordic/common-hal/busio/UART.c
 msgid "All UART peripherals are in use"
 msgstr ""
 
@@ -649,6 +656,7 @@ msgstr ""
 msgid "Boot device must be first (interface #0)."
 msgstr ""
 
+#: ports/analog/common-hal/busio/UART.c
 #: ports/mimxrt10xx/common-hal/busio/UART.c
 msgid "Both RX and TX required for flow control"
 msgstr ""
@@ -991,7 +999,7 @@ msgid ""
 "Failed to add service TXT record; non-string or bytes found in txt_records"
 msgstr ""
 
-#: shared-module/rgbmatrix/RGBMatrix.c
+#: ports/analog/common-hal/busio/UART.c shared-module/rgbmatrix/RGBMatrix.c
 msgid "Failed to allocate %q buffer"
 msgstr ""
 
@@ -1049,6 +1057,10 @@ msgstr ""
 msgid "Failed to release mutex, err 0x%04x"
 msgstr ""
 
+#: ports/analog/common-hal/busio/SPI.c
+msgid "Failed to set SPI Clock Mode"
+msgstr ""
+
 #: ports/zephyr-cp/common-hal/wifi/Radio.c
 msgid "Failed to set hostname"
 msgstr ""
@@ -1251,6 +1263,10 @@ msgstr ""
 msgid "Interrupted by output function"
 msgstr ""
 
+#: ports/analog/common-hal/busio/UART.c
+#: ports/analog/peripherals/max32690/max32_i2c.c
+#: ports/analog/peripherals/max32690/max32_spi.c
+#: ports/analog/peripherals/max32690/max32_uart.c
 #: ports/espressif/common-hal/_bleio/Service.c
 #: ports/espressif/common-hal/espulp/ULP.c
 #: ports/espressif/common-hal/microcontroller/Processor.c
@@ -1343,6 +1359,7 @@ msgstr ""
 msgid "Invalid socket for TLS"
 msgstr ""
 
+#: ports/analog/common-hal/busio/SPI.c
 #: ports/espressif/common-hal/espidf/__init__.c
 #: ports/nordic/common-hal/_bleio/__init__.c
 msgid "Invalid state"
@@ -1902,6 +1919,7 @@ msgstr ""
 msgid "ROS topic failed to initialize"
 msgstr ""
 
+#: ports/analog/common-hal/busio/UART.c
 #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
 #: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
 msgid "RS485"
@@ -1994,6 +2012,10 @@ msgstr ""
 msgid "SPI init error"
 msgstr ""
 
+#: ports/analog/common-hal/busio/SPI.c
+msgid "SPI needs MOSI, MISO, and SCK"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
 msgstr ""
@@ -2125,6 +2147,10 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
+#: ports/analog/common-hal/busio/UART.c
+msgid "Timeout must be < 100 seconds"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample"
 msgstr ""
@@ -2168,6 +2194,10 @@ msgstr ""
 msgid "UART init"
 msgstr ""
 
+#: ports/analog/common-hal/busio/UART.c
+msgid "UART needs TX & RX"
+msgstr ""
+
 #: ports/raspberrypi/common-hal/busio/UART.c
 msgid "UART peripheral in use"
 msgstr ""
@@ -2176,6 +2206,14 @@ msgstr ""
 msgid "UART re-init"
 msgstr ""
 
+#: ports/analog/common-hal/busio/UART.c
+msgid "UART read error"
+msgstr ""
+
+#: ports/analog/common-hal/busio/UART.c
+msgid "UART transaction timeout"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "UART write"
 msgstr ""

ports/analog/Makefile

@@ -6,12 +6,13 @@
 #
 # SPDX-License-Identifier: MIT
 
+BOARD ?= apard32690
+CROSS_COMPILE = arm-none-eabi-
+
 # Includes mpconfigboard.mk & mpconfigport.mk,
 # along with numerous other shared environment makefiles.
 include ../../py/circuitpy_mkenv.mk
 
-CROSS_COMPILE = arm-none-eabi-
-
 # MCU_SERIES e.g. 	"max32"
 # MCU_VARIANT e.g. 	"max32690"
 # defined in mpconfigboard.mk
@@ -20,6 +21,7 @@ MCU_SERIES_UPPER := $(shell echo $(MCU_SERIES) | tr '[:lower:]' '[:upper:]')
 MCU_VARIANT_LOWER := $(shell echo $(MCU_VARIANT) | tr '[:upper:]' '[:lower:]')
 MCU_VARIANT_UPPER := $(shell echo $(MCU_VARIANT) | tr '[:lower:]' '[:upper:]')
 
+
 # *******************************************************************************
 #### MSDK INCLUDES ####
 # Necessary for msdk makefiles
@@ -59,6 +61,7 @@ DIE_TYPE=me18
 endif
 
 PERIPH_SRC = $(ADI_PERIPH)/Source
+PERIPH_INC = $(ADI_PERIPH)/Include/$(MCU_VARIANT_UPPER)
 
 INC += -I.
 INC += -I../..
@@ -75,7 +78,7 @@ INC += \
 	-I$(TOP)/lib/cmsis/inc \
 	-I$(CMSIS_ROOT)/Include \
 	-I$(CMSIS_ROOT)/Device/Maxim/$(MCU_VARIANT_UPPER)/Include \
-	-I$(ADI_PERIPH)/Include/$(MCU_VARIANT_UPPER) \
+	-I$(PERIPH_INC) \
 	-I$(PERIPH_SRC)/SYS \
 	-I$(PERIPH_SRC)/CTB \
 	-I$(PERIPH_SRC)/DMA \
@@ -85,7 +88,9 @@ INC += \
 	-I$(PERIPH_SRC)/TMR \
 	-I$(PERIPH_SRC)/RTC \
 	-I$(PERIPH_SRC)/UART \
-	-I$(PERIPH_SRC)/TRNG
+	-I$(PERIPH_SRC)/TRNG \
+	-I$(PERIPH_SRC)/I2C \
+	-I$(PERIPH_SRC)/SPI
 
 INC += -I$(CMSIS_ROOT)/Device/Maxim/$(MCU_VARIANT_UPPER)/Source/GCC
 
@@ -120,13 +125,20 @@ SRC_MAX32 += \
 	$(PERIPH_SRC)/UART/uart_$(DIE_TYPE).c \
 	$(PERIPH_SRC)/UART/uart_revb.c \
 	$(PERIPH_SRC)/TRNG/trng_revb.c \
-	$(PERIPH_SRC)/TRNG/trng_$(DIE_TYPE).c
+	$(PERIPH_SRC)/TRNG/trng_$(DIE_TYPE).c \
+	$(PERIPH_SRC)/I2C/i2c_$(DIE_TYPE).c \
+	$(PERIPH_SRC)/I2C/i2c_reva.c \
+	$(PERIPH_SRC)/SPI/spi_$(DIE_TYPE).c \
+	$(PERIPH_SRC)/SPI/spi_reva1.c
 
 SRC_C += $(SRC_MAX32) \
 			boards/$(BOARD)/board.c \
 			boards/$(BOARD)/pins.c \
 			peripherals/$(MCU_VARIANT_LOWER)/pins.c \
-			peripherals/$(MCU_VARIANT_LOWER)/gpios.c
+			peripherals/$(MCU_VARIANT_LOWER)/gpios.c \
+			peripherals/$(MCU_VARIANT_LOWER)/max32_uart.c \
+			peripherals/$(MCU_VARIANT_LOWER)/max32_i2c.c \
+			peripherals/$(MCU_VARIANT_LOWER)/max32_spi.c
 
 # *******************************************************************************
 ### Compiler & Linker Flags ###
@@ -267,11 +279,16 @@ flash-msdk:
 		-f interface/cmsis-dap.cfg -f target/$(MCU_VARIANT_LOWER).cfg \
 		-c "program $(BUILD)/firmware.elf verify; init; reset; exit"
 
+flash-openocd-jlink:
+	$(OPENOCD) -s $(OPENOCD_SCRIPTS) \
+		-f interface/jlink.cfg -f target/$(MCU_VARIANT_LOWER).cfg \
+		-c "program $(BUILD)/firmware.elf verify; init; reset; exit"
+
 # flash target using JLink
 JLINK_DEVICE = $(MCU_VARIANT_LOWER)
 
 JLINKEXE 		?= JLink.exe
-JLINKEXE     	+= -if SWD -device ${JLINK_DEVICE} -speed 10000
+JLINKEXE     	+= -if SWD -device ${JLINK_DEVICE} -speed 4000
 COMMAND_FILE 	:= tools/flash_max32.jlink
 
 flash-jlink: $(BUILD)/firmware.bin

ports/analog/background.c

@@ -19,19 +19,13 @@ extern const mxc_gpio_cfg_t led_pin[];
 extern const int num_leds;
 
 /** NOTE: ALL "ticks" refer to a 1/1024 s period */
-static int status_led_ticks = 0;
+static int status_ticks = 0;
 
 // This function is where port-specific background
 // tasks should be performed
 // Execute port specific actions during background tick. Only if ticks are enabled.
 void port_background_tick(void) {
-    status_led_ticks++;
-
-    // Set an LED approx. 1/s
-    if (status_led_ticks > 1024) {
-        MXC_GPIO_OutToggle(led_pin[2].port, led_pin[2].mask);
-        status_led_ticks = 0;
-    }
+    status_ticks++;
 }
 
 // Execute port specific actions during background tasks. This is before the