Corrected I2C & SPI. Tested with example scripts; works with real peripherals.

Signed-off-by: Brandon-Hurst <[email protected]>

Author: Brandon-Hurst

ports/analog/Makefile

@@ -284,7 +284,7 @@ flash-openocd-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/common-hal/busio/I2C.c

@@ -46,6 +46,9 @@ static uint8_t i2c_active = 0;
 static i2c_status_t i2c_status[NUM_I2C];
 static volatile int i2c_err;
 
+// I2C struct for configuring GPIO pins
+extern const mxc_gpio_cfg_t i2c_maps[NUM_I2C];
+
 // I2C Interrupt Handler
 void i2c_isr(void) {
     for (int i = 0; i < NUM_I2C; i++) {
@@ -88,13 +91,14 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
 
     // Init I2C as main / controller node (0x00 is ignored)
     if ((scl != NULL) && (sda != NULL)) {
+        MXC_GPIO_Config(&i2c_maps[self->i2c_id]);
         err = MXC_I2C_Init(self->i2c_regs, 1, 0x00);
         if (err) {
-            mp_raise_RuntimeError(MP_ERROR_TEXT("Failed to init I2C.\n"));
+            mp_raise_RuntimeError_varg(MP_ERROR_TEXT("Failed to init I2C. ERR: %d\n"), err);
         }
         err = MXC_I2C_SetFrequency(self->i2c_regs, frequency);
         if (err < 0) {
-            mp_raise_RuntimeError(MP_ERROR_TEXT("Failed to set I2C frequency\n"));
+            mp_raise_RuntimeError_varg(MP_ERROR_TEXT("Failed to set I2C frequency. ERR: %d\n"), err);
         }
     } else if (scl != NULL) {
         mp_raise_NotImplementedError(MP_ERROR_TEXT("I2C needs SDA & SCL"));

ports/analog/common-hal/busio/SPI.c

@@ -88,20 +88,38 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
         self->spi_regs = MXC_SPI_GET_SPI(temp);
     }
 
+    // Other pins default to true
+    mxc_spi_pins_t spi_pins = {
+        .clock = TRUE,
+        .mosi = TRUE,
+        .miso = TRUE,
+        .ss0 = FALSE,
+        .ss1 = FALSE,
+        .ss2 = FALSE,
+        .vddioh = true,
+        .drvstr = MXC_GPIO_DRVSTR_0
+    };
+
     assert((self->spi_id >= 0) && (self->spi_id < NUM_SPI));
 
     // Init I2C as main / controller node (0x00 is ignored)
     // FIXME: MUST map the SPI pins to a spi_pins_t struct
     if ((mosi != NULL) && (miso != NULL) && (sck != NULL)) {
         // spi, mastermode, quadModeUsed, numSubs, ssPolarity, frequency
-        err = MXC_SPI_RevA1_Init((mxc_spi_reva_regs_t *)self->spi_regs, 1, 0, 1, 0x00, 1000000);
+        // err = MXC_SPI_Init((mxc_spi_reva_regs_t *)self->spi_regs, 1, 0, 1, 0x00, 1000000, &spi_pins);
+        err = MXC_SPI_Init(self->spi_regs, MXC_SPI_TYPE_CONTROLLER, MXC_SPI_INTERFACE_STANDARD,
+            1, 0x01, 1000000, spi_pins);
+        MXC_GPIO_SetVSSEL(MXC_GPIO_GET_GPIO(sck->port), MXC_GPIO_VSSEL_VDDIOH, (sck->mask | miso->mask | mosi->mask | MXC_GPIO_PIN_0));
         if (err) {
             mp_raise_RuntimeError(MP_ERROR_TEXT("Failed to init SPI.\n"));
         }
     } else {
         mp_raise_NotImplementedError(MP_ERROR_TEXT("SPI needs MOSI, MISO, and SCK"));
     }
 
+    // FIXME: Debugging
+
+
     // Attach SPI pins
     self->mosi = mosi;
     self->miso = miso;

ports/analog/peripherals/max32690/max32_i2c.c

@@ -16,10 +16,10 @@
 const mxc_gpio_cfg_t i2c_maps[NUM_I2C] = {
     // I2C0A
     { MXC_GPIO0, (MXC_GPIO_PIN_30 | MXC_GPIO_PIN_31), MXC_GPIO_FUNC_ALT1,
-      MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 },
+      MXC_GPIO_PAD_PULL_UP, MXC_GPIO_VSSEL_VDDIOH, MXC_GPIO_DRVSTR_0 },
     // I2C1A
     { MXC_GPIO2, (MXC_GPIO_PIN_17 | MXC_GPIO_PIN_18), MXC_GPIO_FUNC_ALT1,
-      MXC_GPIO_PAD_NONE, MXC_GPIO_VSSEL_VDDIO, MXC_GPIO_DRVSTR_0 },
+      MXC_GPIO_PAD_PULL_UP, MXC_GPIO_VSSEL_VDDIOH, MXC_GPIO_DRVSTR_0 },
 };
 
 int pinsToI2c(const mcu_pin_obj_t *sda, const mcu_pin_obj_t *scl) {