diff --git a/src/MCP79412RTC.cpp b/src/MCP79412RTC.cpp index 76ff0bf..3c9dd86 100644 --- a/src/MCP79412RTC.cpp +++ b/src/MCP79412RTC.cpp @@ -18,25 +18,15 @@ // constructor; this parameter defaults to true if not given. #include +#include +#include "i2c.h" -// define consistent I2C functions -#if defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__) -#include -#define i2cBegin TinyWireM.begin -#define i2cBeginTransmission TinyWireM.beginTransmission -#define i2cEndTransmission TinyWireM.endTransmission -#define i2cRequestFrom TinyWireM.requestFrom -#define i2cRead TinyWireM.receive -#define i2cWrite TinyWireM.send -#else -#include -#define i2cBegin Wire.begin -#define i2cBeginTransmission Wire.beginTransmission -#define i2cEndTransmission Wire.endTransmission -#define i2cRequestFrom Wire.requestFrom -#define i2cRead Wire.read -#define i2cWrite Wire.write -#endif +#define i2cBegin i2c.begin +#define i2cBeginTransmission i2c.beginTransmission +#define i2cEndTransmission i2c.endTransmission +#define i2cRequestFrom i2c.requestFrom +#define i2cRead i2c.read +#define i2cWrite i2c.write // MCP7941x I2C Addresses #define RTC_ADDR 0x6F @@ -623,6 +613,4 @@ uint8_t __attribute__ ((noinline)) MCP79412RTC::bcd2dec(uint8_t n) return n - 6 * (n >> 4); } -#if defined ARDUINO_ARCH_AVR -MCP79412RTC RTC; // instantiate an RTC object for AVR only -#endif +MCP79412RTC RTC; diff --git a/src/MCP79412RTC.h b/src/MCP79412RTC.h index a32e620..8593a31 100644 --- a/src/MCP79412RTC.h +++ b/src/MCP79412RTC.h @@ -20,8 +20,10 @@ #ifndef MCP79412RTC_H_INCLUDED #define MCP79412RTC_H_INCLUDED -#include #include // https://github.com/PaulStoffregen/Time +#include + +typedef uint8_t byte; // Alarm types for use with the enableAlarm() function enum { @@ -90,9 +92,7 @@ class MCP79412RTC static uint8_t bcd2dec(uint8_t num); }; -#if defined ARDUINO_ARCH_AVR extern MCP79412RTC RTC; -#endif #ifndef _BV #define _BV(bit) (1 << (bit))