# HG changeset patch # User paul # Date 2015-04-24 13:18:54 # Node ID c53fb904ef313395a25f957ba89bd4225b23a0d3 # Parent d5570d7e57e262cb3477fc3d166072137705f528 rev 3.0.0.0 diff --git a/EQM/src/main.c b/EQM/src/main.c --- a/EQM/src/main.c +++ b/EQM/src/main.c @@ -30,11 +30,13 @@ void force_irq (int irq) { lreg[IFORCE/4 /* NOTE: NEVER put printf() or other stdio routines in interrupt handlers, they are not re-entrant. This (bad) example is just a demo */ -unsigned char processTimecode = 0; +volatile unsigned char processTimecode = 0; +unsigned int counter = 0; void irqhandler(int irq) { processTimecode = 1; + counter ++; } int main( void ) @@ -43,7 +45,6 @@ int main( void ) unsigned int k; volatile unsigned int *reg; float aux; - unsigned int counter = 0; printf("hello world!\n"); @@ -60,20 +61,10 @@ int main( void ) while(1) { - if (processTimecode == 1) - { - counter ++; - printf("timecode counter = %d\n", counter); - processTimecode = 0; - } - else - { - printf("."); - } - -// for (k=0; k<100000;k++) +// if (processTimecode == 1) // { -// aux = aux + *reg ; +// printf("timecode counter = %d\n", counter); +// processTimecode = 0; // } } diff --git a/python_scripts/EQM_reload_sw.py b/python_scripts/EQM_reload_sw.py --- a/python_scripts/EQM_reload_sw.py +++ b/python_scripts/EQM_reload_sw.py @@ -1,15 +1,11 @@ # LOAD FSW USING LINK 1 SpwPlugin0.StarDundeeSelectLinkNumber( 1 ) -APB_UART_PLUGIN0.setFifoDebugEnabled( 0 ) - dsu3plugin0.openFile("/opt/DEV_PLE/EQM/bin/eqm") dsu3plugin0.loadFile() dsu3plugin0.run() -APB_UART_PLUGIN0.setFifoDebugEnabled( 1 ) - # START SENDING TIMECODES AT 1 Hz SpwPlugin0.StarDundeeStartTimecodes( 1 ) diff --git a/python_scripts/EQM_setup.py b/python_scripts/EQM_setup.py --- a/python_scripts/EQM_setup.py +++ b/python_scripts/EQM_setup.py @@ -6,9 +6,6 @@ SpwPlugin0.selectBridge("STAR-Dundee Spw proxy.loadSysDriverToParent("dsu3plugin","SpwPlugin0") proxy.loadSysDriverToParent("LFRControlPlugin","SpwPlugin0") -proxy.loadSysDriverToParent("APB_UART_PLUGIN","SpwPlugin0") -APB_UART_PLUGIN0.setFifoDebugEnabled( 1 ) - availableBrickCount = SpwPlugin0.StarDundeeGetAvailableBrickCount() print str(availableBrickCount) + " SpaceWire brick(s) found"