diff --git a/FSW-qt/Makefile b/FSW-qt/Makefile --- a/FSW-qt/Makefile +++ b/FSW-qt/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: bin/fsw -# Generated by qmake (2.01a) (Qt 4.8.5) on: Thu Nov 14 09:47:53 2013 +# Generated by qmake (2.01a) (Qt 4.8.5) on: Fri Nov 15 07:19:44 2013 # Project: fsw-qt.pro # Template: app # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro diff --git a/FSW-qt/fsw-qt.pro.user b/FSW-qt/fsw-qt.pro.user --- a/FSW-qt/fsw-qt.pro.user +++ b/FSW-qt/fsw-qt.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/src/wf_handler.c b/src/wf_handler.c --- a/src/wf_handler.c +++ b/src/wf_handler.c @@ -76,19 +76,20 @@ rtems_isr waveforms_isr( rtems_vector_nu statusReg = new_waveform_picker_regs->status; fullRecord = fullRecord | ( statusReg & 0x7 ); // if ( (new_waveform_picker_regs->status & 0x7) == 0x7 ){ // f2 f1 and f0 are full + if ( (new_waveform_picker_regs->status & 0x1) == 0x1 ){ // f2 is full + if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) { + rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 ); + } + new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffff888; + } +// if ( fullRecord == 0x7 ){ // f2 f1 and f0 are full // if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) { // rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 ); // } -// new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffff888; +// fullRecord = 0x00; // } - if ( fullRecord == 0x7 ){ // f2 f1 and f0 are full - if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) { - rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 ); - } - fullRecord = 0x00; - } - new_waveform_picker_regs->status = ( new_waveform_picker_regs->status & (~statusReg) ) - | ( new_waveform_picker_regs->status & 0xfffffff8 ); +// new_waveform_picker_regs->status = ( new_waveform_picker_regs->status & (~statusReg) ) +// | ( new_waveform_picker_regs->status & 0xfffffff8 ); #endif break; @@ -1031,7 +1032,8 @@ void set_wfp_burst_enable_register( unsi case(LFR_MODE_NORMAL): new_waveform_picker_regs->run_burst_enable = 0x00; // [0000 0000] no burst enable // new_waveform_picker_regs->run_burst_enable = 0x0f; // [0000 1111] enable f3 f2 f1 f0 - new_waveform_picker_regs->run_burst_enable = 0x07; // [0000 0111] enable f2 f1 f0 +// new_waveform_picker_regs->run_burst_enable = 0x07; // [0000 0111] enable f2 f1 f0 + new_waveform_picker_regs->run_burst_enable = 0x01; // [0000 0111] enable f0 break; case(LFR_MODE_BURST): new_waveform_picker_regs->run_burst_enable = 0x40; // [0100 0000] f2 burst enabled