diff options
| author | jacqueline <me@jacqueline.id.au> | 2023-06-16 13:14:45 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2023-06-16 13:14:45 +1000 |
| commit | 5b7b88420b169d1dfdeea6d082762fccefbc7d49 (patch) | |
| tree | e5bc4a44088a9ac62e1628ffa3265f4819c3c979 /src/drivers | |
| parent | c6bb42cdd21b63accd20012373a8a0e41d8566f5 (diff) | |
| download | tangara-fw-5b7b88420b169d1dfdeea6d082762fccefbc7d49.tar.gz | |
Fix issues with importing my entire library
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/samd.cpp | 6 | ||||
| -rw-r--r-- | src/drivers/touchwheel.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/samd.cpp b/src/drivers/samd.cpp index 5ed99666..e87fc9d8 100644 --- a/src/drivers/samd.cpp +++ b/src/drivers/samd.cpp @@ -38,7 +38,7 @@ Samd::Samd() { .read(&raw_res, I2C_MASTER_NACK) .stop(); ESP_LOGI(kTag, "checking samd firmware rev"); - ESP_ERROR_CHECK(transaction.Execute()); + transaction.Execute(); ESP_LOGI(kTag, "samd firmware: %u", raw_res); } Samd::~Samd() {} @@ -53,7 +53,7 @@ auto Samd::ReadChargeStatus() -> std::optional<ChargeStatus> { .read(&raw_res, I2C_MASTER_NACK) .stop(); ESP_LOGI(kTag, "checking charge status"); - ESP_ERROR_CHECK(transaction.Execute()); + transaction.Execute(); ESP_LOGI(kTag, "raw charge status: %x", raw_res); uint8_t usb_state = raw_res & 0b11; @@ -83,7 +83,7 @@ auto Samd::WriteAllowUsbMsc(bool is_allowed) -> void { .write_addr(kAddress, I2C_MASTER_WRITE) .write_ack(kRegisterUsbMsc, is_allowed) .stop(); - ESP_ERROR_CHECK(transaction.Execute()); + transaction.Execute(); } auto Samd::ReadUsbMscStatus() -> UsbMscStatus { diff --git a/src/drivers/touchwheel.cpp b/src/drivers/touchwheel.cpp index cd189388..576b6dad 100644 --- a/src/drivers/touchwheel.cpp +++ b/src/drivers/touchwheel.cpp @@ -65,7 +65,7 @@ void TouchWheel::WriteRegister(uint8_t reg, uint8_t val) { .write_addr(kTouchWheelAddress, I2C_MASTER_WRITE) .write_ack(reg, val) .stop(); - ESP_ERROR_CHECK(transaction.Execute()); + transaction.Execute(); } uint8_t TouchWheel::ReadRegister(uint8_t reg) { @@ -78,7 +78,7 @@ uint8_t TouchWheel::ReadRegister(uint8_t reg) { .write_addr(kTouchWheelAddress, I2C_MASTER_READ) .read(&res, I2C_MASTER_NACK) .stop(); - ESP_ERROR_CHECK(transaction.Execute()); + transaction.Execute(); return res; } |
