| @@ -1,6 +1,6 | |||
|
|
1 | 1 | ############################################################################# |
|
|
2 | 2 | # Makefile for building: bin/fsw |
|
|
3 |
# Generated by qmake (2.01a) (Qt 4.8.5) on: |
|
|
|
3 | # Generated by qmake (2.01a) (Qt 4.8.5) on: Sun Oct 27 15:33:40 2013 | |
|
|
4 | 4 | # Project: fsw-qt.pro |
|
|
5 | 5 | # Template: app |
|
|
6 | 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 | 11 | CC = sparc-rtems-gcc |
|
|
12 | 12 | CXX = sparc-rtems-g++ |
|
|
13 |
DEFINES = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=1 |
|
|
|
13 | DEFINES = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=19 -DPRINT_MESSAGES_ON_CONSOLE | |
|
|
14 | 14 | CFLAGS = -pipe -O3 -Wall $(DEFINES) |
|
|
15 | 15 | CXXFLAGS = -pipe -O3 -Wall $(DEFINES) |
|
|
16 | 16 | INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
| @@ -7,11 +7,11 CONFIG -= qt | |||
|
|
7 | 7 | include(./sparc.pri) |
|
|
8 | 8 | |
|
|
9 | 9 | # flight software version |
|
|
10 |
SWVERSION=-0-1 |
|
|
|
10 | SWVERSION=-0-19 | |
|
|
11 | 11 | DEFINES += SW_VERSION_N1=0 |
|
|
12 | 12 | DEFINES += SW_VERSION_N2=0 |
|
|
13 | 13 | DEFINES += SW_VERSION_N3=0 |
|
|
14 |
DEFINES += SW_VERSION_N4=1 |
|
|
|
14 | DEFINES += SW_VERSION_N4=19 | |
|
|
15 | 15 | |
|
|
16 | 16 | contains( CONFIG, verbose ) { |
|
|
17 | 17 | DEFINES += PRINT_MESSAGES_ON_CONSOLE |
| @@ -1,6 +1,6 | |||
|
|
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
|
|
2 | 2 | <!DOCTYPE QtCreatorProject> |
|
|
3 |
<!-- Written by QtCreator 2.8.0, 2013-10-2 |
|
|
|
3 | <!-- Written by QtCreator 2.8.0, 2013-10-27T14:25:30. --> | |
|
|
4 | 4 | <qtcreator> |
|
|
5 | 5 | <data> |
|
|
6 | 6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> |
| @@ -129,13 +129,15 | |||
|
|
129 | 129 | // |
|
|
130 | 130 | #define TASK_PRIORITY_WTDG 20 |
|
|
131 | 131 | // |
|
|
132 |
#define TASK_PRIORITY_HOUS |
|
|
|
133 | #define TASK_PRIORITY_CWF1 40 | |
|
|
134 | #define TASK_PRIORITY_CWF2 40 | |
|
|
132 | #define TASK_PRIORITY_HOUS 30 | |
|
|
133 | // | |
|
|
134 | #define TASK_PRIORITY_CWF1 35 // CWF1 and CWF2 are never running together | |
|
|
135 | #define TASK_PRIORITY_CWF2 35 // | |
|
|
136 | // | |
|
|
135 | 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 4 |
|
|
|
140 | #define TASK_PRIORITY_SEND 45 | |
|
|
139 | 141 | // |
|
|
140 | 142 | #define TASK_PRIORITY_RECV 50 |
|
|
141 | 143 | #define TASK_PRIORITY_ACTN 50 |
| @@ -199,7 +199,7 rtems_task hous_task(rtems_task_argument | |||
|
|
199 | 199 | while(1){ // launch the rate monotonic task |
|
|
200 | 200 | status = rtems_rate_monotonic_period( HK_id, HK_PERIOD ); |
|
|
201 | 201 | if ( status != RTEMS_SUCCESSFUL ) { |
|
|
202 |
PRINTF1( " |
|
|
|
202 | PRINTF1( "in HOUS *** ERR period: %d\n", status); | |
|
|
203 | 203 | } |
|
|
204 | 204 | else { |
|
|
205 | 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 | 216 | status = rtems_message_queue_send( queue_id, &housekeeping_packet, |
|
|
217 | 217 | PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES); |
|
|
218 | 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 | 1158 | rtems_id queue_id; |
|
|
1159 | 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 | 1165 | if (status != RTEMS_SUCCESSFUL) |
|
|
1163 | 1166 | { |
|
|
1164 | 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