Arianna autonomous DAQ firmware
Dependencies: mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW
Diff: SnCommWinAfar.cpp
- Revision:
- 116:8099b754fbb4
- Parent:
- 84:80b15993944e
--- a/SnCommWinAfar.cpp Fri Dec 04 02:57:12 2015 +0000 +++ b/SnCommWinAfar.cpp Tue May 03 02:01:35 2016 +0000 @@ -10,26 +10,15 @@ conf.GetMbedGate())) { } -/* -SnCommWin::ECommWinResult SnCommWinAfar::OpenWindow(const uint32_t timeout, - const bool sendStatus, - const SnConfigFrame& conf, - const SnEventFrame& evt, - const SnPowerFrame& pow, - const uint16_t seq, - const float thmrate, - const float evtrate, - const uint32_t powerOnTime, - const SnTempFrame& temper, - char* const genBuf) { -*/ + SnCommWin::ECommWinResult SnCommWinAfar::OpenWindow(const bool sendStatus, const SnConfigFrame& conf, const SnPowerFrame& pow, // com win power const SnEventFrame& stEvent, const uint16_t seq, - const float thmrate, - const float evtrate, + const uint32_t numThmTrigs, + const uint32_t numSavedEvts, + const float seqlive, const uint32_t powerOnTime, const SnTempFrame& temper, // com win temp char* const genBuf, @@ -47,11 +36,12 @@ #ifdef DEBUG printf("calling SendStatus\r\n"); #endif - ret = SendStatus(conf, pow, stEvent, seq, thmrate, evtrate, powerOnTime, temper, + ret = SendStatus(conf, pow, stEvent, seq, + numThmTrigs, numSavedEvts, seqlive, + powerOnTime, temper, genBuf, timeout_clock); - //ret = SendStatus(conf, evt, pow, seq, thmrate, evtrate, powerOnTime, temper, genBuf, timeout); #ifdef DEBUG printf("Send Status returned\r\n"); #endif