Arianna autonomous DAQ firmware
Dependencies: mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW
Diff: SnConfigFrame.h
- Revision:
- 119:b3d7699d0eb0
- Parent:
- 117:fd6798ba2e26
- Child:
- 122:c1b5023eac69
diff -r d07ceb4b4813 -r b3d7699d0eb0 SnConfigFrame.h --- a/SnConfigFrame.h Mon Oct 24 19:10:43 2016 +0000 +++ b/SnConfigFrame.h Thu Sep 21 17:53:35 2017 +0000 @@ -86,6 +86,10 @@ static const uint32_t kMaxSizeOfV13 = kMaxSizeOfV12; // same as V12 (just signifies SST4CH_1GHz) static const uint32_t kMaxSizeOfV14 = kMaxSizeOfV12; // same as V12 (just signifies SST4CH512) static const uint32_t kMaxSizeOfV15 = kMaxSizeOfV12; // same as V12 (just signifies SST4CH512_1GHz) + static const uint32_t kMaxSizeOfV16 = kMaxSizeOfV15 + - (kTotDacsSst4ch*sizeof(uint16_t)) + + (kTotDacsSst8ch*sizeof(uint16_t)); // more DACs for more channels + static const uint32_t kMaxSizeOfV17 = kMaxSizeOfV16; // same as V16 (just signifies SST8CH_1GHz) static const uint32_t kMaxSizeOf = kMaxSizeOfV7; // should be the biggest one @@ -225,6 +229,8 @@ uint16_t GetTotDacsForIOVers(const uint8_t rv) { if ( IsIOversForATWD(rv) ) { return kTotDacsAtwd4ch; + } else if ((rv==16)||(rv==17)) { + return kTotDacsSst8ch; } else { return kTotDacsSst4ch; } @@ -280,6 +286,10 @@ maxsize = kMaxSizeOfV14; } else if (rv==15) { maxsize = kMaxSizeOfV15; + } else if (rv==16) { + maxsize = kMaxSizeOfV16; + } else if (rv==17) { + maxsize = kMaxSizeOfV17; } uint32_t sz = maxsize; if (rv<11) {