##// END OF EJS Templates
fsw-0-18...
paul -
r49:dc52a6b9ab4c 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 13:24:46 2013
3 # Generated by qmake (2.01a) (Qt 4.8.5) on: Fri Oct 25 15:35:04 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=17 -DPRINT_MESSAGES_ON_CONSOLE
13 DEFINES = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=18 -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-17
10 SWVERSION=-0-18
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=17
14 DEFINES += SW_VERSION_N4=18
15
15
16 contains( CONFIG, verbose ) {
16 contains( CONFIG, verbose ) {
17 DEFINES += PRINT_MESSAGES_ON_CONSOLE
17 DEFINES += PRINT_MESSAGES_ON_CONSOLE
@@ -129,9 +129,6
129 //
129 //
130 #define TASK_PRIORITY_WTDG 20
130 #define TASK_PRIORITY_WTDG 20
131 //
131 //
132 #define TASK_PRIORITY_RECV 30
133 #define TASK_PRIORITY_ACTN 30
134 //
135 #define TASK_PRIORITY_HOUS 40
132 #define TASK_PRIORITY_HOUS 40
136 #define TASK_PRIORITY_CWF1 40
133 #define TASK_PRIORITY_CWF1 40
137 #define TASK_PRIORITY_CWF2 40
134 #define TASK_PRIORITY_CWF2 40
@@ -140,6 +137,9
140 //
137 //
141 #define TASK_PRIORITY_SEND 40
138 #define TASK_PRIORITY_SEND 40
142 //
139 //
140 #define TASK_PRIORITY_RECV 50
141 #define TASK_PRIORITY_ACTN 50
142 //
143 #define TASK_PRIORITY_AVF0 60
143 #define TASK_PRIORITY_AVF0 60
144 #define TASK_PRIORITY_BPF0 60
144 #define TASK_PRIORITY_BPF0 60
145 #define TASK_PRIORITY_MATR 100
145 #define TASK_PRIORITY_MATR 100
General Comments 0
You need to be logged in to leave comments. Login now