Arianna autonomous DAQ firmware

Dependencies:   mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW

Revision:
122:c1b5023eac69
Parent:
120:1a43bc4a06b3
Child:
124:4637a6546cad
--- a/SnConfigFrame.cpp	Thu Nov 30 06:26:18 2017 +0000
+++ b/SnConfigFrame.cpp	Fri Dec 01 16:29:10 2017 +0000
@@ -30,7 +30,14 @@
 #error CHIPBOARD value not used in config frame i/o version
 #endif
 
-#ifdef USE_INTERFACE_CHIP
+#if defined(LOAD_DEFAULT_CONFIG_FROM_SD)
+const char* const SnConfigFrame::kDefConfFile          = "/sd/DEFCONF.DAT";
+const char* const SnConfigFrame::kDefRemIpFilen        = "/sd/REMOTIP.TXT";
+const char* const SnConfigFrame::kDefRemPortFilen      = "/sd/REMOTPRT.TXT";
+const char* const SnConfigFrame::kDefMbedIPFilen       = "/sd/MBEDIP.TXT";
+const char* const SnConfigFrame::kDefMbedMaskFilen     = "/sd/MBEDMASK.TXT";
+const char* const SnConfigFrame::kDefMbedGateFilen     = "/sd/MBEDGATE.TXT";
+#elif defined(USE_INTERFACE_CHIP)
 const char* const SnConfigFrame::kDefConfFile          = "/local/DEFCONF.DAT";
 const char* const SnConfigFrame::kDefRemIpFilen        = "/local/REMOTIP.TXT";
 const char* const SnConfigFrame::kDefRemPortFilen      = "/local/REMOTPRT.TXT";
@@ -99,7 +106,11 @@
     fHeartBeatPeriod    = 0;
     //fAmpsOn             = 0x0Fu; removed vers 11+
     fEvtThrtlPeriodMs   = 0;
+#ifdef AFAR_ON_FIRST_COMM_HARDCONF
     fPowerMode          = kIridComWin | kAfarComWin;
+#else
+    fPowerMode          = kIridComWin; 
+#endif
     fBatVoltToLowPwr    = 0;
     fBatVoltFromLowPwr  = 0;
     fVoltCheckPeriod    = 127u;