##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SOLO_LFR » DEV_PLE
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/DEV_PLE

minor modifications before merging with pull request 53
paul -
r306:59a3f914ad04 R3_plus draft
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,4 +1,15
1 TEMPLATE = app
1 TEMPLATE = app
2 CONFIG += console
3 CONFIG -= app_bundle
4 CONFIG -= qt
5
6 include(sparc.pri)
7
8 INCLUDEPATH += ./
9
10 OBJECTS_DIR=obj
11 DESTDIR=bin
12
2 # CONFIG += console v8 sim
13 # CONFIG += console v8 sim
3 # CONFIG options =
14 # CONFIG options =
4 # verbose
15 # verbose
@@ -11,9 +22,6 TEMPLATE = app
11 # lpp_dpu_destid /!\ REMOVE BEFORE DELIVERY TO LESIA /!\
22 # lpp_dpu_destid /!\ REMOVE BEFORE DELIVERY TO LESIA /!\
12 # debug_watchdog
23 # debug_watchdog
13 CONFIG += console verbose lpp_dpu_destid cpu_usage_report
24 CONFIG += console verbose lpp_dpu_destid cpu_usage_report
14 CONFIG -= qt
15
16 include(./sparc.pri)
17
25
18 INCLUDEPATH += /opt/rtems-4.10/sparc-rtems/leon3/lib/include
26 INCLUDEPATH += /opt/rtems-4.10/sparc-rtems/leon3/lib/include
19
27
@@ -122,4 +130,3 HEADERS += \
122 ../LFR_basic-parameters/basic_parameters.h \
130 ../LFR_basic-parameters/basic_parameters.h \
123 ../LFR_basic-parameters/basic_parameters_params.h \
131 ../LFR_basic-parameters/basic_parameters_params.h \
124 ../header/GscMemoryLPP.hpp
132 ../header/GscMemoryLPP.hpp
125
Show file before | Show file after | Hide comments
@@ -1,5 +1,3
1 CONFIG += console
2 CONFIG -= qt
3 QMAKE_CC=sparc-rtems-gcc
1 QMAKE_CC=sparc-rtems-gcc
4 message(C compiler forced to: $$QMAKE_CC)
2 message(C compiler forced to: $$QMAKE_CC)
5 QMAKE_CXX=sparc-rtems-g++
3 QMAKE_CXX=sparc-rtems-g++
@@ -13,14 +11,14 QMAKE_OBJCOPY= sparc-rtems-objcopy
13 QMAKE_STRIP=sparc-rtems-strip
11 QMAKE_STRIP=sparc-rtems-strip
14 QMAKE_GDB=sparc-rtems-gdb
12 QMAKE_GDB=sparc-rtems-gdb
15
13
16 #INCLUDEPATH += /opt/rtems-4.10
14 QMAKE_CFLAGS_APP=""
17 INCLUDEPATH += /opt/rtems-4.10/sparc-rtems/leon3/lib/include
15 QMAKE_CXXFLAGS_APP=""
18
16 QMAKE_CFLAGS=
19 QMAKE_CFLAGS_DEBUG= -g
17 QMAKE_CFLAGS_DEBUG= -g
20 QMAKE_CFLAGS_RELEASE=""
18 QMAKE_CFLAGS_RELEASE=""
21 QMAKE_CXXFLAGS_DEBUG= -g
19 QMAKE_CXXFLAGS_DEBUG= -g
22 QMAKE_CXXFLAGS_RELEASE=""
20 QMAKE_CXXFLAGS_RELEASE=""
23 QMAKE_LFLAGS_RELEASE=""
21 QMAKE_LFLAGS_RELEASE=
24 QMAKE_LFLAGS_DEBUG= -g
22 QMAKE_LFLAGS_DEBUG= -g
25 QMAKE_CXXFLAGS_DEPS =
23 QMAKE_CXXFLAGS_DEPS =
26 QMAKE_CXXFLAGS_WARN_ON = -Wall
24 QMAKE_CXXFLAGS_WARN_ON = -Wall
@@ -39,7 +37,6 QMAKE_CFLAGS_RELEASE =
39 QMAKE_CFLAGS_YACC =
37 QMAKE_CFLAGS_YACC =
40 QMAKE_LFLAGS_EXCEPTIONS_ON =
38 QMAKE_LFLAGS_EXCEPTIONS_ON =
41 QMAKE_LFLAGS_EXCEPTIONS_OFF =
39 QMAKE_LFLAGS_EXCEPTIONS_OFF =
42 QMAKE_LFLAGS_RELEASE = -Xlinker -Map=output.map
43 QMAKE_LFLAGS_CONSOLE =
40 QMAKE_LFLAGS_CONSOLE =
44 QMAKE_LFLAGS_WINDOWS =
41 QMAKE_LFLAGS_WINDOWS =
45 QMAKE_LFLAGS_DLL =
42 QMAKE_LFLAGS_DLL =
@@ -53,47 +50,19 QMAKE_LIBS=""
53 INCLUDEPATH=""
50 INCLUDEPATH=""
54 DEFINES=""
51 DEFINES=""
55
52
56 contains( TEMPLATE, app ) {
57 OBJECTS_DIR=obj
58 DESTDIR=bin
59 }
60
61 #QMAKE_CFLAGS_RELEASE += -O0
62 #QMAKE_CFLAGS_DEBUG += -O0
63 #QMAKE_CXXFLAGS_RELEASE += -O0
64 #QMAKE_CXXFLAGS_DEBUG += -O0
65
53
66 QMAKE_CFLAGS_RELEASE += -O3
54 QMAKE_CFLAGS_RELEASE += -O3
67 QMAKE_CFLAGS_DEBUG += -O3
55 QMAKE_CFLAGS_DEBUG += -O3
68 QMAKE_CXXFLAGS_RELEASE += -O3
56 QMAKE_CXXFLAGS_RELEASE += -O3
69 QMAKE_CXXFLAGS_DEBUG += -O3
57 QMAKE_CXXFLAGS_DEBUG += -O3
70
58
71 #QMAKE_CFLAGS_RELEASE += -O3 -std=c99
59 #QMAKE_CFLAGS_RELEASE += -O0
72 #QMAKE_CFLAGS_DEBUG += -O3 -std=c99
60 #QMAKE_CFLAGS_DEBUG += -O0
73 #QMAKE_CXXFLAGS_RELEASE += -O3 -std=c99
61 #QMAKE_CXXFLAGS_RELEASE += -O0
74 #QMAKE_CXXFLAGS_DEBUG += -O3 -std=c99
62 #QMAKE_CXXFLAGS_DEBUG += -O0
75
76 contains( TEMPLATE, app ) {
77 grmon.target = grmon
78 grmon.commands = cd $$DESTDIR && C:/opt/grmon-eval-2.0.29b/win32/bin/grmon.exe -uart COM4 -u
79 QMAKE_EXTRA_TARGETS += grmon
80 }
81
82
83
84
63
85
64
86
65 #QMAKE_CFLAGS_RELEASE+= -O3 -std=c99
87
66 #QMAKE_CFLAGS_DEBUG+= -O3 -std=c99
88
67 #QMAKE_CXXFLAGS_RELEASE+= -O3 -std=c99
89
68 #QMAKE_CXXFLAGS_DEBUG+= -O3 -std=c99
90
91
92
93
94
95
96
97
98
99
Show file before | Show file after | Hide comments
@@ -143,10 +143,11 rtems_task Init( rtems_task_argument ign
143
143
144 PRINTF("*************************\n")
144 PRINTF("*************************\n")
145 PRINTF("** LFR Flight Software **\n")
145 PRINTF("** LFR Flight Software **\n")
146 PRINTF1("** %d.", SW_VERSION_N1)
146
147 PRINTF1("%d." , SW_VERSION_N2)
147 PRINTF1("** %d-", SW_VERSION_N1)
148 PRINTF1("%d." , SW_VERSION_N3)
148 PRINTF1("%d-" , SW_VERSION_N2)
149 PRINTF1("%d **\n", SW_VERSION_N4)
149 PRINTF1("%d-" , SW_VERSION_N3)
150 PRINTF1("%d **\n", SW_VERSION_N4)
150
151
151 vhdlVersion = (unsigned char *) (REGS_ADDR_VHDL_VERSION);
152 vhdlVersion = (unsigned char *) (REGS_ADDR_VHDL_VERSION);
152 PRINTF("** VHDL **\n")
153 PRINTF("** VHDL **\n")
General Comments 0
You need to be logged in to leave comments. Login now