Arianna autonomous DAQ firmware
Dependencies: mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW
Diff: main.cpp
- Revision:
- 47:fbe956b10a91
- Parent:
- 46:07b107ad648d
- Child:
- 48:ee023b8807d8
diff -r 07b107ad648d -r fbe956b10a91 main.cpp --- a/main.cpp Wed Oct 30 21:36:44 2013 +0000 +++ b/main.cpp Wed Nov 06 00:04:30 2013 +0000 @@ -5,15 +5,15 @@ #define DISABLE_CONFIG_SAFETYNETS -//#define ENABLE_AFAR_COMM -//#define ENABLE_SBD_COMM -#define ENABLE_USB_COMM +#define ENABLE_AFAR_COMM +#define ENABLE_SBD_COMM +//#define ENABLE_USB_COMM //#define ENABLE_AFAR_TWITTER //#define USE_RTOS // change in CommConstants and EthernetPower also //#define USE_ETH_INTERFACE //#define EVT_TIME_PROFILE -//#define DEBUG +#define DEBUG //#define SSNOTIFY #define USE_MODSERIAL @@ -226,18 +226,16 @@ led3=!led3; #ifdef DEBUG printf("proc force\r\n"); + printf("PIN_forceTrigge=%d, PIN_turn_on_system=%d, " + "PIN_a_sf_clk=%d\r\n", + PIN_forceTrigger.read(), PIN_turn_on_system.read(), + PIN_a_sf_clk.read()); #endif gEvent.SetTrgBit(kFrcTrg); gEvent.SetTrgNum(++(gTrgNum[kFrcTrg])); //PIN_forceTrigger = 0; PIN_forceTrigger = 1; // force a trigger PIN_forceTrigger = 0; -#ifdef DEBUG - printf("PIN_forceTrigge=%d, PIN_turn_on_system=%d, " - "PIN_a_sf_clk=%d\r\n", - PIN_forceTrigger.read(), PIN_turn_on_system.read(), - PIN_a_sf_clk.read()); -#endif } } @@ -1298,26 +1296,23 @@ printf("cards powered=%d\r\n",(int)AreCardsPowered(true)); #endif - // set gFirstEvt to false even if cards are powered off. - // otherwise, if cards ARE powered off, it will always be - // true and the "start trigger" clock will be written continuously #ifdef DEBUG printf("gFirstEvt=%s\r\n",gFirstEvt?"true":"false"); #endif - if (gFirstEvt==false) { - PIN_DoNotRestartAllClocks = 0; - wait_us(1); - PIN_DoNotRestartAllClocks = 1; - //led3 = !led3; // toggle send clock led - } else { - gFirstEvt = false; - } - if (AreCardsPowered(false)) { PIN_spi.format( 16, 1 ); // back to trigger mode PIN_spi.frequency( 10000000 ); // Max is 12.5 MHz + if (gFirstEvt==false) { + PIN_DoNotRestartAllClocks = 0; + wait_us(1); + PIN_DoNotRestartAllClocks = 1; + //led3 = !led3; // toggle send clock led + } else { + gFirstEvt = false; + } + // // wait for a trigger here. // @@ -1398,6 +1393,10 @@ } else { // cards have no power. don't try reading out gReadingOut=false; + // set gFirstEvt to false even if cards are powered off. + // otherwise, if cards ARE powered off, it will always be + // true and the "start trigger" clock will be written continuously + gFirstEvt = false; } }