##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SOLO_LFR » DEV_PLE
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/DEV_PLE

Minor modifications before going back to VHDLib206
paul -
r79:1d1946bb1d17 nov2013
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 #############################################################################
1 #############################################################################
2 # Makefile for building: bin/fsw
2 # Makefile for building: bin/fsw
3 # Generated by qmake (2.01a) (Qt 4.8.5) on: Thu Nov 14 09:47:53 2013
3 # Generated by qmake (2.01a) (Qt 4.8.5) on: Fri Nov 15 07:19:44 2013
4 # Project: fsw-qt.pro
4 # Project: fsw-qt.pro
5 # Template: app
5 # Template: app
6 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
6 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 <?xml version="1.0" encoding="UTF-8"?>
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE QtCreatorProject>
2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by QtCreator 2.8.1, 2013-11-14T11:56:41. -->
3 <!-- Written by QtCreator 2.8.1, 2013-11-15T16:54:28. -->
4 <qtcreator>
4 <qtcreator>
5 <data>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
Show file before | Show file after | Hide comments
@@ -76,19 +76,20 rtems_isr waveforms_isr( rtems_vector_nu
76 statusReg = new_waveform_picker_regs->status;
76 statusReg = new_waveform_picker_regs->status;
77 fullRecord = fullRecord | ( statusReg & 0x7 );
77 fullRecord = fullRecord | ( statusReg & 0x7 );
78 // if ( (new_waveform_picker_regs->status & 0x7) == 0x7 ){ // f2 f1 and f0 are full
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 // if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) {
86 // if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) {
80 // rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_2 );
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
91 // new_waveform_picker_regs->status = ( new_waveform_picker_regs->status & (~statusReg) )
85 if (rtems_event_send( Task_id[TASKID_WFRM], RTEMS_EVENT_MODE_NORMAL ) != RTEMS_SUCCESSFUL) {
92 // | ( new_waveform_picker_regs->status & 0xfffffff8 );
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 );
92 #endif
93 #endif
93 break;
94 break;
94
95
@@ -1031,7 +1032,8 void set_wfp_burst_enable_register( unsi
1031 case(LFR_MODE_NORMAL):
1032 case(LFR_MODE_NORMAL):
1032 new_waveform_picker_regs->run_burst_enable = 0x00; // [0000 0000] no burst enable
1033 new_waveform_picker_regs->run_burst_enable = 0x00; // [0000 0000] no burst enable
1033 // new_waveform_picker_regs->run_burst_enable = 0x0f; // [0000 1111] enable f3 f2 f1 f0
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 break;
1037 break;
1036 case(LFR_MODE_BURST):
1038 case(LFR_MODE_BURST):
1037 new_waveform_picker_regs->run_burst_enable = 0x40; // [0100 0000] f2 burst enabled
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