Diff: SnConfigFrame.h

Revision:

114:554fa3a956b4

Parent:

85:3ced48ef94c5

Child:

116:8099b754fbb4

--- a/SnConfigFrame.h	Tue Nov 24 22:06:47 2015 +0000
+++ b/SnConfigFrame.h	Fri Dec 04 02:54:48 2015 +0000
@@ -83,6 +83,7 @@
             + sizeof(uint16_t) - sizeof(uint8_t) // change fEnableTherm from 8 bit to 16 bit to match trigger bit word in event
             + (2u*sizeof(uint8_t)) // connect and listen TOs for Irid & Afar
             + sizeof(uint16_t) - sizeof(uint8_t); // run mode from 8 to 16 bit integer
+    static const uint32_t   kMaxSizeOfV13 = kMaxSizeOfV12; // same as V12 (just signifies SST4CH_1GHz)
 
     static const uint32_t   kMaxSizeOf = kMaxSizeOfV7; // should be the biggest one
     
@@ -192,7 +193,7 @@
     char        fMbedGate[kIPLen];         // IP address of this mbed gateway
     // watchdog
     uint32_t    fWatchDogPeriod;           // number of seconds of inactivity for watchdog to issue a reset
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
     // temp
     int8_t      fTempCheckPeriod;          // number of minutes between temperature checks. if negative, uses parasite power. if 0, never check.
 #endif
@@ -270,6 +271,8 @@
             maxsize = kMaxSizeOfV11;
         } else if (rv==12) {
             maxsize = kMaxSizeOfV12;
+        } else if (rv==13) {
+            maxsize = kMaxSizeOfV13;
         }
         uint32_t sz = maxsize;
         if (rv<11) {
@@ -350,7 +353,7 @@
     uint16_t GetBatVoltFromLowPwr() const { return fBatVoltFromLowPwr; }
     uint16_t GetVoltCheckPeriod() const { return fVoltCheckPeriod; }
     uint32_t GetWatchdogPeriod() const { return fWatchDogPeriod; }
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
     uint16_t GetTempCheckPeriod() const {
         const uint16_t t = (fTempCheckPeriod<0) ? (-fTempCheckPeriod) : fTempCheckPeriod;
         return t*60;
@@ -801,7 +804,7 @@
 #ifdef DEBUG
             printf("watch=%u\r\n",fWatchDogPeriod);
 #endif
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
             if ( (IsIOversForATWD(Rv)==false) && (Rv>9) ) {
                 b       = SnBitUtils::ReadFrom(b, fTempCheckPeriod);
             }
@@ -940,7 +943,7 @@
         b           = SnBitUtils::WriteTo(b, GetIpValFromStr(fMbedMask) );
         b           = SnBitUtils::WriteTo(b, GetIpValFromStr(fMbedGate) );
         b           = SnBitUtils::WriteTo(b, fWatchDogPeriod);
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
         if ( (IsIOversForATWD(kIOVers)==false) && (kIOVers>9) ) {
             b       = SnBitUtils::WriteTo(b, fTempCheckPeriod);
         }