# HG changeset patch # User paul # Date 2014-06-19 06:17:11 # Node ID a703b578b7d4386f1814ad3b6e5ee3e487e7456f # Parent ebd45713607b5bbe9b6d08897cb498dad07b3939 Bug #175 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: Tue Jun 17 16:15:23 2014 +# Generated by qmake (2.01a) (Qt 4.8.6) on: Thu Jun 19 07:41:34 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=11 -DPRINT_MESSAGES_ON_CONSOLE +DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=12 -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 @@ -11,7 +11,7 @@ SWVERSION=-1-0 DEFINES += SW_VERSION_N1=1 # major DEFINES += SW_VERSION_N2=0 # minor DEFINES += SW_VERSION_N3=0 # patch -DEFINES += SW_VERSION_N4=11 # internal +DEFINES += SW_VERSION_N4=12 # internal contains( CONFIG, debug_tch ) { DEFINES += DEBUG_TCH 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 diff --git a/src/tc_handler.c b/src/tc_handler.c --- a/src/tc_handler.c +++ b/src/tc_handler.c @@ -780,7 +780,6 @@ void launch_spectral_matrix( void ) LEON_Clear_interrupt( IRQ_SPECTRAL_MATRIX ); LEON_Unmask_interrupt( IRQ_SPECTRAL_MATRIX ); set_run_matrix_spectral( 1 ); - } void launch_spectral_matrix_simu( void ) diff --git a/src/wf_handler.c b/src/wf_handler.c --- a/src/wf_handler.c +++ b/src/wf_handler.c @@ -288,14 +288,14 @@ rtems_task cwf3_task(rtems_task_argument { PRINTF("send CWF_LONG_F3\n") send_waveform_CWF( - (volatile int*) current_ring_node_f3->buffer_address, + (volatile int*) ring_node_to_send_cwf_f3->buffer_address, SID_NORM_CWF_LONG_F3, headerCWF_F3, queue_id ); } else { PRINTF("send CWF_F3 (light)\n") send_waveform_CWF3_light( - (volatile int*) current_ring_node_f3->buffer_address, + (volatile int*) ring_node_to_send_cwf_f3->buffer_address, headerCWF_F3_light, queue_id ); }