Arianna autonomous DAQ firmware
Dependencies: mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW
Diff: SnStatusFrame.h
- Revision:
- 8:95a325df1f6b
- Parent:
- 3:24c5f0f50bf1
- Child:
- 10:3c93db1cfb12
--- a/SnStatusFrame.h Sat Aug 04 01:48:55 2012 +0000 +++ b/SnStatusFrame.h Wed Aug 08 23:27:37 2012 +0000 @@ -62,7 +62,7 @@ const uint8_t loseLSB, const uint8_t loseMSB, const uint16_t wvBase) { evt.WriteTo(evtBuf, loseLSB, loseMSB, wvBase); - x = SnBitUtils::WriteTo(x, evtBuf, evt.SizeOf(loseLSB, loseMSB)); + x = SnBitUtils::WriteTo(x, evtBuf, evt.SizeOf(SnEventFrame::kIOVers,loseLSB, loseMSB)); return x; } @@ -74,7 +74,7 @@ } static - uint32_t SizeOf(const uint32_t confLblLen, + uint32_t SizeOf(const uint8_t rv, const uint32_t confLblLen, const uint8_t loseLSB, const uint8_t loseMSB) { // number of bytes read/written during i/o const uint32_t msz = kMaxSizeOf - SnConfigFrame::kConfLblLen @@ -83,13 +83,14 @@ return msz; } else { return msz - SnEventFrame::kMaxSizeOf - + SnEventFrame::SizeOf(loseLSB, loseMSB); + + SnEventFrame::SizeOf(SnEventFrame::kIOVers, + loseLSB, loseMSB); } } static - uint32_t SizeOf(const SnConfigFrame& conf) { - return SizeOf(conf.GetLabelStrLen(), + uint32_t SizeOf(const uint8_t rv, const SnConfigFrame& conf) { + return SizeOf(rv, conf.GetLabelStrLen(), conf.GetWvLoseLSB(), conf.GetWvLoseMSB()); }