summaryrefslogtreecommitdiff
path: root/stmhal/i2c.c
diff options
context:
space:
mode:
Diffstat (limited to 'stmhal/i2c.c')
-rw-r--r--stmhal/i2c.c95
1 files changed, 54 insertions, 41 deletions
diff --git a/stmhal/i2c.c b/stmhal/i2c.c
index 6ed1eef10..8a8dd7dc2 100644
--- a/stmhal/i2c.c
+++ b/stmhal/i2c.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <string.h>
-#include <stm32f4xx_hal.h>
+#include "stm32f4xx_hal.h"
#include "nlr.h"
#include "misc.h"
@@ -9,58 +9,71 @@
#include "qstr.h"
#include "obj.h"
#include "runtime.h"
+#include "pin.h"
+#include "genhdr/pins.h"
#include "i2c.h"
-I2C_HandleTypeDef I2cHandle_X;
-I2C_HandleTypeDef I2cHandle_Y;
+I2C_HandleTypeDef I2CHandle1 = {.Instance = NULL};
+I2C_HandleTypeDef I2CHandle2 = {.Instance = NULL};
-void i2c_init(void) {
- // init the I2C1 device
- memset(&I2cHandle_X, 0, sizeof(I2C_HandleTypeDef));
- I2cHandle_X.Instance = I2C1;
-
- // init the I2C2 device
- memset(&I2cHandle_Y, 0, sizeof(I2C_HandleTypeDef));
- I2cHandle_Y.Instance = I2C2;
+void i2c_init0(void) {
+ // reset the I2C1 handles
+ memset(&I2CHandle1, 0, sizeof(I2C_HandleTypeDef));
+ I2CHandle1.Instance = I2C1;
+ memset(&I2CHandle2, 0, sizeof(I2C_HandleTypeDef));
+ I2CHandle2.Instance = I2C2;
}
-void i2c_start(I2C_HandleTypeDef *i2c_handle) {
- GPIO_InitTypeDef GPIO_InitStructure;
-
+void i2c_init(I2C_HandleTypeDef *i2c) {
// init the GPIO lines
+ GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.Mode = GPIO_MODE_AF_OD;
GPIO_InitStructure.Speed = GPIO_SPEED_FAST;
GPIO_InitStructure.Pull = GPIO_NOPULL; // have external pull-up resistors on both lines
- if (i2c_handle == &I2cHandle_X) {
+ const pin_obj_t *pins[2];
+ if (i2c == &I2CHandle1) {
// X-skin: X9=PB6=SCL, X10=PB7=SDA
- GPIO_InitStructure.Pin = GPIO_PIN_6 | GPIO_PIN_7;
+ pins[0] = &pin_B6;
+ pins[1] = &pin_B7;
GPIO_InitStructure.Alternate = GPIO_AF4_I2C1;
- HAL_GPIO_Init(GPIOB, &GPIO_InitStructure);
// enable the I2C clock
__I2C1_CLK_ENABLE();
} else {
// Y-skin: Y9=PB10=SCL, Y10=PB11=SDA
- GPIO_InitStructure.Pin = GPIO_PIN_10 | GPIO_PIN_11;
+ pins[0] = &pin_B10;
+ pins[1] = &pin_B11;
GPIO_InitStructure.Alternate = GPIO_AF4_I2C2;
- HAL_GPIO_Init(GPIOB, &GPIO_InitStructure);
// enable the I2C clock
__I2C2_CLK_ENABLE();
}
+ // init the GPIO lines
+ for (uint i = 0; i < 2; i++) {
+ GPIO_InitStructure.Pin = pins[i]->pin_mask;
+ HAL_GPIO_Init(pins[i]->gpio, &GPIO_InitStructure);
+ }
+
+ // enable the I2C clock
+ if (i2c == &I2CHandle1) {
+ __I2C1_CLK_ENABLE();
+ } else {
+ __I2C2_CLK_ENABLE();
+ }
+
// init the I2C device
- i2c_handle->Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
- i2c_handle->Init.ClockSpeed = 400000;
- i2c_handle->Init.DualAddressMode = I2C_DUALADDRESS_DISABLED;
- i2c_handle->Init.DutyCycle = I2C_DUTYCYCLE_16_9;
- i2c_handle->Init.GeneralCallMode = I2C_GENERALCALL_DISABLED;
- i2c_handle->Init.NoStretchMode = I2C_NOSTRETCH_DISABLED;
- i2c_handle->Init.OwnAddress1 = 0xfe; // unused
- i2c_handle->Init.OwnAddress2 = 0xfe; // unused
-
- if (HAL_I2C_Init(i2c_handle) != HAL_OK) {
+ i2c->Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
+ i2c->Init.ClockSpeed = 400000;
+ i2c->Init.DualAddressMode = I2C_DUALADDRESS_DISABLED;
+ i2c->Init.DutyCycle = I2C_DUTYCYCLE_16_9;
+ i2c->Init.GeneralCallMode = I2C_GENERALCALL_DISABLED;
+ i2c->Init.NoStretchMode = I2C_NOSTRETCH_DISABLED;
+ i2c->Init.OwnAddress1 = 0xfe; // unused
+ i2c->Init.OwnAddress2 = 0xfe; // unused
+
+ if (HAL_I2C_Init(i2c) != HAL_OK) {
// init error
- printf("accel_init: HAL_I2C_Init failed\n");
+ printf("HardwareError: HAL_I2C_Init failed\n");
return;
}
}
@@ -72,10 +85,10 @@ void i2c_start(I2C_HandleTypeDef *i2c_handle) {
typedef struct _pyb_i2c_obj_t {
mp_obj_base_t base;
- I2C_HandleTypeDef *i2c_handle;
+ I2C_HandleTypeDef *i2c;
} pyb_i2c_obj_t;
-STATIC const pyb_i2c_obj_t pyb_i2c_obj[PYB_NUM_I2C] = {{{&pyb_i2c_type}, &I2cHandle_X}, {{&pyb_i2c_type}, &I2cHandle_Y}};
+STATIC const pyb_i2c_obj_t pyb_i2c_obj[PYB_NUM_I2C] = {{{&pyb_i2c_type}, &I2CHandle1}, {{&pyb_i2c_type}, &I2CHandle2}};
STATIC mp_obj_t pyb_i2c_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
// check arguments
@@ -93,7 +106,7 @@ STATIC mp_obj_t pyb_i2c_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const
const pyb_i2c_obj_t *i2c_obj = &pyb_i2c_obj[i2c_id];
// start the peripheral
- i2c_start(i2c_obj->i2c_handle);
+ i2c_init(i2c_obj->i2c);
return (mp_obj_t)i2c_obj;
}
@@ -104,7 +117,7 @@ STATIC mp_obj_t pyb_i2c_is_ready(mp_obj_t self_in, mp_obj_t i2c_addr_o) {
machine_uint_t i2c_addr = mp_obj_get_int(i2c_addr_o) << 1;
for (int i = 0; i < 10; i++) {
- HAL_StatusTypeDef status = HAL_I2C_IsDeviceReady(self->i2c_handle, i2c_addr, 10, 200);
+ HAL_StatusTypeDef status = HAL_I2C_IsDeviceReady(self->i2c, i2c_addr, 10, 200);
if (status == HAL_OK) {
return mp_const_true;
}
@@ -123,7 +136,7 @@ STATIC mp_obj_t pyb_i2c_scan(mp_obj_t self_in) {
for (uint addr = 1; addr <= 127; addr++) {
for (int i = 0; i < 10; i++) {
- HAL_StatusTypeDef status = HAL_I2C_IsDeviceReady(self->i2c_handle, addr << 1, 10, 200);
+ HAL_StatusTypeDef status = HAL_I2C_IsDeviceReady(self->i2c, addr << 1, 10, 200);
if (status == HAL_OK) {
mp_obj_list_append(list, mp_obj_new_int(addr));
break;
@@ -143,7 +156,7 @@ STATIC mp_obj_t pyb_i2c_read(mp_obj_t self_in, mp_obj_t i2c_addr_in, mp_obj_t n_
byte *data;
mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, n, &data);
- HAL_StatusTypeDef status = HAL_I2C_Master_Receive(self->i2c_handle, i2c_addr, data, n, 500);
+ HAL_StatusTypeDef status = HAL_I2C_Master_Receive(self->i2c, i2c_addr, data, n, 500);
if (status != HAL_OK) {
// TODO really need a HardwareError object, or something
@@ -161,11 +174,11 @@ STATIC mp_obj_t pyb_i2c_write(mp_obj_t self_in, mp_obj_t i2c_addr_in, mp_obj_t d
HAL_StatusTypeDef status;
if (MP_OBJ_IS_INT(data_in)) {
uint8_t data[1] = {mp_obj_get_int(data_in)};
- status = HAL_I2C_Master_Transmit(self->i2c_handle, i2c_addr, data, 1, 500);
+ status = HAL_I2C_Master_Transmit(self->i2c, i2c_addr, data, 1, 500);
} else {
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_READ);
- status = HAL_I2C_Master_Transmit(self->i2c_handle, i2c_addr, bufinfo.buf, bufinfo.len, 500);
+ status = HAL_I2C_Master_Transmit(self->i2c, i2c_addr, bufinfo.buf, bufinfo.len, 500);
}
if (status != HAL_OK) {
@@ -186,7 +199,7 @@ STATIC mp_obj_t pyb_i2c_mem_read(uint n_args, const mp_obj_t *args) {
byte *data;
mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, n, &data);
- HAL_StatusTypeDef status = HAL_I2C_Mem_Read(self->i2c_handle, i2c_addr, mem_addr, I2C_MEMADD_SIZE_8BIT, data, n, 200);
+ HAL_StatusTypeDef status = HAL_I2C_Mem_Read(self->i2c, i2c_addr, mem_addr, I2C_MEMADD_SIZE_8BIT, data, n, 200);
//printf("Read got %d\n", status);
@@ -207,11 +220,11 @@ STATIC mp_obj_t pyb_i2c_mem_write(uint n_args, const mp_obj_t *args) {
HAL_StatusTypeDef status;
if (MP_OBJ_IS_INT(args[3])) {
uint8_t data[1] = {mp_obj_get_int(args[3])};
- status = HAL_I2C_Mem_Write(self->i2c_handle, i2c_addr, mem_addr, I2C_MEMADD_SIZE_8BIT, data, 1, 200);
+ status = HAL_I2C_Mem_Write(self->i2c, i2c_addr, mem_addr, I2C_MEMADD_SIZE_8BIT, data, 1, 200);
} else {
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);
- status = HAL_I2C_Mem_Write(self->i2c_handle, i2c_addr, mem_addr, I2C_MEMADD_SIZE_8BIT, bufinfo.buf, bufinfo.len, 200);
+ status = HAL_I2C_Mem_Write(self->i2c, i2c_addr, mem_addr, I2C_MEMADD_SIZE_8BIT, bufinfo.buf, bufinfo.len, 200);
}
//printf("Write got %d\n", status);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-25 07:53:57 +0000