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

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

added nb_word_in_buffer to the waveform picker registers
paul -
r71:1b03ba925ab6 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: Wed Nov 13 08:18:19 2013
3 # Generated by qmake (2.01a) (Qt 4.8.5) on: Wed Nov 13 13:54:37 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-13T13:39:43. -->
3 <!-- Written by QtCreator 2.8.1, 2013-11-13T13:50:25. -->
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
@@ -46,21 +46,22 struct time_management_regs_str{
46 typedef struct time_management_regs_str time_management_regs_t;
46 typedef struct time_management_regs_str time_management_regs_t;
47
47
48 struct new_waveform_picker_regs_str{
48 struct new_waveform_picker_regs_str{
49 volatile int data_shaping; // 0x00 00 *** R1 R0 SP1 SP0 BW
49 int data_shaping; // 0x00 00 *** R1 R0 SP1 SP0 BW
50 volatile int run_burst_enable; // 0x04 01 *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
50 int run_burst_enable; // 0x04 01 *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
51 volatile int addr_data_f0; // 0x08
51 int addr_data_f0; // 0x08
52 volatile int addr_data_f1; // 0x0c
52 int addr_data_f1; // 0x0c
53 volatile int addr_data_f2; // 0x10
53 int addr_data_f2; // 0x10
54 volatile int addr_data_f3; // 0x14
54 int addr_data_f3; // 0x14
55 volatile int status; // 0x18
55 volatile int status; // 0x18
56 volatile int delta_snapshot; // 0x1c
56 int delta_snapshot; // 0x1c
57 volatile int delta_f0; // 0x20
57 int delta_f0; // 0x20
58 volatile int delta_f0_2;
58 int delta_f0_2; // 0x24
59 volatile int delta_f1;
59 int delta_f1; // 0x28
60 volatile int delta_f2;
60 int delta_f2; // 0x2c
61 volatile int nb_data_by_buffer;
61 int nb_data_by_buffer; // 0x30
62 volatile int snapshot_param;
62 int snapshot_param; // 0x34
63 volatile int start_date;
63 int start_date; // 0x38
64 int nb_word_in_buffer; // 0x3c
64 };
65 };
65 typedef struct new_waveform_picker_regs_str new_waveform_picker_regs_t;
66 typedef struct new_waveform_picker_regs_str new_waveform_picker_regs_t;
66
67
Show file before | Show file after | Hide comments
@@ -1078,6 +1078,7 void reset_new_waveform_picker_regs()
1078 * - 0x30 nb_data_by_buffer
1078 * - 0x30 nb_data_by_buffer
1079 * - 0x34 nb_snapshot_param
1079 * - 0x34 nb_snapshot_param
1080 * - 0x38 start_date
1080 * - 0x38 start_date
1081 * - 0x3c nb_word_in_buffer
1081 *
1082 *
1082 */
1083 */
1083
1084
@@ -1095,9 +1096,10 void reset_new_waveform_picker_regs()
1095 new_waveform_picker_regs->delta_f1 = 0x3c0; // 0x28 *** 960
1096 new_waveform_picker_regs->delta_f1 = 0x3c0; // 0x28 *** 960
1096 // new_waveform_picker_regs->delta_f2 = 0x12200; // 0x2c *** 74240
1097 // new_waveform_picker_regs->delta_f2 = 0x12200; // 0x2c *** 74240
1097 new_waveform_picker_regs->delta_f2 = 0xc00; // 0x2c *** 12 * 256 = 2048
1098 new_waveform_picker_regs->delta_f2 = 0xc00; // 0x2c *** 12 * 256 = 2048
1098 new_waveform_picker_regs->nb_data_by_buffer = 0x1802; // 0x30 *** 2048 * 3 + 2
1099 new_waveform_picker_regs->nb_data_by_buffer = 0x7ff; // 0x30 *** 2048 -1
1099 new_waveform_picker_regs->snapshot_param = 0x7ff; // 0x34 *** 2048 -1
1100 new_waveform_picker_regs->snapshot_param = 0x800; // 0x34 *** 2048
1100 new_waveform_picker_regs->start_date = 0x00; // 0x38
1101 new_waveform_picker_regs->start_date = 0x00; // 0x38
1102 new_waveform_picker_regs->nb_word_in_buffer = 0x1802; // 0x3c *** 2048 * 3 + 2 = 6146
1101 }
1103 }
1102
1104
1103 //*****************
1105 //*****************
General Comments 0
You need to be logged in to leave comments. Login now