Diff: main.cpp

Revision:

114:554fa3a956b4

Parent:

100:3a27edf9ce16

Child:

116:8099b754fbb4

--- a/main.cpp	Tue Nov 24 22:06:47 2015 +0000
+++ b/main.cpp	Fri Dec 04 02:54:48 2015 +0000
@@ -149,7 +149,7 @@
 // Setup SPI pins
 SPI PIN_spi( p5, p6, p7 );
 
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
 PinName gThermPinName(p15);
 DS1820 PIN_therm(gThermPinName, gThermPinName, false); // be default, on external power
 #endif
@@ -205,7 +205,7 @@
 void                      UpdateTemperature();
 bool                      AreCardsPowered(const bool checkPin);
 void                      GetAvePowerReading();
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
 void                      InitTempProbe();
 #endif
 void                      ResetCountersClearEvt();
@@ -447,7 +447,7 @@
 #endif
 }
 
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
 void InitTempProbe() {
 #ifdef DEBUG
     printf("setting temp probe power mode\r\n");
@@ -468,7 +468,7 @@
 
 void UpdateTemperature() {
     // ask chip to convert temperature
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
     PIN_therm.convert_temperature(true, DS1820::all_devices);
     gTemperature.SetTempAndTime( PIN_therm.temperature('c'), time(0) );
 #ifdef DEBUG
@@ -834,6 +834,7 @@
     printf("Restart watchdog with time [%u] at [%u]\r\n",
         gConf.GetWatchdogPeriod(), time(0));
     printf("Free memory = %d\r\n", FreeMem());
+    printf("CHIPBOARD=%d\r\n", int(CHIPBOARD));
 #endif
     Watchdog::kick(gConf.GetWatchdogPeriod());
     
@@ -887,6 +888,12 @@
 #endif
 
     uint8_t comi(0);
+#ifdef ENABLE_USB_COMM
+#ifdef DEBUG
+    printf("makin SnCommWinUsb\r\n");
+#endif
+    gComms[comi++] = new SnCommWinUsb(&gCpu);
+#endif // ENABLE_USB_COMM
 #ifdef ENABLE_AFAR_COMM
     // RTOS stuff must be made inside main for some reason    
 #ifdef USE_ETH_INTERFACE
@@ -914,12 +921,6 @@
 #endif
     gComms[comi++] = new SnCommWinSBD(&gSBDport);
 #endif // ENABLE_SBD_COMM
-#ifdef ENABLE_USB_COMM
-#ifdef DEBUG
-    printf("makin SnCommWinUsb\r\n");
-#endif
-    gComms[comi++] = new SnCommWinUsb(&gCpu);
-#endif // ENABLE_USB_COMM
 
 #ifdef DEBUG
     printf("made comm objects\r\n");
@@ -1031,7 +1032,7 @@
             gThmTrgTimer.reset(); gThmTrgTimer.start();
             gAllTrgTimer.reset(); gAllTrgTimer.start();
             gStTrgStartClk = gClkSet;
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
             // reset in case a trigger arrived before we were ready
             // this is mostly to ensure that the chip gets reset on soft
             // reboot, in case it got stopped prior to the reboot
@@ -1044,11 +1045,11 @@
         PIN_lockRegisters = 0;   // allow data to come from DFPGA
         WaitTrigAndSendClock();  // wait for trigger and move data to MB. this returns immediately if cards are powered off
         PIN_lockRegisters = 1;   // block registers during readout
-#else
+#else  // ATWD4CH
         PIN_readingData   = 0;  // not reading yet
         WaitTrigAndSendClock(); // wait for trigger. this returns immediately if cards are powered off
         // PIN_readingData will be set high by SnEventFrame::ReadWaveformsSST
-#endif        // ATWD4CH
+#endif // not ATWD4CH
 #ifdef EVT_TIME_PROFILE
         gProfiler.start();
         int befSaveEvt=0, aftSaveEvt=0,
@@ -1099,7 +1100,7 @@
 #endif // EVT_TIME_PROFILE
                
             } else {
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
                 // reset in case a trigger arrived before we were ready
                 PIN_ResetChips = 1;
                 PIN_ResetChips = 0;
@@ -2026,7 +2027,7 @@
 #endif
     }
 
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
     // set the SST triggering run mode
     PIN_dualOrSingleThresholds = gConf.IsDualThresholdMode();
     PIN_differentialTrigSignal = gConf.IsDifferentialTrigMode();
@@ -2039,7 +2040,7 @@
     // Enable thermal trigger?
     PIN_enableThermTrig = gConf.IsThermTrigEnabled();
 
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
     InitTempProbe();
 #endif
 
@@ -2333,7 +2334,7 @@
             
             // update temperature in case we want to send it in status
             if (isStartupWin) {
-#if CHIPBOARD==SST4CH
+#if CHIPBOARD!=ATWD4CH
                 InitTempProbe();
 #endif
             }