##// END OF EJS Templates
N = 2352 instead of 2048
paul -
r88:bf8352344672 VHDLib206
parent child
Show More
@@ -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: Mon Jan 20 12:52:59 2014
3 # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Jan 21 11:57:00 2014
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++ CONFIG+=debug -o Makefile fsw-qt.pro
6 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile fsw-qt.pro
@@ -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 3.0.0, 2014-01-21T06:52:06. -->
3 <!-- Written by QtCreator 3.0.0, 2014-01-21T13:07:28. -->
4 <qtcreator>
4 <qtcreator>
5 <data>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -13,7 +13,8
13 // flight software version
13 // flight software version
14 // this parameters is handled by the Qt project options
14 // this parameters is handled by the Qt project options
15
15
16 #define NB_SAMPLES_PER_SNAPSHOT 2048
16 //#define NB_SAMPLES_PER_SNAPSHOT 2048
17 #define NB_SAMPLES_PER_SNAPSHOT 2352 // 336 * 7 = 2352
17 #define TIME_OFFSET 2
18 #define TIME_OFFSET 2
18 #define WAVEFORM_EXTENDED_HEADER_OFFSET 22
19 #define WAVEFORM_EXTENDED_HEADER_OFFSET 22
19 #define NB_BYTES_SWF_BLK (2 * 6)
20 #define NB_BYTES_SWF_BLK (2 * 6)
@@ -1014,8 +1014,12 void reset_waveform_picker_regs()
1014 set_wfp_delta_snapshot(); // time in seconds between two snapshots
1014 set_wfp_delta_snapshot(); // time in seconds between two snapshots
1015 waveform_picker_regs->delta_f2_f1 = 0xffff; // 0x16800 => 92160 (max 4 bytes)
1015 waveform_picker_regs->delta_f2_f1 = 0xffff; // 0x16800 => 92160 (max 4 bytes)
1016 waveform_picker_regs->delta_f2_f0 = 0x17c00; // 97 280 (max 5 bytes)
1016 waveform_picker_regs->delta_f2_f0 = 0x17c00; // 97 280 (max 5 bytes)
1017 waveform_picker_regs->nb_burst_available = 0x180; // max 3 bytes, size of the buffer in burst (1 burst = 16 x 4 octets)
1017 // waveform_picker_regs->nb_burst_available = 0x180; // max 3 bytes, size of the buffer in burst (1 burst = 16 x 4 octets)
1018 waveform_picker_regs->nb_snapshot_param = 0x7ff; // max 3 octets, 2048 - 1
1018 // // 3 * 2048 / 16 = 384
1019 // waveform_picker_regs->nb_snapshot_param = 0x7ff; // max 3 octets, 2048 - 1
1020 waveform_picker_regs->nb_burst_available = 0x1b9; // max 3 bytes, size of the buffer in burst (1 burst = 16 x 4 octets)
1021 // 3 * 2352 / 16 = 441
1022 waveform_picker_regs->nb_snapshot_param = 0x944; // max 3 octets, 2372 - 1
1019 #endif
1023 #endif
1020 }
1024 }
1021
1025
General Comments 0
You need to be logged in to leave comments. Login now