Arianna autonomous DAQ firmware
Dependencies: mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW
Diff: main.cpp
- Revision:
- 98:ce72ef143b9b
- Parent:
- 97:9f3fe603e8b5
- Child:
- 100:3a27edf9ce16
--- a/main.cpp Tue Nov 17 04:36:52 2015 +0000 +++ b/main.cpp Tue Nov 17 06:26:23 2015 +0000 @@ -255,8 +255,10 @@ static SnSignalStrengthFrame gSigStr; #ifdef DISABLE_CONFIG_SAFETYNETS static SnConfigFrame gConf(false); +static SnConfigFrame gConfCopy(false); #else static SnConfigFrame gConf; +static SnConfigFrame gConfCopy; #endif // DISABLE_CONFIG_SAFETYNETS static SnEventFrame gEvent; //static SnEventFrame gLastEvent; @@ -2382,6 +2384,9 @@ #ifdef DEBUG printf("get conf gtt=%u\r\n",gConf.GetTimeoutTime(gLastCommWin, listo)); #endif + // copy old config + gConfCopy = gConf; + // // ask for a new config // @@ -2407,7 +2412,7 @@ // (avoid a situation where sending all this data causes a timeout, // thereby preventing a new config from being accepted) // - res = (*cw)->SendStatusData(gConf, + res = (*cw)->SendStatusData(gConf, gConfCopy, gStTrgStartClk, gStTrgStopClk, gStPower, gEvent, gStTemperature, gHrtbt, gStNewPower, gStNewEvent,