##// END OF EJS Templates
priority modifications...
paul -
r50:668726f2ef59 default
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: Fri Oct 25 15:35:04 2013
3 # Generated by qmake (2.01a) (Qt 4.8.5) on: Sun Oct 27 15:33:40 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
@@ -10,7 +10,7
10
10
11 CC = sparc-rtems-gcc
11 CC = sparc-rtems-gcc
12 CXX = sparc-rtems-g++
12 CXX = sparc-rtems-g++
13 DEFINES = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=18 -DPRINT_MESSAGES_ON_CONSOLE
13 DEFINES = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=19 -DPRINT_MESSAGES_ON_CONSOLE
14 CFLAGS = -pipe -O3 -Wall $(DEFINES)
14 CFLAGS = -pipe -O3 -Wall $(DEFINES)
15 CXXFLAGS = -pipe -O3 -Wall $(DEFINES)
15 CXXFLAGS = -pipe -O3 -Wall $(DEFINES)
16 INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header
16 INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
@@ -7,11 +7,11 CONFIG -= qt
7 include(./sparc.pri)
7 include(./sparc.pri)
8
8
9 # flight software version
9 # flight software version
10 SWVERSION=-0-18
10 SWVERSION=-0-19
11 DEFINES += SW_VERSION_N1=0
11 DEFINES += SW_VERSION_N1=0
12 DEFINES += SW_VERSION_N2=0
12 DEFINES += SW_VERSION_N2=0
13 DEFINES += SW_VERSION_N3=0
13 DEFINES += SW_VERSION_N3=0
14 DEFINES += SW_VERSION_N4=18
14 DEFINES += SW_VERSION_N4=19
15
15
16 contains( CONFIG, verbose ) {
16 contains( CONFIG, verbose ) {
17 DEFINES += PRINT_MESSAGES_ON_CONSOLE
17 DEFINES += PRINT_MESSAGES_ON_CONSOLE
@@ -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.0, 2013-10-25T06:57:59. -->
3 <!-- Written by QtCreator 2.8.0, 2013-10-27T14:25:30. -->
4 <qtcreator>
4 <qtcreator>
5 <data>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -129,13 +129,15
129 //
129 //
130 #define TASK_PRIORITY_WTDG 20
130 #define TASK_PRIORITY_WTDG 20
131 //
131 //
132 #define TASK_PRIORITY_HOUS 40
132 #define TASK_PRIORITY_HOUS 30
133 #define TASK_PRIORITY_CWF1 40
133 //
134 #define TASK_PRIORITY_CWF2 40
134 #define TASK_PRIORITY_CWF1 35 // CWF1 and CWF2 are never running together
135 #define TASK_PRIORITY_CWF2 35 //
136 //
135 #define TASK_PRIORITY_WFRM 40
137 #define TASK_PRIORITY_WFRM 40
136 #define TASK_PRIORITY_CWF3 40
138 #define TASK_PRIORITY_CWF3 40 // there is a printf in this function, be careful with its priority wrt CWF1
137 //
139 //
138 #define TASK_PRIORITY_SEND 40
140 #define TASK_PRIORITY_SEND 45
139 //
141 //
140 #define TASK_PRIORITY_RECV 50
142 #define TASK_PRIORITY_RECV 50
141 #define TASK_PRIORITY_ACTN 50
143 #define TASK_PRIORITY_ACTN 50
@@ -199,7 +199,7 rtems_task hous_task(rtems_task_argument
199 while(1){ // launch the rate monotonic task
199 while(1){ // launch the rate monotonic task
200 status = rtems_rate_monotonic_period( HK_id, HK_PERIOD );
200 status = rtems_rate_monotonic_period( HK_id, HK_PERIOD );
201 if ( status != RTEMS_SUCCESSFUL ) {
201 if ( status != RTEMS_SUCCESSFUL ) {
202 PRINTF1( "ERR *** in HOUS *** rtems_rate_monotonic_period *** code %d\n", status);
202 PRINTF1( "in HOUS *** ERR period: %d\n", status);
203 }
203 }
204 else {
204 else {
205 housekeeping_packet.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
205 housekeeping_packet.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
@@ -216,7 +216,7 rtems_task hous_task(rtems_task_argument
216 status = rtems_message_queue_send( queue_id, &housekeeping_packet,
216 status = rtems_message_queue_send( queue_id, &housekeeping_packet,
217 PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);
217 PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);
218 if (status != RTEMS_SUCCESSFUL) {
218 if (status != RTEMS_SUCCESSFUL) {
219 PRINTF1("in HOUS *** ERR %d\n", status)
219 PRINTF1("in HOUS *** ERR send: %d\n", status)
220 }
220 }
221 }
221 }
222 }
222 }
@@ -1157,8 +1157,11 rtems_id get_pkts_queue_id( void )
1157 {
1157 {
1158 rtems_id queue_id;
1158 rtems_id queue_id;
1159 rtems_status_code status;
1159 rtems_status_code status;
1160 rtems_name queue_send_name;
1160
1161
1161 status = rtems_message_queue_ident( misc_name[QUEUE_SEND], 0, &queue_id );
1162 queue_send_name = rtems_build_name( 'Q', '_', 'S', 'D' );
1163
1164 status = rtems_message_queue_ident( queue_send_name, 0, &queue_id );
1162 if (status != RTEMS_SUCCESSFUL)
1165 if (status != RTEMS_SUCCESSFUL)
1163 {
1166 {
1164 PRINTF1("in get_pkts_queue_id *** ERR %d\n", status)
1167 PRINTF1("in get_pkts_queue_id *** ERR %d\n", status)
General Comments 0
You need to be logged in to leave comments. Login now