Arianna autonomous DAQ firmware
Dependencies: mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW
Diff: SnConfigFrame.h
- Revision:
- 85:3ced48ef94c5
- Parent:
- 84:80b15993944e
- Child:
- 114:554fa3a956b4
--- a/SnConfigFrame.h Fri Oct 30 04:49:40 2015 +0000 +++ b/SnConfigFrame.h Sat Oct 31 02:29:46 2015 +0000 @@ -719,8 +719,8 @@ } } else { for (uint8_t i=0; i<kNumDatStreams; ++i) { - fCommWinConnTOMins[i] = GetDefaultConnTOMin(i); - fCommWinListTOMins[i] = GetDefaultListTOMin(i); + fCommWinConnTOMins[i] = GetDefaultConnTOMinOf(GetDataStreamForIndex(i)); + fCommWinListTOMins[i] = GetDefaultListTOMinOf(GetDataStreamForIndex(i)); } } #ifdef DEBUG @@ -1017,6 +1017,21 @@ uint32_t GetIpValFromStr(const char(& str)[kIPLen]); static + EDatPackBit GetDataStreamForIndex(const uint8_t idx) { + switch (idx) { + case 0: return kSDcard; + case 1: return kIrid; + case 2: return kAfar; + case 3: return kUSB; + default: +#ifdef DEBUG + printf("**** unknown stream idx [%hhu]", idx); +#endif + return kSDcard; + }; + } + + static uint8_t IndexOfDataStream(const SnConfigFrame::EDatPackBit b) { switch (b) { case kSDcard: return 0u; @@ -1032,23 +1047,24 @@ } static - uint8_t GetDefaultConnTOMin(const uint8_t dataStreamIdx) { - switch (dataStreamIdx) { + uint8_t GetDefaultConnTOMinOf(const SnConfigFrame::EDatPackBit b) { + switch (b) { case kSDcard: return 1u; case kIrid: return 3u; case kAfar: return 1u; case kUSB: return 1u; default: #ifdef DEBUG - printf("**** unknown stream index [%hhu]", dataStreamIdx); + printf("**** unknown stream big [%u]", + static_cast<uint32_t>(b)); #endif - return 0; + return 3u; }; } static - uint8_t GetDefaultListTOMin(const uint8_t dataStreamIdx) { - return GetDefaultConnTOMin(dataStreamIdx); + uint8_t GetDefaultListTOMinOf(const SnConfigFrame::EDatPackBit b) { + return GetDefaultConnTOMinOf(b); } static