Diff: SnConstants.h

Revision:

114:554fa3a956b4

Parent:

113:a49885445130

Child:

115:29f46e4b65d4

--- a/SnConstants.h	Tue Nov 24 22:06:47 2015 +0000
+++ b/SnConstants.h	Fri Dec 04 02:54:48 2015 +0000
@@ -23,8 +23,8 @@
 //static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF2, 0x02, 0xC1}; // STN 17 (SST 109)   0002F7F202C1
 //static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF2, 0x24, 0x44}; // STN 19 (SST 105)   0002F7F22444
 //static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF1, 0xF7, 0xA8}; // STN 15 (SST 110)   0002F7F1F7A8
-static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF2, 0x24, 0x4B}; // STN 13 (SST 102)   0002F7F2244B
-//static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF1, 0xF6, 0x34}; // STN 31 (SST 107)   0002F7F1F634
+//static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF2, 0x24, 0x4B}; // STN 13 (SST 102)   0002F7F2244B
+static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF1, 0xF6, 0x34}; // STN 31 (SST 107)   0002F7F1F634
 //static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF1, 0xF2, 0x1A}; // STN 32 (SST 112)   0002F7F1F21A (slow)
 //static const char kDefaultMacAdress[] = {0x00, 0x02, 0xF7, 0xF1, 0xF2, 0x12}; // STN 30 (SST 113)   0002F7F1F212
 
@@ -56,7 +56,7 @@
 static const uint16_t kNoTrigPla        = 0x0000u;
 static const float    kAsfClkPrdUs      = 8.535; // us -- change kAdcToMBtimeCut if this is <=2us
 static const float    kAdcToMBtimeCut   = (kNsamps*kAsfClkPrdUs)+(kAsfClkPrdUs/2.0);
-#elif CHIPBOARD==SST4CH
+#elif (CHIPBOARD==SST4CH) || (CHIPBOARD==SST4CH_1GHz)
 static const uint8_t  kNchans           = kNchansFourAnt;
 static const uint16_t kNsamps           = kNsampsSst;
 static const uint8_t  kNchanDacs        = kNchanDacsSst;