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 10 20:58:59 2014 +# Generated by qmake (2.01a) (Qt 4.8.6) on: Thu Jun 12 08:10:29 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 +DEFINES = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=9 -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/header/fsw_params.h b/header/fsw_params.h --- a/header/fsw_params.h +++ b/header/fsw_params.h @@ -119,6 +119,7 @@ typedef struct ring_node #define REGS_ADDR_SPECTRAL_MATRIX 0x80000f00 #define REGS_ADDR_WAVEFORM_PICKER 0x80000f50 +#define REGS_ADDR_VHDL_VERSION 0x80000ff0 #define APBUART_CTRL_REG_MASK_DB 0xfffff7ff #define APBUART_CTRL_REG_MASK_TE 0x00000002 diff --git a/src/fsw_init.c b/src/fsw_init.c --- a/src/fsw_init.c +++ b/src/fsw_init.c @@ -71,6 +71,8 @@ rtems_task Init( rtems_task_argument ign * */ + unsigned char *vhdlVersion; + reset_local_time(); rtems_cpu_usage_reset(); @@ -92,6 +94,12 @@ rtems_task Init( rtems_task_argument ign 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") + PRINTF1("** %d.", vhdlVersion[1]) + PRINTF1("%d." , vhdlVersion[2]) + PRINTF1("%d **\n", vhdlVersion[3]) PRINTF("*************************\n") PRINTF("\n\n") diff --git a/src/fsw_misc.c b/src/fsw_misc.c --- a/src/fsw_misc.c +++ b/src/fsw_misc.c @@ -318,7 +318,7 @@ void init_housekeeping_parameters( void housekeeping_packet.lfr_sw_version[2] = SW_VERSION_N3; housekeeping_packet.lfr_sw_version[3] = SW_VERSION_N4; // init fpga version - parameters = (unsigned char *) (REGS_ADDR_WAVEFORM_PICKER + 0xb0); + parameters = (unsigned char *) (REGS_ADDR_VHDL_VERSION); housekeeping_packet.lfr_fpga_version[0] = parameters[1]; // n1 housekeeping_packet.lfr_fpga_version[1] = parameters[2]; // n2 housekeeping_packet.lfr_fpga_version[2] = parameters[3]; // n3