Merge pull request #1 from collab-project/gardjuino-v4

thijstriemstra · web-flow · commit 84615a290e12 · 2023-03-13T23:11:13.000+01:00
Updates for Garduino v4
diff --git a/AT24C32_EEPROM/AT24C32_EEPROM.cpp b/AT24C32_EEPROM/AT24C32_EEPROM.cpp
@@ -1,53 +1,56 @@
-/*  Copyright (c) 2021, Collab
+/*  Copyright (c) 2021-2023, Collab
  *  All rights reserved
 */
 #include "AT24C32_EEPROM.h"
 
-AT24C32_EEPROM::AT24C32_EEPROM(uint8_t eeprom_address) {
+AT24C32_EEPROM::AT24C32_EEPROM(uint8_t eeprom_address, TwoWire* wire) {
   _eepromAddress = eeprom_address;
+  _wire = wire;
 }
 
 void AT24C32_EEPROM::write_byte(unsigned int eeaddress, byte data) {
   int rdata = data;
-  Wire.beginTransmission(_eepromAddress);
-  Wire.write((int)(eeaddress >> 8)); // MSB
-  Wire.write((int)(eeaddress & 0xFF)); // LSB
-  Wire.write(rdata);
-  Wire.endTransmission();
+  _wire->beginTransmission(_eepromAddress);
+  _wire->write((int)(eeaddress >> 8)); // MSB
+  _wire->write((int)(eeaddress & 0xFF)); // LSB
+  _wire->write(rdata);
+  _wire->endTransmission();
 }
 
 void AT24C32_EEPROM::write_page(unsigned int eeaddresspage, byte* data, byte length) {
-  Wire.beginTransmission(_eepromAddress);
-  Wire.write((int)(eeaddresspage >> 8)); // MSB
-  Wire.write((int)(eeaddresspage & 0xFF)); // LSB
+  _wire->beginTransmission(_eepromAddress);
+  _wire->write((int)(eeaddresspage >> 8)); // MSB
+  _wire->write((int)(eeaddresspage & 0xFF)); // LSB
   byte c;
   for (c = 0; c < length; c++) {
-    Wire.write(data[c]);
+    _wire->write(data[c]);
   }
-  Wire.endTransmission();
+  _wire->endTransmission();
 }
 
 byte AT24C32_EEPROM::read_byte(unsigned int eeaddress) {
   byte rdata = 0xFF;
-  Wire.beginTransmission(_eepromAddress);
-  Wire.write((int)(eeaddress >> 8)); // MSB
-  Wire.write((int)(eeaddress & 0xFF)); // LSB
-  Wire.endTransmission();
-  Wire.requestFrom(_eepromAddress, 1);
-  if (Wire.available()) {
-    rdata = Wire.read();
+  _wire->beginTransmission(_eepromAddress);
+  _wire->write((int)(eeaddress >> 8)); // MSB
+  _wire->write((int)(eeaddress & 0xFF)); // LSB
+  _wire->endTransmission();
+  _wire->requestFrom(_eepromAddress, 1);
+  if (_wire->available()) {
+    rdata = _wire->read();
   }
   return rdata;
 }
 
 void AT24C32_EEPROM::read_buffer(unsigned int eeaddress, byte *buffer, int length) {
-  Wire.beginTransmission(_eepromAddress);
-  Wire.write((int)(eeaddress >> 8)); // MSB
-  Wire.write((int)(eeaddress & 0xFF)); // LSB
-  Wire.endTransmission();
-  Wire.requestFrom(_eepromAddress, length);
+  _wire->beginTransmission(_eepromAddress);
+  _wire->write((int)(eeaddress >> 8)); // MSB
+  _wire->write((int)(eeaddress & 0xFF)); // LSB
+  _wire->endTransmission();
+  _wire->requestFrom(_eepromAddress, length);
   int c = 0;
   for (c = 0; c < length; c++) {
-    if (Wire.available()) buffer[c] = Wire.read();
+    if (_wire->available()) {
+      buffer[c] = _wire->read();
+    }
   }
 }
diff --git a/AT24C32_EEPROM/AT24C32_EEPROM.h b/AT24C32_EEPROM/AT24C32_EEPROM.h
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2021, Collab
+/*  Copyright (c) 2021-2023, Collab
  *  All rights reserved
 */
 #ifndef AT24C32_EEPROM_h
@@ -10,14 +10,15 @@
 class AT24C32_EEPROM
 {
   public:
-    AT24C32_EEPROM(uint8_t eeprom_address);
+    AT24C32_EEPROM(uint8_t eeprom_address, TwoWire* wire);
     byte read_byte(unsigned int eeaddress);
     void write_byte(unsigned int eeaddress, byte data);
     void write_page(unsigned int eeaddresspage, byte* data, byte length);
     void read_buffer(unsigned int eeaddress, byte *buffer, int length);
 
   private:
     uint8_t _eepromAddress;
+    TwoWire* _wire;
 };
 
 #endif
diff --git a/DS3231_RealtimeClock/DS3231_RealtimeClock.cpp b/DS3231_RealtimeClock/DS3231_RealtimeClock.cpp
@@ -1,29 +1,24 @@
-/*  Copyright (c) 2020-2021, Collab
+/*  Copyright (c) 2020-2023, Collab
  *  All rights reserved
 */
 /*
   DS3231_RealtimeClock.cpp - Read and write to a DS3231 realtime clock.
 */
 #include "DS3231_RealtimeClock.h"
 
-DS3231_RealtimeClock::DS3231_RealtimeClock(int scl_pin, int sda_pin, uint8_t eeprom_address) {
-  _sclPin = scl_pin;
-  _sdaPin = sda_pin;
+DS3231_RealtimeClock::DS3231_RealtimeClock(TwoWire* wire, uint8_t eeprom_address) {
+  _wire = wire;
 
   // storage
-  _storage = new AT24C32_EEPROM(eeprom_address);
+  _storage = new AT24C32_EEPROM(eeprom_address, wire);
 
   // rtc
   _rtc = new RTC_DS3231();
 }
 
-void DS3231_RealtimeClock::begin(bool callWireBegin) {
-  // rtc
-  if (callWireBegin) {
-    Wire.begin(_sdaPin, _sclPin);
-  }
-  Wire.beginTransmission(DS3231_ADDRESS);
-  if (Wire.endTransmission() != 0) {
+void DS3231_RealtimeClock::begin() {
+  // initializing the rtc
+  if (!_rtc->begin(_wire)) {
     Log.warning(F("Initializing DS3231... Error!" CR));
   }
 
diff --git a/DS3231_RealtimeClock/DS3231_RealtimeClock.h b/DS3231_RealtimeClock/DS3231_RealtimeClock.h
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2020-2021, Collab
+/*  Copyright (c) 2020-2023, Collab
  *  All rights reserved
 */
 /*
@@ -18,8 +18,8 @@
 class DS3231_RealtimeClock
 {
   public:
-    DS3231_RealtimeClock(int scl_pin = -1, int sda_pin = -1, uint8_t eeprom_address = 0x57);
-    void begin(bool callWireBegin = true);
+    DS3231_RealtimeClock(TwoWire* wire, uint8_t eeprom_address = 0x57);
+    void begin();
     DateTime now();
     DateTime load(int address = 0);
     void save(DateTime timestamp, int address = 0);
@@ -34,10 +34,9 @@ class DS3231_RealtimeClock
     float startupTemperature;
 
   private:
+    TwoWire *_wire;
     RTC_DS3231 *_rtc;
     AT24C32_EEPROM *_storage;
-    int _sclPin;
-    int _sdaPin;
 };
 
 #endif
diff --git a/LED_PCF8574/LED_PCF8574.cpp b/LED_PCF8574/LED_PCF8574.cpp
@@ -5,7 +5,7 @@
   LED_PCF8574.h - Control LED light using PCF8574 multiplexer.
 */
 
-#include "LED_PCF8574.h"
+#include <LED_PCF8574.h>
 
 LED_PCF8574::LED_PCF8574(
   int pin,
diff --git a/LED_PCF8574/LED_PCF8574.h b/LED_PCF8574/LED_PCF8574.h
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2020, Collab
+/*  Copyright (c) 2020-2023, Collab
  *  All rights reserved
 */
 /*
@@ -7,7 +7,7 @@
 #ifndef LED_PCF8574_h
 #define LED_PCF8574_h
 
-#include "Arduino.h"
+#include <Arduino.h>
 #include <MultiPlexer_PCF8574.h>
 
 class LED_PCF8574
diff --git a/MultiPlexer_PCF8574/MultiPlexer_PCF8574.cpp b/MultiPlexer_PCF8574/MultiPlexer_PCF8574.cpp
@@ -1,17 +1,22 @@
-/*  Copyright (c) 2020-2021, Collab
+/*  Copyright (c) 2020-2023, Collab
  *  All rights reserved
 */
 
 #include <MultiPlexer_PCF8574.h>
 
-MultiPlexer_PCF8574::MultiPlexer_PCF8574(uint8_t address, uint8_t sda, uint8_t scl) {
-  _sdaPin = sda;
-  _sclPin = scl;
-  _expander = new PCF8574(address);
+MultiPlexer_PCF8574::MultiPlexer_PCF8574(uint8_t address, TwoWire* wire) {
+  _expander = new PCF8574(address, wire);
 }
 
 bool MultiPlexer_PCF8574::begin() {
-  return _expander->begin(_sdaPin, _sclPin);
+  bool expanderReady = _expander->begin();
+  if (!expanderReady) {
+    Log.warning(F("PCF8574 could not initialize!" CR));
+  }
+  if (!isConnected()) {
+    Log.warning(F("PCF8574 not connected!" CR));
+  }
+  return expanderReady;
 }
 
 bool MultiPlexer_PCF8574::isConnected() {
diff --git a/MultiPlexer_PCF8574/MultiPlexer_PCF8574.h b/MultiPlexer_PCF8574/MultiPlexer_PCF8574.h
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2020-2021, Collab
+/*  Copyright (c) 2020-2023, Collab
  *  All rights reserved
 */
 /*
@@ -8,22 +8,20 @@
 #define MultiPlexer_PCF8574_h
 
 #include <Arduino.h>
-#include <Method.h>
 #include <PCF8574.h>
+#include <ArduinoLog.h>
 
 class MultiPlexer_PCF8574
 {
   public:
-    MultiPlexer_PCF8574(uint8_t address, uint8_t sda, uint8_t scl);
+    MultiPlexer_PCF8574(uint8_t address, TwoWire* wire = &Wire);
     bool begin();
     bool isConnected();
     void digitalWrite(uint8_t pin, uint8_t value);
     uint8_t digitalRead(uint8_t pin);
 
   private:
     PCF8574* _expander;
-    uint8_t _sdaPin;
-    uint8_t _sclPin;
 };
 
 #endif
diff --git a/MultiPlexer_TCA9548A/MultiPlexer_TCA9548A.cpp b/MultiPlexer_TCA9548A/MultiPlexer_TCA9548A.cpp
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2021, Collab
+/*  Copyright (c) 2021-2023, Collab
  *  All rights reserved
 */
 /*
@@ -8,10 +8,12 @@
 #include <MultiPlexer_TCA9548A.h>
 
 MultiPlexer_TCA9548A::MultiPlexer_TCA9548A(int i2c_addr) {
+  _address = i2c_addr;
   _mux = new TCA9548A(i2c_addr);
 }
 
 void MultiPlexer_TCA9548A::begin() {
+  // XXX: don't hardcode Wire instance
   _mux->begin(Wire1);
 
   // set a base state which we know (also the default state on power on)
@@ -35,32 +37,40 @@ void MultiPlexer_TCA9548A::closeAll() {
   _mux->closeAll();
 }
 
-void MultiPlexer_TCA9548A::scan() {
+void MultiPlexer_TCA9548A::scan(bool ignoreMultiplexer) {
   byte error, address;
-  int nDevices;
-  int delayTime = 5000;
-  nDevices = 0;
+  int nDevices = 0;
+
   for (address = 1; address < 127; address++) {
     Wire1.beginTransmission(address);
     error = Wire1.endTransmission();
     if (error == 0) {
-      Serial.print(F("I2C device found at address 0x"));
-      if (address < 16) {
-        Serial.print(F("0"));
+      if (!(ignoreMultiplexer && address == _address)) {
+        if (address < 16) {
+          Log.info(F("TCA9548A - I2C device found at address 0x0%x" CR), address);
+        } else {
+          Log.info(F("TCA9548A - I2C device found at address 0x%x" CR), address);
+        }
+        nDevices++;
       }
-      Serial.println(address, HEX);
-      nDevices++;
-    }
-    else if (error == 4) {
-      Serial.print(F("Unknow error at address 0x"));
+    } else if (error == 4) {
       if (address < 16) {
-        Serial.print(F("0"));
+        Log.info(F("TCA9548A - Unknown error at address 0x0%x" CR), address);
+      } else {
+        Log.info(F("TCA9548A - Unknown error at address 0x%x" CR), address);
       }
-      Serial.println(address, HEX);
     }
   }
+
   if (nDevices == 0) {
-    Serial.println(F("No I2C devices found\n"));
+    Log.warning(F("TCA9548A - No I2C devices found" CR));
+  }
+}
+
+void MultiPlexer_TCA9548A::scanAll() {
+  for (int channel = 0; channel < 8; channel++) {
+    Log.info(F("TCA9548A - Scanning channel %d..." CR), channel);
+    openChannel(channel);
+    scan();
   }
-  delay(delayTime);
 }
diff --git a/MultiPlexer_TCA9548A/MultiPlexer_TCA9548A.h b/MultiPlexer_TCA9548A/MultiPlexer_TCA9548A.h
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2021, Collab
+/*  Copyright (c) 2021-2023, Collab
  *  All rights reserved
 */
 /*
@@ -10,20 +10,23 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include <TCA9548A.h>
+#include <ArduinoLog.h>
 
 class MultiPlexer_TCA9548A
 {
   public:
     MultiPlexer_TCA9548A(int i2c_addr = 0x70);
     void begin();
-    void scan();
+    void scan(bool ignoreMultiplexer = true);
+    void scanAll();
     void closeAll();
     void openChannel(uint8_t channel_nr);
     void closeChannel(uint8_t channel_nr);
     void switchChannel(uint8_t channel_nr);
 
   private:
     TCA9548A* _mux;
+    int _address;
 };
 
 #endif
diff --git a/SSD1306_OLEDDisplay_Mux/SSD1306_OLEDDisplay_Mux.cpp b/SSD1306_OLEDDisplay_Mux/SSD1306_OLEDDisplay_Mux.cpp
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2021, Collab
+/*  Copyright (c) 2021-2023, Collab
  *  All rights reserved
 */
 /*
diff --git a/SSD1306_OLEDDisplay_Mux/SSD1306_OLEDDisplay_Mux.h b/SSD1306_OLEDDisplay_Mux/SSD1306_OLEDDisplay_Mux.h
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2021, Collab
+/*  Copyright (c) 2021-2023, Collab
  *  All rights reserved
 */
 /*
diff --git a/SystemClock/SystemClock.cpp b/SystemClock/SystemClock.cpp
diff --git a/SystemClock/SystemClock.h b/SystemClock/SystemClock.h
