# HG changeset patch # User paul # Date 2014-06-10 19:01:58 # Node ID ca43eeda2dd430a42a5770b271c5d7138a1da93d # Parent 5ea3df9587c6e84ecf858fbfe996e2a7fd3ebb56 rev 1.0.0.8 compatible with the VHDL design 0.1.16 and 1.1.16 spectral matrix simulated by a timer diff --git a/FSW-qt/Makefile b/FSW-qt/Makefile --- a/FSW-qt/Makefile +++ b/FSW-qt/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: bin/fsw -# Generated by qmake (2.01a) (Qt 4.8.6) on: Thu May 29 09:32:56 2014 +# Generated by qmake (2.01a) (Qt 4.8.6) on: Tue Jun 10 20:58:59 2014 # Project: fsw-qt.pro # Template: app # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro @@ -10,7 +10,7 @@ CC = sparc-rtems-gcc CXX = sparc-rtems-g++ -DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=8 -DPRINT_MESSAGES_ON_CONSOLE -DDEBUG_MESSAGES +DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=8 -DPRINT_MESSAGES_ON_CONSOLE CFLAGS = -pipe -O3 -Wall $(DEFINES) CXXFLAGS = -pipe -O3 -Wall $(DEFINES) INCPATH = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I../src -I../header -I../header/processing -I../src/LFR_basic-parameters 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,7 +1,7 @@ TEMPLATE = app # CONFIG += console v8 sim # CONFIG options = verbose *** boot_messages *** debug_messages *** cpu_usage_report *** stack_report *** vhdl_dev *** debug_tch -CONFIG += console verbose debug_messages +CONFIG += console verbose CONFIG -= qt include(./sparc.pri) diff --git a/FSW-qt/fsw-qt.pro.user b/FSW-qt/fsw-qt.pro.user --- a/FSW-qt/fsw-qt.pro.user +++ b/FSW-qt/fsw-qt.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -51,9 +51,9 @@ ProjectExplorer.Project.Target.0 - Desktop-Qt 4.8.2 in PATH (System) - Desktop-Qt 4.8.2 in PATH (System) - {5289e843-9ef2-45ce-88c6-ad27d8e08def} + Desktop-Qt 4.8.3 in PATH (System) + Desktop-Qt 4.8.3 in PATH (System) + {be73cf6a-f9d8-4d5a-8adf-adc2d83e2e44} 0 0 0 @@ -192,7 +192,7 @@ ProjectExplorer.Project.Updater.EnvironmentId - {2e58a81f-9962-4bba-ae6b-760177f0656c} + {cdbf9cdc-1e84-406e-889b-c4feef49e75c} ProjectExplorer.Project.Updater.FileVersion diff --git a/src/tc_handler.c b/src/tc_handler.c --- a/src/tc_handler.c +++ b/src/tc_handler.c @@ -532,8 +532,8 @@ int enter_mode( unsigned char mode, unsi #endif status = restart_science_tasks( mode ); launch_waveform_picker( mode, transitionCoarseTime ); - launch_spectral_matrix( ); -// launch_spectral_matrix_simu( ); +// launch_spectral_matrix( ); + launch_spectral_matrix_simu( ); } else if ( mode == LFR_MODE_STANDBY ) {