|
18 | 18 | // constructor; this parameter defaults to true if not given. |
19 | 19 |
|
20 | 20 | #include <MCP79412RTC.h> |
| 21 | +#include <stdlib.h> |
| 22 | +#include "i2c.h" |
21 | 23 |
|
22 | | -// define consistent I2C functions |
23 | | -#if defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__) |
24 | | -#include <TinyWireM.h> |
25 | | -#define i2cBegin TinyWireM.begin |
26 | | -#define i2cBeginTransmission TinyWireM.beginTransmission |
27 | | -#define i2cEndTransmission TinyWireM.endTransmission |
28 | | -#define i2cRequestFrom TinyWireM.requestFrom |
29 | | -#define i2cRead TinyWireM.receive |
30 | | -#define i2cWrite TinyWireM.send |
31 | | -#else |
32 | | -#include <Wire.h> |
33 | | -#define i2cBegin Wire.begin |
34 | | -#define i2cBeginTransmission Wire.beginTransmission |
35 | | -#define i2cEndTransmission Wire.endTransmission |
36 | | -#define i2cRequestFrom Wire.requestFrom |
37 | | -#define i2cRead Wire.read |
38 | | -#define i2cWrite Wire.write |
39 | | -#endif |
| 24 | +#define i2cBegin i2c.begin |
| 25 | +#define i2cBeginTransmission i2c.beginTransmission |
| 26 | +#define i2cEndTransmission i2c.endTransmission |
| 27 | +#define i2cRequestFrom i2c.requestFrom |
| 28 | +#define i2cRead i2c.read |
| 29 | +#define i2cWrite i2c.write |
40 | 30 |
|
41 | 31 | // MCP7941x I2C Addresses |
42 | 32 | #define RTC_ADDR 0x6F |
@@ -623,6 +613,4 @@ uint8_t __attribute__ ((noinline)) MCP79412RTC::bcd2dec(uint8_t n) |
623 | 613 | return n - 6 * (n >> 4); |
624 | 614 | } |
625 | 615 |
|
626 | | -#if defined ARDUINO_ARCH_AVR |
627 | | -MCP79412RTC RTC; // instantiate an RTC object for AVR only |
628 | | -#endif |
| 616 | +MCP79412RTC RTC; |
0 commit comments