working on being able to share the SPI Bus

kdschlosser · kdschlosser · commit 8c03229462c0 · 2024-06-12T21:29:05.000-06:00
diff --git a/micropy_updates/stm32/machine_spi.c b/micropy_updates/stm32/machine_spi.c
@@ -165,7 +165,9 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
     }
 
     // set the SPI configuration values
-    SPI_InitTypeDef *init = &((spi_t *)(self->spi_bus->user_data)->Init);
+
+    spi_t *spi = (spi_t *)self->spi_bus->user_data
+    SPI_InitTypeDef *init = spi->Init;
     init->Mode = SPI_MODE_MASTER;
 
     // these parameters are not currently configurable
@@ -200,7 +202,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
             mp_raise_OSError(-ret);
         }
 
-        self->spi_bus->state == MP_SPI_STATE_STARTED;
+        self->spi_bus->state = MP_SPI_STATE_STARTED;
     }
 
     if (self->cs != mp_const_none) {

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,9 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`// set the SPI configuration values`
`168`		`- SPI_InitTypeDef init = &((spi_t )(self->spi_bus->user_data)->Init);`
	`168`	`+`
	`169`	`+ spi_t spi = (spi_t )self->spi_bus->user_data`
	`170`	`+ SPI_InitTypeDef *init = spi->Init;`
`169`	`171`	`init->Mode = SPI_MODE_MASTER;`
`170`	`172`
`171`	`173`	`// these parameters are not currently configurable`
`@@ -200,7 +202,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz`
`200`	`202`	`mp_raise_OSError(-ret);`
`201`	`203`	`}`
`202`	`204`
`203`		`- self->spi_bus->state == MP_SPI_STATE_STARTED;`
	`205`	`+ self->spi_bus->state = MP_SPI_STATE_STARTED;`
`204`	`206`	`}`
`205`	`207`
`206`	`208`	`if (self->cs != mp_const_none) {`