DSI2C is now a standalone controller, moved most files to utility folder to avoid polluting Arduino's global preprocessor namespace.

Author: logic

DS3231.h

@@ -1,9 +1,13 @@
 #ifndef __DS3231_H
 #define __DS3231_H
 
-#include "DSTemp.h"
+#include "utility/DSTemp.h"
 
-class DS3231 : public DSTemp { };
+class DS3231 : public DSTemp {
+  public:
+    DS3231() : rtc(DS()) { };
+  private:
+    DS& rtc;
 
 DS3231 RTC = DS3231();
 

DS.cpp renamed to utility/DS.cpp

@@ -1,11 +1,13 @@
 #include "DS.h"
 
+uint8_t DSI2C::slaveAddress = DSRTC_SLAVE_ADDRESS;
+
 /**
  * Read the value at the given register address.
  * @param addr the register address to read
  * @return The register value.
  */
-uint8_t DS::readRegister(uint8_t addr) {
+uint8_t DSI2C::readRegister(uint8_t addr) {
   Wire.beginTransmission(slaveAddress);
   Wire.send(addr);
   Wire.endTransmission();
@@ -19,7 +21,7 @@ uint8_t DS::readRegister(uint8_t addr) {
  * @param len the number of bytes to read
  * @param buffer a buffer to read the register values into
  */
-void DS::readRegister(uint8_t addr, uint8_t len, uint8_t * buffer) {
+void DSI2C::readRegister(uint8_t addr, uint8_t len, uint8_t * buffer) {
   Wire.beginTransmission(slaveAddress);
   Wire.send(addr);
   Wire.endTransmission();
@@ -32,7 +34,7 @@ void DS::readRegister(uint8_t addr, uint8_t len, uint8_t * buffer) {
  * @param addr the register address to write to
  * @param val the value to write to the given register
  */
-void DS::writeRegister(uint8_t addr, uint8_t val) {
+void DSI2C::writeRegister(uint8_t addr, uint8_t val) {
   Wire.beginTransmission(slaveAddress);
   Wire.send(addr);
   Wire.send(val);
@@ -45,9 +47,11 @@ void DS::writeRegister(uint8_t addr, uint8_t val) {
  * @param len the number of values to write
  * @param buffer a buffer containing the values to write
  */
-void DS::writeRegister(uint8_t addr, uint8_t len, uint8_t * buffer) {
+void DSI2C::writeRegister(uint8_t addr, uint8_t len, uint8_t * buffer) {
   Wire.beginTransmission(slaveAddress);
   Wire.send(addr);
   while (len-- > 0) Wire.send((*buffer++));
   Wire.endTransmission();
 }
+
+DSI2C RTCI2C = DSI2C();

DS.h renamed to utility/DS.h

@@ -11,19 +11,20 @@
 #define bcd2dec(bcd) (((((bcd)>>4) & 0x0F) * 10) + ((bcd) & 0x0F))
 #define dec2bcd(dec) ((((dec)/10)<<4)|((dec)%10))
 
-class DS {
+class DSI2C {
   public:
-    DS() : slaveAddress(DSRTC_SLAVE_ADDRESS) { Wire.begin(); };
+    static void begin() { Wire.begin(); };
 
     // Raw register read/write methods
-    uint8_t readRegister(uint8_t addr);
-    void readRegister(uint8_t addr, uint8_t len, uint8_t * buffer);
-
-    void writeRegister(uint8_t addr, uint8_t val);
-    void writeRegister(uint8_t addr, uint8_t len, uint8_t * buffer);
+    static uint8_t readRegister(uint8_t addr);
+    static void readRegister(uint8_t addr, uint8_t len, uint8_t * buffer);
+    static void writeRegister(uint8_t addr, uint8_t val);
+    static void writeRegister(uint8_t addr, uint8_t len, uint8_t * buffer);
 
   private:
-    uint8_t slaveAddress;
+    static uint8_t slaveAddress;
 };
 
-#endif // __DSRTC_H
+extern DSI2C RTCI2C;
+
+#endif // __DS_H

DSTemp.cpp renamed to utility/DSTemp.cpp

@@ -5,7 +5,7 @@
  * @return The current temperature in Celcius.
  */
 float DSTemp::getTemperature() {
-  int8_t fint = readRegister(tempReg);
-  uint8_t ffrac = readRegister(tempReg + 1) >> 6;
+  int8_t fint = RTCI2C.readRegister(tempReg);
+  uint8_t ffrac = RTCI2C.readRegister(tempReg + 1) >> 6;
   return (float)fint + ((float)ffrac * 0.25);
 }

DSTemp.h renamed to utility/DSTemp.h

@@ -7,12 +7,12 @@
 // this provides convenient conversion.
 #define celciusToFahrenheit(c) (9.0/5.0*(c)+32.0)
 
-class DSTemp : public DS {
+class DSTemp {
   public:
-    DSTemp(uint8_t tempReg=0x11) : tempReg(tempReg) { DS(); };
+    DSTemp(uint8_t tempReg=0x11) : tempReg(tempReg) { };
     float getTemperature();
   private:
-    uint8_t tempReg;  // Clock and Calendar register location
+    uint8_t tempReg; // Clock and Calendar register location
 };
 
 #endif // __DSTEMP_H