Arianna autonomous DAQ firmware
Dependencies: mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW
Diff: main.cpp
- Revision:
- 5:9cea89700c66
- Parent:
- 4:a91682e19d6b
- Child:
- 6:6f002d202f59
--- a/main.cpp Thu Aug 02 05:42:47 2012 +0000 +++ b/main.cpp Fri Aug 03 00:04:34 2012 +0000 @@ -205,6 +205,7 @@ printf("calling wait trig\r\n"); printf("gFirstEvt=%s\r\n",gFirstEvt?"true":"false"); + printf("readingout=%d\r\n",(int)gReadingOut); PIN_lockRegisters = 0; // allow data to come from DFPGA WaitTrigAndSendClock(); @@ -324,22 +325,22 @@ // void SetPower(const bool isCommWin) { if (isCommWin) { - PIN_turn_on_system = gConf.IsPoweredFor(SnConfigFrame::kCardComWin); + PIN_turn_on_system = gConf.GetPowPinSetting(SnConfigFrame::kCardComWin); wait_ms(10); - PIN_turn_on_amps = gConf.IsPoweredFor(SnConfigFrame::kAmpsComWin); + PIN_turn_on_amps = gConf.GetPowPinSetting(SnConfigFrame::kAmpsComWin); wait_ms(10); - PIN_iridSbd_power = gConf.IsPoweredFor(SnConfigFrame::kIridComWin); + PIN_iridSbd_power = gConf.GetPowPinSetting(SnConfigFrame::kIridComWin); wait_ms(10); - PIN_afar_power = gConf.IsPoweredFor(SnConfigFrame::kAfarComWin); + PIN_afar_power = gConf.GetPowPinSetting(SnConfigFrame::kAfarComWin); wait_ms(10); } else { - PIN_turn_on_system = gConf.IsPoweredFor(SnConfigFrame::kCardDatTak); + PIN_turn_on_system = gConf.GetPowPinSetting(SnConfigFrame::kCardDatTak); wait_ms(10); - PIN_turn_on_amps = gConf.IsPoweredFor(SnConfigFrame::kAmpsDatTak); + PIN_turn_on_amps = gConf.GetPowPinSetting(SnConfigFrame::kAmpsDatTak); wait_ms(10); - PIN_iridSbd_power = gConf.IsPoweredFor(SnConfigFrame::kIridDatTak); + PIN_iridSbd_power = gConf.GetPowPinSetting(SnConfigFrame::kIridDatTak); wait_ms(10); - PIN_afar_power = gConf.IsPoweredFor(SnConfigFrame::kAfarDatTak); + PIN_afar_power = gConf.GetPowPinSetting(SnConfigFrame::kAfarDatTak); wait_ms(10); } } @@ -477,7 +478,6 @@ void WaitTrigAndSendClock() { printf("WaitTrigAndSendClock\r\n"); - if (gFirstEvt==false) { PIN_DoNotRestartAllClocks = 0; wait_us(1); @@ -504,7 +504,6 @@ // TODO: what if some card (set of channels) doesn't respond? // currently, will wait forever? // also, if ch1 is dead, will wait forever (due to FPGA code) - for( uint8_t i = 0; i < kNsamps; i++ ) { if( PIN_a_sf_clk == 1 ) { if( i == 0 ) @@ -517,7 +516,6 @@ i--; } } - } SnCommWin::ECommWinResult OpenCommWin() {