Pass wire mutex via constructor, now back light can be used without explicit locking.

Author: aentinger

src/Braccio++.cpp

@@ -29,7 +29,7 @@ BraccioClass::BraccioClass()
 , _is_motor_connected{false}
 , _motors_connected_mtx{}
 , _motors_connected_thd{}
-, _bl{}
+, _bl{i2c_mutex}
 , _gfx{}
 , _lvgl_disp_drv{}
 , _lvgl_indev_drv{}
@@ -66,15 +66,13 @@ bool BraccioClass::begin(voidFuncPtr custom_menu)
 
   pinMode(1, INPUT_PULLUP);
 
-  SPI.begin();
-
-  i2c_mutex.lock();
   _bl.begin();
-  if (_bl.getChipID() != 0xCE) {
+  if (_bl.getChipID() != 0xCE)
     return false;
-  }
   _bl.on();
 
+  SPI.begin();
+  i2c_mutex.lock();
   int ret = _expander.testConnection();
 
   if (ret == false) {

src/lib/display/Backlight.cpp

@@ -15,10 +15,18 @@
  * INCLUDE
  **************************************************************************************/
 
-#include <Arduino.h>
-#include <Wire.h>
 #include "Backlight.h"
 
+/**************************************************************************************
+ * CTOR/DTOR
+ **************************************************************************************/
+
+Backlight::Backlight(rtos::Mutex & wire_mtx)
+: _wire_mtx{wire_mtx}
+{
+
+}
+
 /**************************************************************************************
  * PUBLIC MEMBER FUNCTIONS
  **************************************************************************************/
@@ -96,6 +104,8 @@ void Backlight::setColor(uint8_t blue, uint8_t green, uint8_t red)
 
 void Backlight::writeByte(uint8_t address, uint8_t subAddress, uint8_t data)
 {
+  mbed::ScopedLock<rtos::Mutex> lock(_wire_mtx);
+
   Wire.beginTransmission(address);
   Wire.write(subAddress);
   Wire.write(data);
@@ -104,6 +114,8 @@ void Backlight::writeByte(uint8_t address, uint8_t subAddress, uint8_t data)
 
 uint8_t Backlight::readByte(uint8_t address, uint8_t subAddress)
 {
+  mbed::ScopedLock<rtos::Mutex> lock(_wire_mtx);
+
   char response = 0xFF;
   Wire.beginTransmission(address);
   Wire.write(subAddress);

src/lib/display/Backlight.h

@@ -5,6 +5,8 @@
  * INCLUDE
  **************************************************************************************/
 
+#include <Arduino.h>
+
 #include <Wire.h>
 
 /**************************************************************************************
@@ -143,7 +145,8 @@ class Backlight
 {
 public:
 
-  Backlight() { }
+  Backlight(rtos::Mutex & wire_mtx);
+
 
   void begin();
   void end();
@@ -156,6 +159,8 @@ class Backlight
 
 private:
 
+  rtos::Mutex & _wire_mtx;
+
   void init();
   void reset();
   void powerDown();