use TwoWire instance

Author: thijstriemstra

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));
   }
 

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