summaryrefslogtreecommitdiff
path: root/ports/esp32s2/common-hal/busio
diff options
context:
space:
mode:
Diffstat (limited to 'ports/esp32s2/common-hal/busio')
-rw-r--r--ports/esp32s2/common-hal/busio/I2C.c20
-rw-r--r--ports/esp32s2/common-hal/busio/I2C.h4
-rw-r--r--ports/esp32s2/common-hal/busio/SPI.c85
-rw-r--r--ports/esp32s2/common-hal/busio/SPI.h6
-rw-r--r--ports/esp32s2/common-hal/busio/UART.c14
-rw-r--r--ports/esp32s2/common-hal/busio/UART.h8
6 files changed, 72 insertions, 65 deletions
diff --git a/ports/esp32s2/common-hal/busio/I2C.c b/ports/esp32s2/common-hal/busio/I2C.c
index a1d0b8f9c..d97ccd9f1 100644
--- a/ports/esp32s2/common-hal/busio/I2C.c
+++ b/ports/esp32s2/common-hal/busio/I2C.c
@@ -55,7 +55,7 @@ void i2c_reset(void) {
}
void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
- const mcu_pin_obj_t* scl, const mcu_pin_obj_t* sda, uint32_t frequency, uint32_t timeout) {
+ const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) {
// Pins 45 and 46 are "strapping" pins that impact start up behavior. They usually need to
// be pulled-down so pulling them up for I2C is a bad idea. To make this hard, we don't
// support I2C on these pins.
@@ -65,7 +65,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
mp_raise_ValueError(translate("Invalid pins"));
}
-#if CIRCUITPY_REQUIRE_I2C_PULLUPS
+ #if CIRCUITPY_REQUIRE_I2C_PULLUPS
// Test that the pins are in a high state. (Hopefully indicating they are pulled up.)
gpio_set_direction(sda->number, GPIO_MODE_DEF_INPUT);
gpio_set_direction(scl->number, GPIO_MODE_DEF_INPUT);
@@ -86,7 +86,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
reset_pin_number(scl->number);
mp_raise_RuntimeError(translate("No pull up found on SDA or SCL; check your wiring"));
}
-#endif
+ #endif
if (xSemaphoreCreateMutexStatic(&self->semaphore) != &self->semaphore) {
@@ -124,10 +124,10 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
}
if (i2c_driver_install(self->i2c_num,
- I2C_MODE_MASTER,
- 0,
- 0,
- 0) != ESP_OK) {
+ I2C_MODE_MASTER,
+ 0,
+ 0,
+ 0) != ESP_OK) {
mp_raise_OSError(MP_EIO);
}
@@ -182,11 +182,11 @@ void common_hal_busio_i2c_unlock(busio_i2c_obj_t *self) {
}
uint8_t common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr,
- const uint8_t *data, size_t len, bool transmit_stop_bit) {
+ const uint8_t *data, size_t len, bool transmit_stop_bit) {
i2c_cmd_handle_t cmd = i2c_cmd_link_create();
i2c_master_start(cmd);
i2c_master_write_byte(cmd, addr << 1, true);
- i2c_master_write(cmd, (uint8_t*) data, len, true);
+ i2c_master_write(cmd, (uint8_t *)data, len, true);
if (transmit_stop_bit) {
i2c_master_stop(cmd);
}
@@ -202,7 +202,7 @@ uint8_t common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr,
}
uint8_t common_hal_busio_i2c_read(busio_i2c_obj_t *self, uint16_t addr,
- uint8_t *data, size_t len) {
+ uint8_t *data, size_t len) {
i2c_cmd_handle_t cmd = i2c_cmd_link_create();
i2c_master_start(cmd);
i2c_master_write_byte(cmd, addr << 1 | 1, true); // | 1 to indicate read
diff --git a/ports/esp32s2/common-hal/busio/I2C.h b/ports/esp32s2/common-hal/busio/I2C.h
index 1a989e30a..9629e7b18 100644
--- a/ports/esp32s2/common-hal/busio/I2C.h
+++ b/ports/esp32s2/common-hal/busio/I2C.h
@@ -36,8 +36,8 @@
typedef struct {
mp_obj_base_t base;
- const mcu_pin_obj_t* scl_pin;
- const mcu_pin_obj_t* sda_pin;
+ const mcu_pin_obj_t *scl_pin;
+ const mcu_pin_obj_t *sda_pin;
i2c_port_t i2c_num;
StaticSemaphore_t semaphore;
bool has_lock;
diff --git a/ports/esp32s2/common-hal/busio/SPI.c b/ports/esp32s2/common-hal/busio/SPI.c
index c4d54ec81..917b39111 100644
--- a/ports/esp32s2/common-hal/busio/SPI.c
+++ b/ports/esp32s2/common-hal/busio/SPI.c
@@ -73,18 +73,27 @@ void spi_reset(void) {
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-static bool bus_uses_iomux_pins(spi_host_device_t host, const spi_bus_config_t* bus_config)
-{
- if (bus_config->sclk_io_num>=0 &&
- bus_config->sclk_io_num != spi_periph_signal[host].spiclk_iomux_pin) return false;
- if (bus_config->quadwp_io_num>=0 &&
- bus_config->quadwp_io_num != spi_periph_signal[host].spiwp_iomux_pin) return false;
- if (bus_config->quadhd_io_num>=0 &&
- bus_config->quadhd_io_num != spi_periph_signal[host].spihd_iomux_pin) return false;
+static bool bus_uses_iomux_pins(spi_host_device_t host, const spi_bus_config_t *bus_config) {
+ if (bus_config->sclk_io_num >= 0 &&
+ bus_config->sclk_io_num != spi_periph_signal[host].spiclk_iomux_pin) {
+ return false;
+ }
+ if (bus_config->quadwp_io_num >= 0 &&
+ bus_config->quadwp_io_num != spi_periph_signal[host].spiwp_iomux_pin) {
+ return false;
+ }
+ if (bus_config->quadhd_io_num >= 0 &&
+ bus_config->quadhd_io_num != spi_periph_signal[host].spihd_iomux_pin) {
+ return false;
+ }
if (bus_config->mosi_io_num >= 0 &&
- bus_config->mosi_io_num != spi_periph_signal[host].spid_iomux_pin) return false;
- if (bus_config->miso_io_num>=0 &&
- bus_config->miso_io_num != spi_periph_signal[host].spiq_iomux_pin) return false;
+ bus_config->mosi_io_num != spi_periph_signal[host].spid_iomux_pin) {
+ return false;
+ }
+ if (bus_config->miso_io_num >= 0 &&
+ bus_config->miso_io_num != spi_periph_signal[host].spiq_iomux_pin) {
+ return false;
+ }
return true;
}
@@ -100,20 +109,18 @@ static void spi_interrupt_handler(void *arg) {
}
// The interrupt may get invoked by the bus lock.
-static void spi_bus_intr_enable(void *self)
-{
+static void spi_bus_intr_enable(void *self) {
esp_intr_enable(((busio_spi_obj_t *)self)->interrupt);
}
// The interrupt is always disabled by the ISR itself, not exposed
-static void spi_bus_intr_disable(void *self)
-{
+static void spi_bus_intr_disable(void *self) {
esp_intr_disable(((busio_spi_obj_t *)self)->interrupt);
}
void common_hal_busio_spi_construct(busio_spi_obj_t *self,
- const mcu_pin_obj_t * clock, const mcu_pin_obj_t * mosi,
- const mcu_pin_obj_t * miso) {
+ const mcu_pin_obj_t *clock, const mcu_pin_obj_t *mosi,
+ const mcu_pin_obj_t *miso) {
spi_bus_config_t bus_config;
bus_config.mosi_io_num = mosi != NULL ? mosi->number : -1;
@@ -123,8 +130,8 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
bus_config.quadhd_io_num = -1;
bus_config.max_transfer_sz = 0; // Uses the default
bus_config.flags = SPICOMMON_BUSFLAG_MASTER | SPICOMMON_BUSFLAG_SCLK |
- (mosi != NULL ? SPICOMMON_BUSFLAG_MOSI : 0) |
- (miso != NULL ? SPICOMMON_BUSFLAG_MISO : 0);
+ (mosi != NULL ? SPICOMMON_BUSFLAG_MOSI : 0) |
+ (miso != NULL ? SPICOMMON_BUSFLAG_MISO : 0);
bus_config.intr_flags = 0;
// RAM and Flash is often on SPI1 and is unsupported by the IDF so use it as
@@ -161,8 +168,8 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
// The returned lock is stored in the bus lock but must be freed separately with
// spi_bus_lock_unregister_dev.
result = spi_bus_lock_register_dev(spi_bus_get_attr(host_id)->lock,
- &config,
- &self->lock);
+ &config,
+ &self->lock);
if (result == ESP_ERR_NO_MEM) {
common_hal_busio_spi_deinit(self);
mp_raise_msg(&mp_type_MemoryError, translate("ESP-IDF memory allocation failed"));
@@ -170,8 +177,8 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
lock_dev_handle[host_id] = self->lock;
result = esp_intr_alloc(spicommon_irqsource_for_host(host_id),
- bus_config.intr_flags | ESP_INTR_FLAG_INTRDISABLED,
- spi_interrupt_handler, self, &self->interrupt);
+ bus_config.intr_flags | ESP_INTR_FLAG_INTRDISABLED,
+ spi_interrupt_handler, self, &self->interrupt);
if (result == ESP_ERR_NO_MEM) {
common_hal_busio_spi_deinit(self);
mp_raise_msg(&mp_type_MemoryError, translate("ESP-IDF memory allocation failed"));
@@ -179,7 +186,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
intr_handle[host_id] = self->interrupt;
spi_bus_lock_set_bg_control(spi_bus_get_attr(host_id)->lock, spi_bus_intr_enable, spi_bus_intr_disable, self);
- spi_hal_context_t* hal = &self->hal_context;
+ spi_hal_context_t *hal = &self->hal_context;
// spi_hal_init clears the given hal context so set everything after.
spi_hal_init(hal, host_id);
@@ -256,7 +263,7 @@ void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
}
bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
- uint32_t baudrate, uint8_t polarity, uint8_t phase, uint8_t bits) {
+ uint32_t baudrate, uint8_t polarity, uint8_t phase, uint8_t bits) {
if (baudrate == self->target_frequency &&
polarity == self->polarity &&
phase == self->phase &&
@@ -269,13 +276,13 @@ bool common_hal_busio_spi_configure(busio_spi_obj_t *self,
self->bits = bits;
self->target_frequency = baudrate;
self->hal_context.timing_conf = &self->timing_conf;
- esp_err_t result = spi_hal_get_clock_conf(&self->hal_context,
- self->target_frequency,
- 128 /* duty_cycle */,
- self->connected_through_gpio,
- 0 /* input_delay_ns */,
- &self->real_frequency,
- &self->timing_conf);
+ esp_err_t result = spi_hal_get_clock_conf(&self->hal_context,
+ self->target_frequency,
+ 128 /* duty_cycle */,
+ self->connected_through_gpio,
+ 0 /* input_delay_ns */,
+ &self->real_frequency,
+ &self->timing_conf);
if (result != ESP_OK) {
return false;
}
@@ -306,7 +313,7 @@ void common_hal_busio_spi_unlock(busio_spi_obj_t *self) {
}
bool common_hal_busio_spi_write(busio_spi_obj_t *self,
- const uint8_t *data, size_t len) {
+ const uint8_t *data, size_t len) {
if (self->MOSI_pin == NULL) {
mp_raise_ValueError(translate("No MOSI Pin"));
}
@@ -314,7 +321,7 @@ bool common_hal_busio_spi_write(busio_spi_obj_t *self,
}
bool common_hal_busio_spi_read(busio_spi_obj_t *self,
- uint8_t *data, size_t len, uint8_t write_value) {
+ uint8_t *data, size_t len, uint8_t write_value) {
if (self->MISO_pin == NULL) {
mp_raise_ValueError(translate("No MISO Pin"));
@@ -339,7 +346,7 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, const uint8_t *data_ou
mp_raise_ValueError(translate("No MISO Pin"));
}
- spi_hal_context_t* hal = &self->hal_context;
+ spi_hal_context_t *hal = &self->hal_context;
hal->send_buffer = NULL;
hal->rcv_buffer = NULL;
// Reset timing_conf in case we've moved since the last time we used it.
@@ -377,7 +384,7 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, const uint8_t *data_ou
hal->tx_bitlen = this_length * self->bits;
hal->rx_bitlen = this_length * self->bits;
if (data_out != NULL) {
- hal->send_buffer = (uint8_t*) data_out + offset;
+ hal->send_buffer = (uint8_t *)data_out + offset;
}
if (data_in != NULL) {
hal->rcv_buffer = data_in + offset;
@@ -399,14 +406,14 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, const uint8_t *data_ou
return true;
}
-uint32_t common_hal_busio_spi_get_frequency(busio_spi_obj_t* self) {
+uint32_t common_hal_busio_spi_get_frequency(busio_spi_obj_t *self) {
return self->real_frequency;
}
-uint8_t common_hal_busio_spi_get_phase(busio_spi_obj_t* self) {
+uint8_t common_hal_busio_spi_get_phase(busio_spi_obj_t *self) {
return self->phase;
}
-uint8_t common_hal_busio_spi_get_polarity(busio_spi_obj_t* self) {
+uint8_t common_hal_busio_spi_get_polarity(busio_spi_obj_t *self) {
return self->polarity;
}
diff --git a/ports/esp32s2/common-hal/busio/SPI.h b/ports/esp32s2/common-hal/busio/SPI.h
index d6203feae..488c0954e 100644
--- a/ports/esp32s2/common-hal/busio/SPI.h
+++ b/ports/esp32s2/common-hal/busio/SPI.h
@@ -36,9 +36,9 @@
typedef struct {
mp_obj_base_t base;
- const mcu_pin_obj_t* clock_pin;
- const mcu_pin_obj_t* MOSI_pin;
- const mcu_pin_obj_t* MISO_pin;
+ const mcu_pin_obj_t *clock_pin;
+ const mcu_pin_obj_t *MOSI_pin;
+ const mcu_pin_obj_t *MISO_pin;
spi_host_device_t host_id;
spi_bus_lock_dev_handle_t lock;
spi_hal_context_t hal_context;
diff --git a/ports/esp32s2/common-hal/busio/UART.c b/ports/esp32s2/common-hal/busio/UART.c
index 98cebba67..7da5c0f94 100644
--- a/ports/esp32s2/common-hal/busio/UART.c
+++ b/ports/esp32s2/common-hal/busio/UART.c
@@ -53,11 +53,11 @@ void uart_reset(void) {
}
void common_hal_busio_uart_construct(busio_uart_obj_t *self,
- const mcu_pin_obj_t * tx, const mcu_pin_obj_t * rx,
- const mcu_pin_obj_t * rts, const mcu_pin_obj_t * cts,
- const mcu_pin_obj_t * rs485_dir, bool rs485_invert,
+ const mcu_pin_obj_t *tx, const mcu_pin_obj_t *rx,
+ const mcu_pin_obj_t *rts, const mcu_pin_obj_t *cts,
+ const mcu_pin_obj_t *rs485_dir, bool rs485_invert,
uint32_t baudrate, uint8_t bits, busio_uart_parity_t parity, uint8_t stop,
- mp_float_t timeout, uint16_t receiver_buffer_size, byte* receiver_buffer,
+ mp_float_t timeout, uint16_t receiver_buffer_size, byte *receiver_buffer,
bool sigint_enabled) {
if (bits > 8) {
@@ -163,7 +163,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
uart_set_parity(self->uart_num, parity_mode);
// Stop is 1 or 2 always.
- uart_stop_bits_t stop_bits= UART_STOP_BITS_1;
+ uart_stop_bits_t stop_bits = UART_STOP_BITS_1;
if (stop == 2) {
stop_bits = UART_STOP_BITS_2;
}
@@ -292,7 +292,7 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data,
}
while (len > 0) {
- int count = uart_tx_chars(self->uart_num, (const char*) data, len);
+ int count = uart_tx_chars(self->uart_num, (const char *)data, len);
if (count < 0) {
*errcode = MP_EAGAIN;
return MP_STREAM_ERROR;
@@ -322,7 +322,7 @@ void common_hal_busio_uart_set_baudrate(busio_uart_obj_t *self, uint32_t baudrat
}
mp_float_t common_hal_busio_uart_get_timeout(busio_uart_obj_t *self) {
- return (mp_float_t) (self->timeout_ms / 1000.0f);
+ return (mp_float_t)(self->timeout_ms / 1000.0f);
}
void common_hal_busio_uart_set_timeout(busio_uart_obj_t *self, mp_float_t timeout) {
diff --git a/ports/esp32s2/common-hal/busio/UART.h b/ports/esp32s2/common-hal/busio/UART.h
index 751fb2e00..0d19221c8 100644
--- a/ports/esp32s2/common-hal/busio/UART.h
+++ b/ports/esp32s2/common-hal/busio/UART.h
@@ -34,10 +34,10 @@
typedef struct {
mp_obj_base_t base;
- const mcu_pin_obj_t* rx_pin;
- const mcu_pin_obj_t* tx_pin;
- const mcu_pin_obj_t* rts_pin;
- const mcu_pin_obj_t* cts_pin;
+ const mcu_pin_obj_t *rx_pin;
+ const mcu_pin_obj_t *tx_pin;
+ const mcu_pin_obj_t *rts_pin;
+ const mcu_pin_obj_t *cts_pin;
uart_port_t uart_num;
uint8_t character_bits;
bool rx_error;
generated by cgit v1.2.3 (git 2.39.1) at 2026-08-08 09:04:23 +0000