Rearrange #includes.

Author: JChristensen

src/MCP79412RTC.cpp

@@ -17,13 +17,9 @@
 // to indicate whether I2C initialization should occur in the
 // constructor; this parameter defaults to true if not given.
 
-#if defined(ARDUINO) && ARDUINO >= 100
-#include <Arduino.h>
-#else
-#include <WProgram.h>
-#endif
+#include <MCP79412RTC.h>
 
-// release-independent I2C functions
+// define consistent I2C functions
 #if defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
 #include <TinyWireM.h>
 #define i2cBegin TinyWireM.begin
@@ -32,28 +28,16 @@
 #define i2cRequestFrom TinyWireM.requestFrom
 #define i2cRead TinyWireM.receive
 #define i2cWrite TinyWireM.send
-#elif ARDUINO >= 100
+#else
 #include <Wire.h>
 #define i2cBegin Wire.begin
 #define i2cBeginTransmission Wire.beginTransmission
 #define i2cEndTransmission Wire.endTransmission
 #define i2cRequestFrom Wire.requestFrom
 #define i2cRead Wire.read
 #define i2cWrite Wire.write
-#else
-#include <Wire.h>
-#define i2cBegin Wire.begin
-#define i2cBeginTransmission Wire.beginTransmission
-#define i2cEndTransmission Wire.endTransmission
-#define i2cRequestFrom Wire.requestFrom
-#define i2cRead Wire.receive
-#define i2cWrite Wire.send
 #endif
 
-#include <MCP79412RTC.h>
-#include <TimeLib.h>         // https://github.com/PaulStoffregen/Time
-
-
 // MCP7941x I2C Addresses
 #define RTC_ADDR 0x6F
 #define EEPROM_ADDR 0x57

src/MCP79412RTC.h

@@ -20,7 +20,8 @@
 #ifndef MCP79412RTC_H_INCLUDED
 #define MCP79412RTC_H_INCLUDED
 
-#include <TimeLib.h>
+#include <Arduino.h>
+#include <TimeLib.h>    // https://github.com/PaulStoffregen/Time
 
 // Alarm types for use with the enableAlarm() function
 enum {