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: Mon Jan 20 12:52:59 2014
+# Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Jan 21 11:57:00 2014
 # Project:  fsw-qt.pro
 # Template: app
 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ CONFIG+=debug -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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.0.0, 2014-01-21T06:52:06. -->
+<!-- Written by QtCreator 3.0.0, 2014-01-21T13:07:28. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
diff --git a/header/fsw_params.h b/header/fsw_params.h
--- a/header/fsw_params.h
+++ b/header/fsw_params.h
@@ -13,7 +13,8 @@
 // flight software version
 // this parameters is handled by the Qt project options
 
-#define NB_SAMPLES_PER_SNAPSHOT 2048
+//#define NB_SAMPLES_PER_SNAPSHOT 2048
+#define NB_SAMPLES_PER_SNAPSHOT 2352    // 336 * 7 = 2352
 #define TIME_OFFSET 2
 #define WAVEFORM_EXTENDED_HEADER_OFFSET 22
 #define NB_BYTES_SWF_BLK (2 * 6)
diff --git a/src/wf_handler.c b/src/wf_handler.c
--- a/src/wf_handler.c
+++ b/src/wf_handler.c
@@ -1014,8 +1014,12 @@ void reset_waveform_picker_regs()
     set_wfp_delta_snapshot();                           // time in seconds between two snapshots
     waveform_picker_regs->delta_f2_f1 = 0xffff;         // 0x16800 => 92160 (max 4 bytes)
     waveform_picker_regs->delta_f2_f0 = 0x17c00;        // 97 280 (max 5 bytes)
-    waveform_picker_regs->nb_burst_available = 0x180;   // max 3 bytes, size of the buffer in burst (1 burst = 16 x 4 octets)
-    waveform_picker_regs->nb_snapshot_param = 0x7ff;    // max 3 octets, 2048 - 1
+//    waveform_picker_regs->nb_burst_available = 0x180;   // max 3 bytes, size of the buffer in burst (1 burst = 16 x 4 octets)
+//                                                        // 3 * 2048 / 16 = 384
+//    waveform_picker_regs->nb_snapshot_param = 0x7ff;    // max 3 octets, 2048 - 1
+    waveform_picker_regs->nb_burst_available = 0x1b9;   // max 3 bytes, size of the buffer in burst (1 burst = 16 x 4 octets)
+                                                        // 3 * 2352 / 16 = 441
+    waveform_picker_regs->nb_snapshot_param = 0x944;    // max 3 octets, 2372 - 1
 #endif
 }