# HG changeset patch
# User paul
# Date 2017-01-03 10:38:15
# Node ID 59a3f914ad040cfbc12b4bc1f7a32e3f0f6d53fa
# Parent  b4928c7e19203dc28d543b677e0e0ffd38eba65a

minor modifications before merging with pull request #53

diff --git a/FSW-qt/fsw-qt.pro b/FSW-qt/fsw-qt.pro
--- a/FSW-qt/fsw-qt.pro
+++ b/FSW-qt/fsw-qt.pro
@@ -1,4 +1,15 @@
 TEMPLATE = app
+CONFIG += console
+CONFIG -= app_bundle
+CONFIG -= qt
+
+include(sparc.pri)
+
+INCLUDEPATH += ./
+
+OBJECTS_DIR=obj
+DESTDIR=bin
+
 # CONFIG += console v8 sim
 # CONFIG options =
 #           verbose
@@ -11,9 +22,6 @@ TEMPLATE = app
 #           lpp_dpu_destid      /!\ REMOVE BEFORE DELIVERY TO LESIA /!\
 #           debug_watchdog
 CONFIG += console verbose lpp_dpu_destid cpu_usage_report
-CONFIG -= qt
-
-include(./sparc.pri)
 
 INCLUDEPATH += /opt/rtems-4.10/sparc-rtems/leon3/lib/include
 
@@ -122,4 +130,3 @@ HEADERS += \
     ../LFR_basic-parameters/basic_parameters.h \
     ../LFR_basic-parameters/basic_parameters_params.h \
     ../header/GscMemoryLPP.hpp
-
diff --git a/FSW-qt/sparc.pri b/FSW-qt/sparc.pri
--- a/FSW-qt/sparc.pri
+++ b/FSW-qt/sparc.pri
@@ -1,5 +1,3 @@
-CONFIG += console
-CONFIG -= qt
 QMAKE_CC=sparc-rtems-gcc
 message(C compiler forced to: $$QMAKE_CC)
 QMAKE_CXX=sparc-rtems-g++
@@ -13,14 +11,14 @@ QMAKE_OBJCOPY= sparc-rtems-objcopy
 QMAKE_STRIP=sparc-rtems-strip
 QMAKE_GDB=sparc-rtems-gdb
 
-#INCLUDEPATH += /opt/rtems-4.10
-INCLUDEPATH += /opt/rtems-4.10/sparc-rtems/leon3/lib/include
-
+QMAKE_CFLAGS_APP=""
+QMAKE_CXXFLAGS_APP=""
+QMAKE_CFLAGS=
 QMAKE_CFLAGS_DEBUG= -g
 QMAKE_CFLAGS_RELEASE=""
 QMAKE_CXXFLAGS_DEBUG= -g
 QMAKE_CXXFLAGS_RELEASE=""
-QMAKE_LFLAGS_RELEASE=""
+QMAKE_LFLAGS_RELEASE=
 QMAKE_LFLAGS_DEBUG= -g
 QMAKE_CXXFLAGS_DEPS	=
 QMAKE_CXXFLAGS_WARN_ON	= -Wall
@@ -39,7 +37,6 @@ QMAKE_CFLAGS_RELEASE	=
 QMAKE_CFLAGS_YACC	=
 QMAKE_LFLAGS_EXCEPTIONS_ON =
 QMAKE_LFLAGS_EXCEPTIONS_OFF =
-QMAKE_LFLAGS_RELEASE	= -Xlinker -Map=output.map
 QMAKE_LFLAGS_CONSOLE	=
 QMAKE_LFLAGS_WINDOWS	=
 QMAKE_LFLAGS_DLL        =
@@ -53,47 +50,19 @@ QMAKE_LIBS=""
 INCLUDEPATH=""
 DEFINES=""
 
-contains( TEMPLATE, app ) {
-    OBJECTS_DIR=obj
-    DESTDIR=bin
-}
-
-#QMAKE_CFLAGS_RELEASE    += -O0
-#QMAKE_CFLAGS_DEBUG      += -O0
-#QMAKE_CXXFLAGS_RELEASE  += -O0
-#QMAKE_CXXFLAGS_DEBUG    += -O0
 
 QMAKE_CFLAGS_RELEASE    += -O3
 QMAKE_CFLAGS_DEBUG      += -O3
 QMAKE_CXXFLAGS_RELEASE  += -O3
 QMAKE_CXXFLAGS_DEBUG    += -O3
 
-#QMAKE_CFLAGS_RELEASE    += -O3 -std=c99
-#QMAKE_CFLAGS_DEBUG      += -O3 -std=c99
-#QMAKE_CXXFLAGS_RELEASE  += -O3 -std=c99
-#QMAKE_CXXFLAGS_DEBUG    += -O3 -std=c99
-
-contains( TEMPLATE, app ) {
-    grmon.target = grmon
-    grmon.commands = cd $$DESTDIR && C:/opt/grmon-eval-2.0.29b/win32/bin/grmon.exe -uart COM4 -u
-    QMAKE_EXTRA_TARGETS += grmon
-}
-
-
-
+#QMAKE_CFLAGS_RELEASE    += -O0
+#QMAKE_CFLAGS_DEBUG      += -O0
+#QMAKE_CXXFLAGS_RELEASE  += -O0
+#QMAKE_CXXFLAGS_DEBUG    += -O0
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#QMAKE_CFLAGS_RELEASE+= -O3 -std=c99
+#QMAKE_CFLAGS_DEBUG+= -O3 -std=c99
+#QMAKE_CXXFLAGS_RELEASE+= -O3 -std=c99
+#QMAKE_CXXFLAGS_DEBUG+= -O3  -std=c99
diff --git a/src/fsw_init.c b/src/fsw_init.c
--- a/src/fsw_init.c
+++ b/src/fsw_init.c
@@ -143,10 +143,11 @@ rtems_task Init( rtems_task_argument ign
 
     PRINTF("*************************\n")
     PRINTF("** LFR Flight Software **\n")
-    PRINTF1("** %d.", SW_VERSION_N1)
-    PRINTF1("%d."   , SW_VERSION_N2)
-    PRINTF1("%d."   , SW_VERSION_N3)
-    PRINTF1("%d            **\n", SW_VERSION_N4)
+
+    PRINTF1("** %d-", SW_VERSION_N1)
+    PRINTF1("%d-"   , SW_VERSION_N2)
+    PRINTF1("%d-"   , SW_VERSION_N3)
+    PRINTF1("%d             **\n", SW_VERSION_N4)
 
     vhdlVersion = (unsigned char *) (REGS_ADDR_VHDL_VERSION);
     PRINTF("** VHDL                **\n")