686f7cce83
FreeRTOS handles were stored plainly and they were deleted in the destructor of classes. This meant that if a class were to be copied, the destructor would be called twice on the same handles and lead to double-free. Seha on Discord suggested to fix this by using `std::unique_ptr` with a custom deletion function. The changes affect: - Thread - Semaphore - Mutex - StreamBuffer - Timer - MessageQueue - EventFlag Thread changes: - Removal of the hack with the `Data` struct - Thread's main body is now just a private static function inside the class. - The C functions were relocated to static class members PubSub changes: - Refactored pubsub into class - Renamed files to `PubSub` instead of `Pubsub` - `PubSubSubscription` is now a private inner struct and `PubSub` only exposes `SubscriptionHandle` Lockable, ScopedLockable, Mutex: - Added `lock()` method that locks indefinitely - Remove deprecated `acquire()` and `release()` methods - Removed `TtWaitForever` in favour of `portMAX_DELAY`
61 lines
1.7 KiB
C++
61 lines
1.7 KiB
C++
#include "I2cDevice.h"
|
|
#include <cstdint>
|
|
|
|
bool I2cDevice::readRegister12(uint8_t reg, float& out) const {
|
|
std::uint8_t data[2] = {0};
|
|
if (tt::hal::i2c::masterReadRegister(port, address, reg, data, 2, DEFAULT_TIMEOUT)) {
|
|
out = (data[0] & 0x0F) << 8 | data[1];
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
bool I2cDevice::readRegister14(uint8_t reg, float& out) const {
|
|
std::uint8_t data[2] = {0};
|
|
if (tt::hal::i2c::masterReadRegister(port, address, reg, data, 2, DEFAULT_TIMEOUT)) {
|
|
out = (data[0] & 0x3F) << 8 | data[1];
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
bool I2cDevice::readRegister16(uint8_t reg, uint16_t& out) const {
|
|
std::uint8_t data[2] = {0};
|
|
if (tt::hal::i2c::masterReadRegister(port, address, reg, data, 2, DEFAULT_TIMEOUT)) {
|
|
out = data[0] << 8 | data[1];
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
bool I2cDevice::readRegister8(uint8_t reg, uint8_t& result) const {
|
|
return tt::hal::i2c::masterWriteRead(port, address, ®, 1, &result, 1, DEFAULT_TIMEOUT);
|
|
}
|
|
|
|
bool I2cDevice::writeRegister8(uint8_t reg, uint8_t value) const {
|
|
return tt::hal::i2c::masterWriteRegister(port, address, reg, &value, 1, DEFAULT_TIMEOUT);
|
|
}
|
|
|
|
bool I2cDevice::bitOn(uint8_t reg, uint8_t bitmask) const {
|
|
uint8_t state;
|
|
if (readRegister8(reg, state)) {
|
|
state |= bitmask;
|
|
return writeRegister8(reg, state);
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
bool I2cDevice::bitOff(uint8_t reg, uint8_t bitmask) const {
|
|
uint8_t state;
|
|
if (readRegister8(reg, state)) {
|
|
state &= ~bitmask;
|
|
return writeRegister8(reg, state);
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|