Merge branch 'develop'

EnviroDIY · May 21, 2018 · c7c919e · c7c919e
2 parents 45ce06e + f247715
commit c7c919e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 19 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Arduino-SDI-12",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "keywords": "SDI-12, sdi12, communication, bus, sensor, Decagon",
   "description": "Arduino library for SDI-12 communications to a wide variety of environmental sensors.",
   "repository":

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Arduino-SDI-12
-version=1.3.2
+version=1.3.3
 author=Kevin M. Smith <[email protected]>, Shannon Hicks <[email protected]>
 maintainer=Sara Damiano <[email protected]>
 sentence=Arduino library for SDI-12 communications to a wide variety of environmental sensors.

diff --git a/src/SDI12.cpp b/src/SDI12.cpp
@@ -412,7 +412,13 @@ SDI12::SDI12(uint8_t dataPin){
 }
 
 //  3.2 Destructor
-SDI12::~SDI12(){ setState(DISABLED); }
+SDI12::~SDI12(){
+  setState(DISABLED);
+  _activeObject = NULL;
+  // Set the timer prescalers back to original values
+  // NOTE:  This does NOT reset SAMD board pre-scalers!
+  resetSDI12TimerPrescale();
+}
 
 //  3.3 Begin
 void SDI12::begin(){
@@ -441,6 +447,7 @@ void SDI12::begin(uint8_t dataPin){
 void SDI12::end()
 {
   setState(DISABLED);
+  _activeObject = NULL;
   // Set the timer prescalers back to original values
   // NOTE:  This does NOT reset SAMD board pre-scalers!
   resetSDI12TimerPrescale();

diff --git a/src/SDI12_boards.h b/src/SDI12_boards.h
@@ -19,8 +19,8 @@
             // 1/(13.0208 ticks/bit) * 2^10 = 78.6432
         #define RX_WINDOW_FUDGE 2
 
-        uint8_t preSDI12_TCCR2A;
-        uint8_t preSDI12_TCCR2B;
+        static uint8_t preSDI12_TCCR2A;
+        static uint8_t preSDI12_TCCR2B;
         void configSDI12TimerPrescale(void)
         {
             preSDI12_TCCR2A = TCCR2A;
@@ -44,8 +44,8 @@
             // 1/(26.04166667 ticks/bit) * 2^10 = 39.3216
         #define RX_WINDOW_FUDGE 10
 
-        uint8_t preSDI12_TCCR2A;
-        uint8_t preSDI12_TCCR2B;
+        static uint8_t preSDI12_TCCR2A;
+        static uint8_t preSDI12_TCCR2B;
         void configSDI12TimerPrescale(void)
         {
             preSDI12_TCCR2A = TCCR2A;
@@ -100,7 +100,7 @@
          // 1/(13.0208 ticks/bit) * 2^10 = 78.6432
          #define RX_WINDOW_FUDGE 2
 
-         uint8_t preSDI12_TCCR1A;
+         static uint8_t preSDI12_TCCR1A;
          void configSDI12TimerPrescale(void)
          {
               preSDI12_TCCR1A = TCCR1A
@@ -121,7 +121,7 @@
          // 1/(13.0208 ticks/bit) * 2^10 = 78.6432
          #define RX_WINDOW_FUDGE 5
 
-         uint8_t preSDI12_TCCR1A;
+         static uint8_t preSDI12_TCCR1A;
          void configSDI12TimerPrescale(void)
          {
               preSDI12_TCCR1A = TCCR1A
@@ -150,11 +150,11 @@
              // 1/(13.0208 ticks/bit) * 2^10 = 78.6432
          #define RX_WINDOW_FUDGE 2
 
-         uint8_t preSDI12_TCCR4A;
-         uint8_t preSDI12_TCCR4B;
-         uint8_t preSDI12_TCCR4C;
-         uint8_t preSDI12_TCCR4D;
-         uint8_t preSDI12_TCCR4E;
+         static uint8_t preSDI12_TCCR4A;
+         static uint8_t preSDI12_TCCR4B;
+         static uint8_t preSDI12_TCCR4C;
+         static uint8_t preSDI12_TCCR4D;
+         static uint8_t preSDI12_TCCR4E;
          void configSDI12TimerPrescale(void)
          {
              preSDI12_TCCR4A = TCCR4A;
@@ -187,11 +187,11 @@
              // 1/(13.0208 ticks/bit) * 2^10 = 78.6432
          #define RX_WINDOW_FUDGE 5
 
-         uint8_t preSDI12_TCCR4A;
-         uint8_t preSDI12_TCCR4B;
-         uint8_t preSDI12_TCCR4C;
-         uint8_t preSDI12_TCCR4D;
-         uint8_t preSDI12_TCCR4E;
+         static uint8_t preSDI12_TCCR4A;
+         static uint8_t preSDI12_TCCR4B;
+         static uint8_t preSDI12_TCCR4C;
+         static uint8_t preSDI12_TCCR4D;
+         static uint8_t preSDI12_TCCR4E;
          void configSDI12TimerPrescale(void)
          {
              preSDI12_TCCR4A = TCCR4A;