mirror of
https://git.intern.spaceteamaachen.de/ALPAKA/sta-core.git
synced 2025-08-06 10:27:34 +00:00
Updated I2C for ESP32 and added mutex protection for printable serial
This commit is contained in:
@@ -7,11 +7,19 @@
|
||||
|
||||
namespace sta
|
||||
{
|
||||
#ifdef STA_PLATFORM_ARDUINO_DEVICE_ESP32
|
||||
ArduinoI2C::ArduinoI2C(Mutex * mutex /* = nullptr */, uint8_t sda /* = STA_ESP32_SDA_DEFAULT_PIN */, uint8_t scl /*= STA_ESP32_SCL_DEFAULT_PIN */, uint32_t frequency /* = 0U */)
|
||||
: I2C{mutex}
|
||||
{
|
||||
Wire.begin(sda, scl, frequency);
|
||||
}
|
||||
#else
|
||||
ArduinoI2C::ArduinoI2C(Mutex * mutex /* = nullptr */)
|
||||
: I2C{mutex}
|
||||
{
|
||||
Wire.begin();
|
||||
}
|
||||
#endif // STA_PLATFORM_ARDUINO_DEVICE_ESP32
|
||||
|
||||
void ArduinoI2C::transfer(uint8_t value)
|
||||
{
|
||||
@@ -36,15 +44,11 @@ namespace sta
|
||||
|
||||
void ArduinoI2C::receive(uint8_t * buffer, size_t size)
|
||||
{
|
||||
Wire.requestFrom((uint8_t)address_, (uint8_t)size);
|
||||
size_t index = 0;
|
||||
size_t count = Wire.requestFrom((uint8_t)address_, (uint8_t)size, true);
|
||||
|
||||
while (index < size)
|
||||
for (size_t i = 0; i < min(size, count); ++i)
|
||||
{
|
||||
while (Wire.available())
|
||||
{
|
||||
buffer[index++] = Wire.read();
|
||||
}
|
||||
buffer[i] = Wire.read();
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -3,18 +3,22 @@
|
||||
#ifdef STA_PLATFORM_ARDUINO
|
||||
|
||||
#include <sta/devices/arduino/hal.hpp>
|
||||
#include <sta/mutex.hpp>
|
||||
|
||||
namespace sta
|
||||
{
|
||||
PrintableSerial::PrintableSerial(unsigned long baud)
|
||||
: Printable{}
|
||||
PrintableSerial::PrintableSerial(unsigned long baud, Mutex * mutex /* = nullptr */)
|
||||
: Printable{},
|
||||
mutex_{mutex}
|
||||
{
|
||||
Serial.begin(baud);
|
||||
}
|
||||
|
||||
void PrintableSerial::print(const char * str, size_t length)
|
||||
{
|
||||
mutex_->acquire();
|
||||
Serial.write(str);
|
||||
mutex_->release();
|
||||
}
|
||||
} // namespace sta
|
||||
|
||||
|
Reference in New Issue
Block a user