Add support for ModulinoHub

Author: facchinm

src/Modulino.cpp

@@ -29,4 +29,11 @@ void __increaseI2CPriority() {
 }
 #else
 void __increaseI2CPriority() {}
-#endif
+#endif
+
+int ModulinoHubPort::select() {
+    return _hub->select(_port);
+}
+int ModulinoHubPort::clear() {
+    return _hub->clear();
+}

src/Modulino.h

@@ -56,14 +56,53 @@ class ModulinoClass {
   friend class Module;
 protected:
   HardwareI2C* _wire;
+  friend class ModulinoHub;
+  friend class ModulinoHubPort;
 };
 
 extern ModulinoClass Modulino;
 
+// Forward declaration of ModulinoHub
+class ModulinoHub;
+
+class ModulinoHubPort {
+  public:
+    ModulinoHubPort(int port, ModulinoHub* hub) : _port(port), _hub(hub) {}
+    int select();
+    int clear();
+  private:
+    int _port;
+    ModulinoHub* _hub;
+};
+
+class ModulinoHub {
+  public:
+    ModulinoHub(int address = 0x70) : _address(address){  }
+    ModulinoHubPort* port(int _port) {
+      return new ModulinoHubPort(_port, this);
+    }
+    int select(int port) {
+      Modulino._wire->beginTransmission(_address);
+      Modulino._wire->write(1 << port);
+      return Modulino._wire->endTransmission();
+    }
+    int clear() {
+      Modulino._wire->beginTransmission(_address);
+      Modulino._wire->write((uint8_t)0);
+      return Modulino._wire->endTransmission();
+    }
+
+    int address() {
+      return _address;
+    }
+  private:
+    int _address;
+};
+
 class Module : public Printable {
 public:
-  Module(uint8_t address = 0xFF, const char* name = "")
-    : address(address), name((char *)name) {}
+  Module(uint8_t address = 0xFF, const char* name = "", ModulinoHubPort* hubPort = nullptr)
+    : address(address), name((char *)name), hubPort(hubPort) {}
   virtual ~Module() {}  
   bool begin() {
     if (address >= 0x7F) {
@@ -84,6 +123,9 @@ class Module : public Printable {
     if (address >= 0x7F) {
       return false;
     }
+    if (hubPort != nullptr) {
+      hubPort->select();
+    }
     Modulino._wire->requestFrom(address, howmany + 1);
     auto start = millis();
     while ((Modulino._wire->available() == 0) && (millis() - start < 100)) {
@@ -99,17 +141,26 @@ class Module : public Printable {
     while (Modulino._wire->available()) {
       Modulino._wire->read();
     }
+    if (hubPort != nullptr) {
+      hubPort->clear();
+    }
     return true;
   }
   bool write(uint8_t* buf, int howmany) {
     if (address >= 0x7F) {
       return false;
     }
+    if (hubPort != nullptr) {
+      hubPort->select();
+    }
     Modulino._wire->beginTransmission(address);
     for (int i = 0; i < howmany; i++) {
       Modulino._wire->write(buf[i]);
     }
     Modulino._wire->endTransmission();
+    if (hubPort != nullptr) {
+      hubPort->clear();
+    }
     return true;
   }
   bool nonDefaultAddress() {
@@ -119,8 +170,14 @@ class Module : public Printable {
     return p.print(name);
   }
   bool scan(uint8_t addr) {
+    if (hubPort != nullptr) {
+      hubPort->select();
+    }
     Modulino._wire->beginTransmission(addr / 2);  // multply by 2 to match address in fw main.c
     auto ret = Modulino._wire->endTransmission();
+    if (hubPort != nullptr) {
+      hubPort->clear();
+    }
     if (ret == 0) {
       // could also ask for 1 byte and check if it's truely a modulino of that kind
       return true;
@@ -131,12 +188,15 @@ class Module : public Printable {
   uint8_t address;
   uint8_t pinstrap_address;
   char* name;
+  ModulinoHubPort* hubPort = nullptr;
 };
 
 class ModulinoButtons : public Module {
 public:
-  ModulinoButtons(uint8_t address = 0xFF)
-    : Module(address, "BUTTONS") {}
+  ModulinoButtons(uint8_t address = 0xFF, ModulinoHubPort* hubPort = nullptr)
+    : Module(address, "BUTTONS", hubPort) {}
+  ModulinoButtons(ModulinoHubPort* hubPort, uint8_t address = 0xFF)
+    : Module(address, "BUTTONS", hubPort) {}
   PinStatus isPressed(int index) {
     return last_status[index] ? HIGH : LOW;
   }
@@ -173,8 +233,10 @@ class ModulinoButtons : public Module {
 
 class ModulinoJoystick : public Module {
 public:
-  ModulinoJoystick(uint8_t address = 0xFF)
-    : Module(address, "JOYSTICK") {}
+  ModulinoJoystick(uint8_t address = 0xFF, ModulinoHubPort* hubPort = nullptr)
+    : Module(address, "JOYSTICK", hubPort) {}
+  ModulinoJoystick(ModulinoHubPort* hubPort, uint8_t address = 0xFF)
+    : Module(address, "JOYSTICK", hubPort) {}
   bool update() {
     uint8_t buf[3];
     auto res = read((uint8_t*)buf, 3);
@@ -225,8 +287,10 @@ class ModulinoJoystick : public Module {
 
 class ModulinoBuzzer : public Module {
 public:
-  ModulinoBuzzer(uint8_t address = 0xFF)
-    : Module(address, "BUZZER") {}
+  ModulinoBuzzer(uint8_t address = 0xFF, ModulinoHubPort* hubPort = nullptr)
+    : Module(address, "BUZZER", hubPort) {}
+  ModulinoBuzzer(ModulinoHubPort* hubPort, uint8_t address = 0xFF)
+    : Module(address, "BUZZER", hubPort) {}
   void (tone)(size_t freq, size_t len_ms) {
     uint8_t buf[8];
     memcpy(&buf[0], &freq, 4);
@@ -252,8 +316,10 @@ class ModulinoBuzzer : public Module {
 
 class ModulinoVibro : public Module {
 public:
-  ModulinoVibro(uint8_t address = 0xFF)
-    : Module(address, "VIBRO") {}
+  ModulinoVibro(uint8_t address = 0xFF, ModulinoHubPort* hubPort = nullptr)
+    : Module(address, "VIBRO", hubPort) {}
+  ModulinoVibro(ModulinoHubPort* hubPort, uint8_t address = 0xFF)
+    : Module(address, "VIBRO", hubPort) {}
   void on(size_t len_ms, bool block, int power = MAXIMUM ) {
     uint8_t buf[12];
     uint32_t freq = 1000;
@@ -302,8 +368,12 @@ class ModulinoColor {
 
 class ModulinoPixels : public Module {
 public:
-  ModulinoPixels(uint8_t address = 0xFF)
-    : Module(address, "LEDS") {
+  ModulinoPixels(uint8_t address = 0xFF, ModulinoHubPort* hubPort = nullptr)
+    : Module(address, "LEDS", hubPort) {
+    memset((uint8_t*)data, 0xE0, NUMLEDS * 4);
+  }
+  ModulinoPixels(ModulinoHubPort* hubPort, uint8_t address = 0xFF)
+    : Module(address, "LEDS", hubPort) {
     memset((uint8_t*)data, 0xE0, NUMLEDS * 4);
   }
   void set(int idx, ModulinoColor rgb, uint8_t brightness = 25) {
@@ -342,9 +412,11 @@ class ModulinoPixels : public Module {
 
 class ModulinoKnob : public Module {
 public:
-  ModulinoKnob(uint8_t address = 0xFF)
-    : Module(address, "ENCODER") {}
-  bool begin() {
+  ModulinoKnob(uint8_t address = 0xFF, ModulinoHubPort* hubPort = nullptr)
+    : Module(address, "ENCODER", hubPort) {}
+  ModulinoKnob(ModulinoHubPort* hubPort, uint8_t address = 0xFF)
+    : Module(address, "ENCODER", hubPort) {}
+    bool begin() {
     auto ret = Module::begin();
     if (ret) {
       // check for set() bug
@@ -407,6 +479,8 @@ extern ModulinoColor WHITE;
 
 class ModulinoMovement : public Module {
 public:
+  ModulinoMovement(ModulinoHubPort* hubPort = nullptr)
+    : Module(0xFF, "MOVEMENT", hubPort) {}
   bool begin() {
     if (_imu == nullptr) {
       _imu = new LSM6DSOXClass(*((TwoWire*)getWire()), 0x6A);
@@ -447,6 +521,8 @@ class ModulinoMovement : public Module {
 
 class ModulinoThermo: public Module {
 public:
+  ModulinoThermo(ModulinoHubPort* hubPort = nullptr)
+  : Module(0xFF, "THERMO", hubPort) {}
   bool begin() {
     if (_sensor == nullptr) {
       _sensor = new HS300xClass(*((TwoWire*)getWire()));
@@ -477,6 +553,8 @@ class ModulinoThermo: public Module {
 
 class ModulinoPressure : public Module {
 public:
+  ModulinoPressure(ModulinoHubPort* hubPort = nullptr)
+    : Module(0xFF, "PRESSURE", hubPort) {}
   bool begin() {
     if (_barometer == nullptr) {
       _barometer = new LPS22HBClass(*((TwoWire*)getWire()));
@@ -511,6 +589,8 @@ class ModulinoPressure : public Module {
 
 class ModulinoLight : public Module {
 public:
+  ModulinoLight(ModulinoHubPort* hubPort = nullptr)
+    : Module(0xFF, "LIGHT", hubPort) {}
   bool begin() {
     if (_light == nullptr) {
       _light = new LTR381RGBClass(*((TwoWire*)getWire()), 0x53);
@@ -665,6 +745,8 @@ class _distance_api {
 
 class ModulinoDistance : public Module {
 public:
+  ModulinoDistance(ModulinoHubPort* hubPort = nullptr)
+    : Module(0xFF, "DISTANCE", hubPort) {}
   bool begin() {
     // try scanning for 0x29 since the library contains a while(true) on begin()
     getWire()->beginTransmission(0x29);
@@ -729,7 +811,9 @@ class ModulinoDistance : public Module {
 
 class ModulinoRelay : public Module {
 public:
-  ModulinoRelay(uint8_t address = 0xFF)
+  ModulinoRelay(uint8_t address = 0xFF, ModulinoHubPort* hubPort = nullptr)
+    : Module(address, "RELAY", hubPort) {}
+  ModulinoRelay(ModulinoHubPort* hubPort, uint8_t address = 0xFF)
     : Module(address, "RELAY") {}
   bool update() {
     uint8_t buf[3];