summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2023-07-20 22:12:17 +1000
committerjacqueline <me@jacqueline.id.au>2023-07-20 22:12:17 +1000
commit9287c4eb8c60cc89251a1d2bdfe9c576d81d6715 (patch)
tree598f38d87769588256f480f49e376d29fbec39a9 /src
parent4c1f150cbf0a2b0cc3a3b092cff68cd167c0cdca (diff)
downloadtangara-fw-9287c4eb8c60cc89251a1d2bdfe9c576d81d6715.tar.gz
5.1 fixes
Diffstat (limited to 'src')
-rw-r--r--src/drivers/i2c.cpp5
-rw-r--r--src/drivers/include/i2c.hpp2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/drivers/i2c.cpp b/src/drivers/i2c.cpp
index 814c5140..75beacda 100644
--- a/src/drivers/i2c.cpp
+++ b/src/drivers/i2c.cpp
@@ -11,6 +11,7 @@
#include "assert.h"
#include "driver/i2c.h"
#include "esp_err.h"
+#include "hal/i2c_types.h"
namespace drivers {
@@ -46,8 +47,6 @@ esp_err_t init_i2c(void) {
return err;
}
- // TODO: INT line
-
return ESP_OK;
}
@@ -66,7 +65,7 @@ I2CTransaction::~I2CTransaction() {
free(buffer_);
}
-esp_err_t I2CTransaction::Execute(uint8_t port) {
+esp_err_t I2CTransaction::Execute(i2c_port_t port) {
return i2c_master_cmd_begin(port, handle_, kI2CTimeout);
}
diff --git a/src/drivers/include/i2c.hpp b/src/drivers/include/i2c.hpp
index bc6b3686..213fb7b3 100644
--- a/src/drivers/include/i2c.hpp
+++ b/src/drivers/include/i2c.hpp
@@ -41,7 +41,7 @@ class I2CTransaction {
* ESP_ERR_INVALID_STATE I2C driver not installed or not in master mode.
* ESP_ERR_TIMEOUT Operation timeout because the bus is busy.
*/
- esp_err_t Execute(uint8_t port = I2C_NUM_0);
+ esp_err_t Execute(i2c_port_t port = I2C_NUM_0);
/*
* Enqueues a start condition. May also be used for repeated start