Merge pull request #19 from OpenSprinkler/2.1.5

Merge in 2.1.5
OpenSprinkler · Jun 7, 2015 · 29f3b65 · 29f3b65
2 parents 4f39b4c + 12880aa
commit 29f3b65
Show file tree

Hide file tree

Showing 15 changed files with 825 additions and 492 deletions.
diff --git a/DS1307RTC.cpp b/DS1307RTC.cpp
@@ -97,8 +97,6 @@ void DS1307RTC::read( tmElements_t &tm)
 
 void DS1307RTC::write(tmElements_t &tm)
 {
-  static uint8_t initialized = 0;
-
   if (ctrl_id == DS1307_CTRL_ID) {
     Wire.beginTransmission(ctrl_id);  
     Wire.write((uint8_t)0x00); // reset register pointer  

diff --git a/EtherCard.h b/EtherCard.h
@@ -18,7 +18,9 @@
 //   SI  - Pin 11
 //   CS  - Pin  8
 //
+#ifndef __PROG_TYPES_COMPAT__
 #define __PROG_TYPES_COMPAT__
+#endif
 
 #ifndef EtherCard_h
 #define EtherCard_h