Nicla: add overloads for LED*

Author: facchinm

libraries/Nicla_System/Nicla_System.cpp

@@ -12,6 +12,7 @@
 RGBled nicla::leds;
 BQ25120A nicla::_pmic;
 rtos::Mutex nicla::i2c_mutex;
+bool nicla::started = false;
 
 void nicla::pingI2CThd() {
   while(1) {
@@ -30,6 +31,7 @@ bool nicla::begin()
   static rtos::Thread th(osPriorityHigh, 1024, nullptr, "ping_thread");
   th.start(&nicla::pingI2CThd);
 #endif
+  started = true;
 }
 
 void nicla::enableCD()
@@ -109,3 +111,39 @@ uint8_t nicla::readLDOreg()
   disableCD();
   return ldo_reg;
 }
+
+I2CLed  LEDR(red);
+I2CLed  LEDG(green);
+I2CLed  LEDB(blue);
+I2CLed  LED_BUILTIN(white);
+
+void pinMode(I2CLed pin, PinMode mode)
+{
+  if (!nicla::started) {
+    nicla::begin();
+    nicla::leds.begin();
+    nicla::leds.setColor(off);
+  }
+}
+
+void digitalWrite(I2CLed pin, PinStatus value)
+{
+  switch (pin.get()) {
+    case red:
+      nicla::leds.setColorRed(value == LOW ? 0 : 0xFF);
+      break;
+    case blue:
+      nicla::leds.setColorBlue(value == LOW ? 0 : 0xFF);
+      break;
+    case green:
+      nicla::leds.setColorGreen(value == LOW ? 0 : 0xFF);
+      break;
+    case white:
+      if (value == LOW) {
+        nicla::leds.setColor(0, 0, 0);
+      } else {
+        nicla::leds.setColor(0xFF, 0xFF, 0xFF);
+      }
+      break;
+  }
+}

libraries/Nicla_System/Nicla_System.h

@@ -23,6 +23,8 @@ class nicla {
   friend class BQ25120A;
   friend class Arduino_BHY2;
 
+  static bool started;
+
 private:
   static void pingI2CThd();
   static void enableCD();

libraries/Nicla_System/RGBled.cpp

@@ -71,18 +71,32 @@ void RGBled::setColor(RGBColors color)
   _red = 0x20;
   }
 
-  setColor(_blue, _green, _red);
+  setColor(_red, _green, _blue);
 
 }
 
-void RGBled::setColor(uint8_t blue, uint8_t green, uint8_t red)
+void RGBled::setColorBlue(uint8_t blue) {
+  writeByte(IS31FL3194_ADDRESS, IS31FL3194_OUT1, blue >> scale_factor);
+  writeByte(IS31FL3194_ADDRESS, IS31FL3194_COLOR_UPDATE, 0xC5);
+}
+
+void RGBled::setColorRed(uint8_t red) {
+  writeByte(IS31FL3194_ADDRESS, IS31FL3194_OUT3, red  >> scale_factor);
+  writeByte(IS31FL3194_ADDRESS, IS31FL3194_COLOR_UPDATE, 0xC5);
+}
+
+void RGBled::setColorGreen(uint8_t green) {
+  writeByte(IS31FL3194_ADDRESS, IS31FL3194_OUT2, green >> scale_factor);
+  writeByte(IS31FL3194_ADDRESS, IS31FL3194_COLOR_UPDATE, 0xC5);
+}
+
+void RGBled::setColor(uint8_t red, uint8_t green, uint8_t blue)
 {
   // set rgb led current
-  writeByte(IS31FL3194_ADDRESS, IS31FL3194_OUT1, blue); //maximum current
-  writeByte(IS31FL3194_ADDRESS, IS31FL3194_OUT2, green);
-  writeByte(IS31FL3194_ADDRESS, IS31FL3194_OUT3, red);
+  writeByte(IS31FL3194_ADDRESS, IS31FL3194_OUT1, blue >> scale_factor); //maximum current
+  writeByte(IS31FL3194_ADDRESS, IS31FL3194_OUT2, green >> scale_factor);
+  writeByte(IS31FL3194_ADDRESS, IS31FL3194_OUT3, red >> scale_factor);
   writeByte(IS31FL3194_ADDRESS, IS31FL3194_COLOR_UPDATE, 0xC5); // write to color update register for changes to take effect
-
 }
 
 // Read the Chip ID register, this is a good test of communication
@@ -141,7 +155,7 @@ void RGBled::writeByte(uint8_t address, uint8_t subAddress, uint8_t data)
 uint8_t RGBled::readByte(uint8_t address, uint8_t subAddress)
 {
   nicla::i2c_mutex.lock();
-  char response = 0xFF;
+  //char response = 0xFF;
   Wire1.beginTransmission(address);
   Wire1.write(subAddress);
   Wire1.endTransmission(false);

libraries/Nicla_System/RGBled.h

@@ -132,7 +132,8 @@ enum RGBColors {
   blue = 3,
   yellow = 4,
   magenta = 5,
-  cyan = 6
+  cyan = 6,
+  white = 7
 };
 
 /*
@@ -156,7 +157,30 @@ class RGBled
   void begin();
   void end();
   void setColor(RGBColors color);
-  void setColor(uint8_t blue, uint8_t green, uint8_t red);
+  void setColor(uint8_t red, uint8_t green, uint8_t blue);
+
+  void setColorBlue(uint8_t blue = 0xFF);
+  void setColorRed(uint8_t red = 0xFF);
+  void setColorGreen(uint8_t green = 0xFF);
+
+  /* intensity from 1 (lowest) to 8 (full) */
+  void setIntensity(uint8_t power) {
+    scale_factor = 8 - power;
+    if (scale_factor < 0) {
+      scale_factor = 0;
+    }
+    /*
+    if (power > 8) {
+      writeByte(IS31FL3194_ADDRESS, IS31FL3194_CURRENT_BAND, 0x15);
+    }
+    if (power > 16) {
+      writeByte(IS31FL3194_ADDRESS, IS31FL3194_CURRENT_BAND, 0x2A);
+    }
+    if (power > 32) {
+      writeByte(IS31FL3194_ADDRESS, IS31FL3194_CURRENT_BAND, 0x3F);
+    }
+    */
+  }
 
 private:
   void init();
@@ -173,6 +197,7 @@ class RGBled
   uint8_t _green;
   uint8_t _red;
 
+  int8_t scale_factor = 4;
 };
 
 #endif

libraries/Scheduler/examples/MultipleBlinks/MultipleBlinks.ino

@@ -34,6 +34,15 @@
 #define led2  LEDG
 #define led3  LEDB
 
+// On Nicla Sense ME, RGB leds are connected via an I2C module
+// The user APIs are the same, but we can't convert to int, so use defines
+#elif defined(ARDUINO_NICLA)
+
+#include "Nicla_System.h"
+#define led1  LEDR
+#define led2  LEDG
+#define led3  LEDB
+
 #else
 
 int led1 = LEDR;

variants/NICLA/pins_arduino.h

@@ -139,4 +139,34 @@ static const uint8_t SCK  = PIN_SPI_SCK;
 uint8_t getUniqueSerialNumber(uint8_t* name);
 void _ontouch1200bps_();
 
+#if __has_include("Nicla_System.h")
+#  define NICLA_SYSTEM_ATTRIBUTE
+#else
+#  define NICLA_SYSTEM_ATTRIBUTE __attribute__ ((error("Please include Nicla_System.h to use this pin")))
+#endif
+
+class I2CLed {
+public:
+  I2CLed(int _pin) : pin(_pin) {};
+  int get() {
+    return pin;
+  };
+  bool operator== (I2CLed const & other) const {
+    return pin == other.pin;
+  }
+  //operator int() = delete;
+  __attribute__ ((error("Change me to a #define"))) operator int();
+private:
+  int pin;
+};
+
+extern I2CLed  LEDR;
+extern I2CLed  LEDG;
+extern I2CLed  LEDB;
+extern I2CLed  LED_BUILTIN;
+
+void      NICLA_SYSTEM_ATTRIBUTE pinMode     (I2CLed pin, PinMode mode);
+PinStatus NICLA_SYSTEM_ATTRIBUTE digitalRead (I2CLed pin);
+void      NICLA_SYSTEM_ATTRIBUTE digitalWrite(I2CLed pin, PinStatus value);
+
 #endif //__PINS_ARDUINO__