# HG changeset patch
# User paul
# Date 2015-01-28 06:13:25
# Node ID a8668a35669295aaba22432d247158626f00a52a
# Parent  6423f4e9ffa8b01148dacc7e3783f4cf9b315826

sync

diff --git a/fsw_params.h b/fsw_params.h
--- a/fsw_params.h
+++ b/fsw_params.h
@@ -179,23 +179,23 @@ typedef struct ring_node
 #define TASKID_PRC2 19
 
 #define TASK_PRIORITY_SPIQ 5
-#define TASK_PRIORITY_WTDG 10
-#define TASK_PRIORITY_SEND 15
-#define TASK_PRIORITY_HOUS 20
-#define TASK_PRIORITY_AVF0 25
-#define TASK_PRIORITY_AVF1 30
-#define TASK_PRIORITY_CWF1 35   // CWF1 and CWF2 are never running together
-#define TASK_PRIORITY_CWF2 35   //
-#define TASK_PRIORITY_SWBD 37   // SWBD has a lower priority than WFRM, this is to extract the snapshot before sending it
+#define TASK_PRIORITY_WTDG 20
+#define TASK_PRIORITY_HOUS 30
+#define TASK_PRIORITY_CWF1 35 // CWF1 and CWF2 are never running together
+#define TASK_PRIORITY_CWF2 35 //
+#define TASK_PRIORITY_SWBD 37 // SWBD has a lower priority than WFRM, this is to extract the snapshot before sending it
 #define TASK_PRIORITY_WFRM 40
-#define TASK_PRIORITY_CWF3 40   // there is a printf in this function, be careful with its priority wrt CWF1
+#define TASK_PRIORITY_AVF0 41
+#define TASK_PRIORITY_AVF1 42
+#define TASK_PRIORITY_SEND 45
+#define TASK_PRIORITY_RECV 45
 #define TASK_PRIORITY_ACTN 50
+// The following tasks use the SEND mesage queue
 #define TASK_PRIORITY_PRC0 100
 #define TASK_PRIORITY_PRC1 100
-#define TASK_PRIORITY_AVF2 110
-#define TASK_PRIORITY_PRC2 110
-#define TASK_PRIORITY_RECV 120
-//#define TASK_PRIORITY_SEND 120
+#define TASK_PRIORITY_PRC2 100
+#define TASK_PRIORITY_AVF2 105
+#define TASK_PRIORITY_CWF3 120 // there is a printf in this function, be careful with its priority wrt CWF1
 #define TASK_PRIORITY_STAT 200
 #define TASK_PRIORITY_DUMB 200
 
diff --git a/fsw_params_processing.h b/fsw_params_processing.h
--- a/fsw_params_processing.h
+++ b/fsw_params_processing.h
@@ -64,7 +64,6 @@
 #define TOTAL_SIZE_COMPRESSED_ASM_NORM_F2   300     // 12 * 25 WORDS
 #define TOTAL_SIZE_COMPRESSED_ASM_SBM_F0    550     // 22 * 25 WORDS
 #define TOTAL_SIZE_COMPRESSED_ASM_SBM_F1    650     // 26 * 25 WORDS
-#define TOTAL_SIZE_COMPRESSED_ASM_SBM_F2    600     // 24 * 25 WORDS
 #define TOTAL_SIZE_BP1_NORM_F0              99      // 9  * 11 UNSIGNED CHAR
 #define TOTAL_SIZE_BP2_NORM_F0              330     // 30 * 11 UNSIGNED CHAR
 #define TOTAL_SIZE_BP1_SBM_F0               198     // 9  * 22 UNSIGNED CHAR