@@ -1,6 +1,6 | |||
|
1 | 1 | ############################################################################# |
|
2 | 2 | # Makefile for building: bin/fsw |
|
3 |
# Generated by qmake (2.01a) (Qt 4.8.5) on: |
|
|
3 | # Generated by qmake (2.01a) (Qt 4.8.5) on: Fri Nov 15 07:19:44 2013 | |
|
4 | 4 | # Project: fsw-qt.pro |
|
5 | 5 | # Template: app |
|
6 | 6 | # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro |
@@ -1,6 +1,6 | |||
|
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
|
2 | 2 | <!DOCTYPE QtCreatorProject> |
|
3 |
<!-- Written by QtCreator 2.8.1, 2013-11-1 |
|
|
3 | <!-- Written by QtCreator 2.8.1, 2013-11-15T16:54:28. --> | |
|
4 | 4 | <qtcreator> |
|
5 | 5 | <data> |
|
6 | 6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> |
@@ -76,19 +76,20 rtems_isr waveforms_isr( rtems_vector_nu | |||
|
76 | 76 | statusReg = new_waveform_picker_regs->status; |
|
77 | 77 | fullRecord = fullRecord | ( statusReg & 0x7 ); |
|
78 | 78 | // if ( (new_waveform_picker_regs->status & 0x7) == 0x7 ){ // f2 f1 and f0 are full |
|
79 | if ( (new_waveform_picker_regs->status & 0x1) == 0x1 ){ // f2 is full | |
|
80 | if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) { | |
|
81 | rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 ); | |
|
82 | } | |
|
83 | new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffff888; | |
|
84 | } | |
|
85 | // if ( fullRecord == 0x7 ){ // f2 f1 and f0 are full | |
|
79 | 86 | // if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) { |
|
80 | 87 | // rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 ); |
|
81 | 88 | // } |
|
82 | // new_waveform_picker_regs->status = new_waveform_picker_regs->status & 0xfffff888; | |
|
89 | // fullRecord = 0x00; | |
|
83 | 90 | // } |
|
84 | if ( fullRecord == 0x7 ){ // f2 f1 and f0 are full | |
|
85 | if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) { | |
|
86 | rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 ); | |
|
87 | } | |
|
88 | fullRecord = 0x00; | |
|
89 | } | |
|
90 | new_waveform_picker_regs->status = ( new_waveform_picker_regs->status & (~statusReg) ) | |
|
91 | | ( new_waveform_picker_regs->status & 0xfffffff8 ); | |
|
91 | // new_waveform_picker_regs->status = ( new_waveform_picker_regs->status & (~statusReg) ) | |
|
92 | // | ( new_waveform_picker_regs->status & 0xfffffff8 ); | |
|
92 | 93 | #endif |
|
93 | 94 | break; |
|
94 | 95 | |
@@ -1031,7 +1032,8 void set_wfp_burst_enable_register( unsi | |||
|
1031 | 1032 | case(LFR_MODE_NORMAL): |
|
1032 | 1033 | new_waveform_picker_regs->run_burst_enable = 0x00; // [0000 0000] no burst enable |
|
1033 | 1034 | // new_waveform_picker_regs->run_burst_enable = 0x0f; // [0000 1111] enable f3 f2 f1 f0 |
|
1034 | new_waveform_picker_regs->run_burst_enable = 0x07; // [0000 0111] enable f2 f1 f0 | |
|
1035 | // new_waveform_picker_regs->run_burst_enable = 0x07; // [0000 0111] enable f2 f1 f0 | |
|
1036 | new_waveform_picker_regs->run_burst_enable = 0x01; // [0000 0111] enable f0 | |
|
1035 | 1037 | break; |
|
1036 | 1038 | case(LFR_MODE_BURST): |
|
1037 | 1039 | new_waveform_picker_regs->run_burst_enable = 0x40; // [0100 0000] f2 burst enabled |
General Comments 0
You need to be logged in to leave comments.
Login now