Skip to content

I2C - Peripheral manager implementation #8220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 31, 2023
Merged

I2C - Peripheral manager implementation #8220

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11cfde2
i2c-master periman initial commit
P-R-O-C-H-Y May 16, 2023
a65284b
i2c-master make detachbus static + comment remove
P-R-O-C-H-Y May 17, 2023
0e4ae96
i2c-slave periman implementation
P-R-O-C-H-Y May 17, 2023
8446fa3
SetPinBus to INIT on i2cDeinits
P-R-O-C-H-Y May 17, 2023
eef101a
Fix slave pins deinit
P-R-O-C-H-Y May 17, 2023
e911566
remove dbg logs
P-R-O-C-H-Y May 17, 2023
f53e6d5
set ret to ESP_FAIL instead of returning
P-R-O-C-H-Y May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
i2c-master periman initial commit
  • Loading branch information
@P-R-O-C-H-Y
P-R-O-C-H-Y committed May 16, 2023
commit 11cfde2d90d7abdd73bfc97cac11265d22d6e8d8
29 changes: 29 additions & 0 deletions cores/esp32/esp32-hal-i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "hal/i2c_hal.h"
#include "hal/i2c_ll.h"
#include "driver/i2c.h"
#include "esp32-hal-periman.h"

typedef volatile struct {
bool initialized;
Expand All @@ -37,6 +38,21 @@ typedef volatile struct {

static i2c_bus_t bus[SOC_I2C_NUM];

bool i2cDetachBus(void * bus_i2c_num){
uint8_t i2c_num = (int)bus_i2c_num - 1;
if(!bus[i2c_num].initialized){
log_d("i2cDetachBus I2C%d not initialized", i2c_num);
return true;
}
log_d("i2cDetachBus I2C%d calling i2cDeinit()", i2c_num);
esp_err_t err = i2cDeinit(i2c_num);
if(err != ESP_OK){
log_e("i2cDeinit failed with error: %d", err);
return false;
}
return true;
}

bool i2cIsInit(uint8_t i2c_num){
if(i2c_num >= SOC_I2C_NUM){
return false;
Expand Down Expand Up @@ -72,6 +88,12 @@ esp_err_t i2cInit(uint8_t i2c_num, int8_t sda, int8_t scl, uint32_t frequency){
} else if(frequency > 1000000UL){
frequency = 1000000UL;
}

if(!perimanSetPinBus(sda, ESP32_BUS_TYPE_INIT, NULL) || !perimanSetPinBus(scl, ESP32_BUS_TYPE_INIT, NULL)){
return false;
}
perimanSetBusDeinit(ESP32_BUS_TYPE_I2C_MASTER, i2cDetachBus);

log_i("Initialising I2C Master: sda=%d scl=%d freq=%d", sda, scl, frequency);

i2c_config_t conf = { };
Expand All @@ -95,6 +117,10 @@ esp_err_t i2cInit(uint8_t i2c_num, int8_t sda, int8_t scl, uint32_t frequency){
bus[i2c_num].frequency = frequency;
//Clock Stretching Timeout: 20b:esp32, 5b:esp32-c3, 24b:esp32-s2
i2c_set_timeout((i2c_port_t)i2c_num, I2C_LL_MAX_TIMEOUT);
if(!perimanSetPinBus(sda, ESP32_BUS_TYPE_I2C_MASTER, (void *)(i2c_num+1)) || !perimanSetPinBus(scl, ESP32_BUS_TYPE_I2C_MASTER, (void *)(i2c_num+1))){
i2cDetachBus((void *)(i2c_num+1));
return false;
}
}
}
#if !CONFIG_DISABLE_HAL_LOCKS
Expand Down Expand Up @@ -122,6 +148,9 @@ esp_err_t i2cDeinit(uint8_t i2c_num){
err = i2c_driver_delete((i2c_port_t)i2c_num);
if(err == ESP_OK){
bus[i2c_num].initialized = false;
/*
Add perimanSetPinBus(pin, ESP32_BUS_TYPE_INIT, NULL); for both pins -> add them to bus structure
*/
}
}
#if !CONFIG_DISABLE_HAL_LOCKS
Expand Down