HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r21:a92d7ea3b165

Current version with modes NORMAL and SBM1 operational

paul@pc-solar1.lab-lpp.local -

r21:a92d7ea3b165 default

parent child

Context file:

r21:a92d7ea3b165

Collapse all files

FSW-qt/Makefile +10 -10

             #############################################################################
-            # Makefile for building: bin/fsw
+            # Makefile for building: bin/fsw$(SW_VERSION)
-            # Generated by qmake (2.01a) (Qt 4.8.4) on: Thu May 23 15:08:17 2013
+            # Generated by qmake (2.01a) (Qt 4.8.4) on: Fri Jun 14 07:50:58 2013
             # Project:  fsw-qt.pro
             # Template: app
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
             CC            = sparc-rtems-gcc
             CXX           = sparc-rtems-g++
-            DEFINES       = -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=4 -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
             		/usr/lib64/qt4/mkspecs/common/g++-base.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-unix.conf \
             		/usr/lib64/qt4/mkspecs/qconfig.pri \
-            		/usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri \
+            		/usr/lib64/qt4/mkspecs/modules/qt_webkit.pri \
             		/usr/lib64/qt4/mkspecs/features/qt_functions.prf \
             		/usr/lib64/qt4/mkspecs/features/qt_config.prf \
             		/usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \
             		/usr/lib64/qt4/mkspecs/features/lex.prf \
             		/usr/lib64/qt4/mkspecs/features/include_source_dir.prf \
             		fsw-qt.pro
-            QMAKE_TARGET  = fsw
+            QMAKE_TARGET  = fsw$(SW_VERSION)
             DESTDIR       = bin/
-            TARGET        = bin/fsw
+            TARGET        = bin/fsw$(SW_VERSION)
             first: all
             ####### Implicit rules
             		/usr/lib64/qt4/mkspecs/common/g++-base.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-unix.conf \
             		/usr/lib64/qt4/mkspecs/qconfig.pri \
-            		/usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri \
+            		/usr/lib64/qt4/mkspecs/modules/qt_webkit.pri \
             		/usr/lib64/qt4/mkspecs/features/qt_functions.prf \
             		/usr/lib64/qt4/mkspecs/features/qt_config.prf \
             		/usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \
             /usr/lib64/qt4/mkspecs/common/g++-base.conf:
             /usr/lib64/qt4/mkspecs/common/g++-unix.conf:
             /usr/lib64/qt4/mkspecs/qconfig.pri:
-            /usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri:
+            /usr/lib64/qt4/mkspecs/modules/qt_webkit.pri:
             /usr/lib64/qt4/mkspecs/features/qt_functions.prf:
             /usr/lib64/qt4/mkspecs/features/qt_config.prf:
             /usr/lib64/qt4/mkspecs/features/exclusive_builds.prf:
             	@$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro
             dist:
-            	@$(CHK_DIR_EXISTS) obj/fsw1.0.0 || $(MKDIR) obj/fsw1.0.0
+            	@$(CHK_DIR_EXISTS) obj/fsw$(SW_VERSION)1.0.0 || $(MKDIR) obj/fsw$(SW_VERSION)1.0.0
-            	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/fsw1.0.0/ && (cd `dirname obj/fsw1.0.0` && $(TAR) fsw1.0.0.tar fsw1.0.0 && $(COMPRESS) fsw1.0.0.tar) && $(MOVE) `dirname obj/fsw1.0.0`/fsw1.0.0.tar.gz . && $(DEL_FILE) -r obj/fsw1.0.0
+            	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/fsw$(SW_VERSION)1.0.0/ && (cd `dirname obj/fsw$(SW_VERSION)1.0.0` && $(TAR) fsw$(SW_VERSION)1.0.0.tar fsw$(SW_VERSION)1.0.0 && $(COMPRESS) fsw$(SW_VERSION)1.0.0.tar) && $(MOVE) `dirname obj/fsw$(SW_VERSION)1.0.0`/fsw$(SW_VERSION)1.0.0.tar.gz . && $(DEL_FILE) -r obj/fsw$(SW_VERSION)1.0.0
             clean:compiler_clean

FSW-qt/bin/fsw binary modified 0 0

NO CONTENT: modified file, binary diff hidden

FSW-qt/fsw-qt.pro +9 -2

             include(./sparc.pri)
+            # flight software version
+            SW_VERSION=-0-5
+            DEFINES += SW_VERSION_N1=0
+            DEFINES += SW_VERSION_N2=0
+            DEFINES += SW_VERSION_N3=0
+            DEFINES += SW_VERSION_N4=5
             contains( CONFIG, verbose ) {
                 DEFINES += PRINT_MESSAGES_ON_CONSOLE
             }
                 DEFINES += PRINT_TASK_STATISTICS
             }
-            TARGET = fsw
+            TARGET = fsw$(SW_VERSION)
             contains( CONFIG, gsa ) {
                 DEFINES += GSA
-                TARGET = fsw-gsa
+                TARGET = fsw-gsa$(SW_VERSION)
             }
             INCLUDEPATH += \

FSW-qt/fsw-qt.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by Qt Creator 2.4.1, 2013-06-04T15:59:14. -->
+            <!-- Written by Qt Creator 2.4.1, 2013-06-17T15:56:28. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/ccsds_types.h +18 -17

             #define SIZE_TM_LFR_TC_EXE_NOT_IMPLEMENTED 24
             #define SIZE_TM_LFR_TC_EXE_CORRUPTED 32
+            #define SIZE_HK_PARAMETERS 112
             #define ILLEGAL_APID 0
             #define WRONG_LEN_PACKET 1
             // TM TYPES
             #define TM_TYPE_LFR_SCIENCE 21
+            #define TM_TYPE_HK 3
             // TM SUBTYPES
             #define TM_SUBTYPE_EXE_OK 7
             #define TM_SUBTYPE_SCIENCE 3
             #define TM_SUBTYPE_LFR_SCIENCE 3
+            // TM SID
             #define SID_DEFAULT 0
             #define SID_HK 1
             #define SID_EXE_INC 5
             };
             typedef struct TMHeader_str TMHeader_t;
-            struct Packet_TM_LFR_HK_str
-                volatile unsigned char targetLogicalAddress;
-                volatile unsigned char protocolIdentifier;
-                volatile unsigned char reserved;
-                volatile unsigned char userApplication;
-                volatile unsigned char packetID[2];
-                volatile unsigned char packetSequenceControl[2];
-                volatile unsigned char packetLength[2];
-                volatile unsigned char dataFieldHeader[10];
-                volatile unsigned char data[LENGTH_TM_LFR_HK - 10 + 1];
-            };
-            typedef struct Packet_TM_LFR_HK_str Packet_TM_LFR_HK_t;
             struct Packet_TM_LFR_TC_EXE_str
             {
                 volatile unsigned char targetLogicalAddress;
             };
             typedef struct ccsdsTelecommandPacket_str ccsdsTelecommandPacket_t;
-            struct hk_packet_str{
+            struct Packet_TM_LFR_HK_str
+            {
+                volatile unsigned char targetLogicalAddress;
+                volatile unsigned char protocolIdentifier;
+                volatile unsigned char reserved;
+                volatile unsigned char userApplication;
+                volatile unsigned char packetID[2];
+                volatile unsigned char packetSequenceControl[2];
+                volatile unsigned char packetLength[2];
+                volatile unsigned char dataFieldHeader[10];
+                volatile unsigned char sid;
+                //**************
+                // HK PARAMETERS
                 unsigned char lfr_status_word[2];
                 unsigned char lfr_sw_version[4];
                 // tc statistics
                 unsigned char hk_lfr_cpu_data_exception;
                 unsigned char hk_lfr_cpu_div_exception;
                 unsigned char hk_lfr_cpu_arith_overflow;
             };
-            typedef struct hk_packet_str hk_packet_t;
+            typedef struct Packet_TM_LFR_HK_str Packet_TM_LFR_HK_t;
             #endif // CCSDS_H_INCLUDED

header/fsw_init.h +47 -43

@@ -1,60 +1,64
1	#ifndef FSW_RTEMS_H_INCLUDED	1	#ifndef FSW_RTEMS_H_INCLUDED
2	#define FSW_RTEMS_H_INCLUDED	2	#define FSW_RTEMS_H_INCLUDED
3		3
4	#include <errno.h>	4	#include <errno.h>
5	#include <fcntl.h>	5	#include <fcntl.h>
6	#include <stdio.h>	6	#include <stdio.h>
7	#include <stdlib.h>	7	#include <stdlib.h>
8		8
9	#include <grspw.h>	9	#include <grspw.h>
10	#include <apbuart.h>	10	#include <apbuart.h>
11		11
12	#include <fsw_params.h>	12	#include <fsw_params.h>
13	#include <fsw_misc.h>	13	#include <fsw_misc.h>
14	#include <fsw_processing.h>	14	#include <fsw_processing.h>
15	#include <tc_handler.h>	15	#include <tc_handler.h>
16	#include <wf_handler.h>	16	#include <wf_handler.h>
17	#include <grlib_regs.h>	17	#include <grlib_regs.h>
18		18	#include <ccsds_types.h>
		19
19	extern int sched_yield( void );	20	extern int sched_yield( void );
20	extern int errno;	21	extern int errno;
21	extern rtems_id Task_id[ ]; /* array of task ids */	22	extern rtems_id Task_id[ ]; /* array of task ids */
22	extern rtems_name Task_name[ ]; /* array of task names */	23	extern rtems_name Task_name[ ]; /* array of task names */
23	extern rtems_name misc_name[ ]; /* arry of miscellaneous names for rtems objects */	24	extern rtems_name misc_name[ ]; /* arry of miscellaneous names for rtems objects */
24	extern int fdSPW; // grspw file descriptor	25	extern int fdSPW; // grspw file descriptor
25	extern int fdUART; // uart file descriptor	26	extern int fdUART; // uart file descriptor
26		27
27	void timecode_irq_handler(void pDev, void regs, int minor, unsigned int tc);	28	void timecode_irq_handler(void pDev, void regs, int minor, unsigned int tc);
28		29
29	// MODE PARAMETERS	30	// MODE PARAMETERS
30	extern struct param_~~norm~~_str param_~~norm~~;	31	extern struct param_common_str param_common;
31	extern struct param_~~burst~~_str param_~~burst~~;	32	extern struct param_norm_str param_norm;
32	extern struct param_~~sbm1~~_str param_~~sbm1~~;	33	extern struct param_burst_str param_burst;
33	extern struct param_sbm2_str param_sbm2;	34	extern struct param_sbm1_str param_sbm1;
34	extern unsigned char param_common[];	35	extern struct param_sbm2_str param_sbm2;
35		36	extern Packet_TM_LFR_HK_t housekeeping_packet;
		37	extern unsigned short sequenceCounters[SEQ_CNT_NB_PID][SEQ_CNT_NB_CAT][SEQ_CNT_NB_DEST_ID];
		38
36	// RTEMS TASKS	39	// RTEMS TASKS
37	rtems_task Init( rtems_task_argument argument); /* forward declaration needed */	40	rtems_task Init( rtems_task_argument argument); /* forward declaration needed */
38	rtems_task recv_task(rtems_task_argument argument);	41	rtems_task recv_task(rtems_task_argument argument);
39	rtems_task spiq_task(rtems_task_argument argument);	42	rtems_task spiq_task(rtems_task_argument argument);
40	rtems_task stat_task(rtems_task_argument argument);	43	rtems_task stat_task(rtems_task_argument argument);
41	rtems_task wfrm_task(rtems_task_argument argument);	44	rtems_task wfrm_task(rtems_task_argument argument);
42	int create_names( void );	45	int create_names( void );
43	int create_all_tasks( void );	46	int create_all_tasks( void );
44	int start_all_tasks( void );	47	int start_all_tasks( void );
45	int create_message_queue( void );	48	int create_message_queue( void );
46		49
47	// OTHER functions	50	// OTHER functions
48	void init_default_mode_parameters( void );	51	void init_default_mode_parameters( void );
49		52	void init_housekeeping_parameters( void );
50	int configure_spw_link( void );	53
51	void configure_spacewire_set_NP(unsigned char val, unsigned int regAddr); // No Port force	54	int configure_spw_link( void );
52	void configure_spacewire_set_RE(unsigned char val, unsigned int regAddr); // ~~RMAP Enabl~~e	55	void configure_spacewire_set_NP(unsigned char val, unsigned int regAddr); // No Port force
		56	void configure_spacewire_set_RE(unsigned char val, unsigned int regAddr); // RMAP Enable
53		57
54	extern int rtems_cpu_usage_report( void );	58	extern int rtems_cpu_usage_report( void );
55	extern int rtems_cpu_usage_reset( void );	59	extern int rtems_cpu_usage_reset( void );
56		60
57	rtems_status_code write_spw(spw_ioctl_pkt_send* spw_ioctl_send);	61	rtems_status_code write_spw(spw_ioctl_pkt_send* spw_ioctl_send);
58	void (grspw_timecode_callback) (void pDev, void *regs, int minor, unsigned int tc);	62	void (grspw_timecode_callback) (void pDev, void *regs, int minor, unsigned int tc);
59		63
60	#endif // FSW_RTEMS_CONFIG_H_INCLUDED	64	#endif // FSW_RTEMS_CONFIG_H_INCLUDED

header/fsw_params.h +46 0

@@ -4,6 +4,10
4	#define GRSPW_DEVICE_NAME "/dev/grspw0"	4	#define GRSPW_DEVICE_NAME "/dev/grspw0"
5	#define UART_DEVICE_NAME "/dev/console"	5	#define UART_DEVICE_NAME "/dev/console"
6		6
		7	//************************
		8	// flight software version
		9	// this parameters is handled by the Qt project options
		10
7	//**********	11	//**********
8	// LFR MODES	12	// LFR MODES
9	#define LFR_MODE_STANDBY 0	13	#define LFR_MODE_STANDBY 0
@@ -12,6 +16,12
12	#define LFR_MODE_SBM1 3	16	#define LFR_MODE_SBM1 3
13	#define LFR_MODE_SBM2 4	17	#define LFR_MODE_SBM2 4
14		18
		19	#define RTEMS_EVENT_MODE_STANDBY RTEMS_EVENT_0
		20	#define RTEMS_EVENT_MODE_NORMAL RTEMS_EVENT_1
		21	#define RTEMS_EVENT_MODE_BURST RTEMS_EVENT_2
		22	#define RTEMS_EVENT_MODE_SBM1 RTEMS_EVENT_3
		23	#define RTEMS_EVENT_MODE_SBM2 RTEMS_EVENT_4
		24
15	//*****************************	25	//*****************************
16	// APB REGISTERS BASE ADDRESSES	26	// APB REGISTERS BASE ADDRESSES
17	#define REGS_ADDR_APBUART 0x80000100	27	#define REGS_ADDR_APBUART 0x80000100
@@ -45,6 +55,11
45	#define TIMER_WF_SIMULATOR 2	55	#define TIMER_WF_SIMULATOR 2
46	#define HK_PERIOD 100 // 100 * 10ms => 1sec	56	#define HK_PERIOD 100 // 100 * 10ms => 1sec
47		57
		58	//**********
		59	// LPP CODES
		60	#define LFR_SUCCESSFUL 0
		61	#define LFR_DEFAULT 1
		62
48	//******	63	//******
49	// RTEMS	64	// RTEMS
50	#define TASKID_RECV 1	65	#define TASKID_RECV 1
@@ -78,6 +93,37
78	#define NB_BYTES_SWF_BLK 2 * 6	93	#define NB_BYTES_SWF_BLK 2 * 6
79	#define NB_WORDS_SWF_BLK 3	94	#define NB_WORDS_SWF_BLK 3
80		95
		96	//******************
		97	// SEQUENCE COUNTERS
		98	#define SEQ_CNT_NB_PID 2
		99	#define SEQ_CNT_NB_CAT 4
		100	#define SEQ_CNT_NB_DEST_ID 11
		101	// pid
		102	#define SEQ_CNT_PID_76 0
		103	#define SEQ_CNT_PID_79 1
		104	//cat
		105	#define SEQ_CNT_CAT_1 0
		106	#define SEQ_CNT_CAT_4 1
		107	#define SEQ_CNT_CAT_9 2
		108	#define SEQ_CNT_CAT_12 3
		109	// destination id
		110	#define SEQ_CNT_DST_ID_GROUND 0
		111	#define SEQ_CNT_DST_ID_MISSION_TIMELINE 1
		112	#define SEQ_CNT_DST_ID_TC_SEQUENCES 2
		113	#define SEQ_CNT_DST_ID_RECOVERY_ACTION_CMD 3
		114	#define SEQ_CNT_DST_ID_BACKUP_MISSION_TIMELINE 4
		115	#define SEQ_CNT_DST_ID_DIRECT_CMD 5
		116	#define SEQ_CNT_DST_ID_SPARE_GRD_SRC1 6
		117	#define SEQ_CNT_DST_ID_SPARE_GRD_SRC2 7
		118	#define SEQ_CNT_DST_ID_OBCP 8
		119	#define SEQ_CNT_DST_ID_SYSTEM_CONTROL 9
		120	#define SEQ_CNT_DST_ID_AOCS 10
		121
		122	struct param_common_str{
		123	unsigned char sy_lfr_common0;
		124	unsigned char sy_lfr_common1;
		125	};
		126
81	struct param_norm_str{	127	struct param_norm_str{
82	unsigned int sy_lfr_n_swf_l; // length of the snapshots	128	unsigned int sy_lfr_n_swf_l; // length of the snapshots
83	unsigned int sy_lfr_n_swf_p; // time between two snapshots	129	unsigned int sy_lfr_n_swf_p; // time between two snapshots

header/tc_handler.h +7 -1

             extern rtems_name misc_id[ ];
             extern rtems_id Task_id[ ];         // array of task ids
             // MODE PARAMETERS
+            extern struct param_common_str param_common;
             extern struct param_norm_str param_norm;
             extern struct param_sbm1_str param_sbm1;
             extern struct param_sbm2_str param_sbm2;
+            extern Packet_TM_LFR_HK_t housekeeping_packet;
             extern time_management_regs_t *time_management_regs;
             extern waveform_picker_regs_t *waveform_picker_regs;
             extern gptimer_regs_t         *gptimer_regs;
-            extern unsigned char param_common[];
             //****
             // ISR
             int stop_current_mode();
             int enter_normal_mode();
             int enter_sbm1_mode();
+            int action_load_comm(ccsdsTelecommandPacket_t *TC);
             int action_load_norm(ccsdsTelecommandPacket_t *TC);
             int action_enter(ccsdsTelecommandPacket_t *TC);
             int action_updt_time(ccsdsTelecommandPacket_t *TC);
             //
+            void update_last_TC_exe(ccsdsTelecommandPacket_t *TC);
+            void update_last_TC_rej(ccsdsTelecommandPacket_t *TC);
+            void close_action(ccsdsTelecommandPacket_t *TC, int result);
+            //
             rtems_status_code restart_if_needed(rtems_id id);
             rtems_status_code suspend_if_needed(rtems_id id);

header/wf_handler.h +2 0

             extern waveform_picker_regs_t *waveform_picker_regs;
             rtems_isr waveforms_isr( rtems_vector_number vector );
+            rtems_isr waveforms_isr_alternative( rtems_vector_number vector );
             rtems_isr waveforms_simulator_isr( rtems_vector_number vector );
             rtems_task wfrm_task(rtems_task_argument argument);
             void reset_waveforms( void );
             void send_waveform( ExtendedTMHeader_t *header, volatile int *waveform, unsigned int sid, spw_ioctl_pkt_send *spw_ioctl_send);
             void init_waveform_picker_regs();
+            void set_data_shaping_parameters(unsigned char parameters);
             int build_value(int value1, int value0);
             #endif // WF_HANDLER_H_INCLUDED

src/fsw_globals.c +2 -2

             float compressed_spec_mat_f0[ TOTAL_SIZE_COMPRESSED_MATRIX_f0 ];
             // MODE PARAMETERS
+            struct param_common_str param_common;
             struct param_norm_str param_norm;
             struct param_burst_str param_burst;
             struct param_sbm1_str param_sbm1;
             struct param_sbm2_str param_sbm2;
-            unsigned char param_common[2];
             // HK PACKETS
             Packet_TM_LFR_HK_t housekeeping_packet;
-            hk_packet_t housekeeping_parameters;
+            unsigned short sequenceCounters[SEQ_CNT_NB_PID][SEQ_CNT_NB_CAT][SEQ_CNT_NB_DEST_ID];
             // BASIC PARAMETERS GLOBAL VARIABLES
             unsigned char LFR_BP1_F0[ NB_BINS_COMPRESSED_MATRIX_f0 * 9 ];

src/fsw_init.c +37 -3

@@ -68,6 +68,7 rtems_task Init( rtems_task_argument ign
68		68
69	initLookUpTableForCRC(); // in tc_handler.h	69	initLookUpTableForCRC(); // in tc_handler.h
70	init_default_mode_parameters();	70	init_default_mode_parameters();
		71	init_housekeeping_parameters();
71	create_message_queue();	72	create_message_queue();
72		73
73	create_names();	74	create_names();
@@ -160,11 +161,11 rtems_task spiq_task(rtems_task_argument
160	}	161	}
161	}	162	}
162		163
163	void init_default_mode_parameters()	164	void init_default_mode_parameters(void)
164	{	165	{
165	// COMMON PARAMETERS	166	// COMMON PARAMETERS
166	param_common[0] = 0x00;	167	param_common.sy_lfr_common0 = 0x00;
167	param_common[1] = 0x10; // default value 0 0 0 1 0 0 0 0	168	param_common.sy_lfr_common1 = 0x10; // default value 0 0 0 1 0 0 0 0
168	// NORMAL MODE	169	// NORMAL MODE
169	param_norm.sy_lfr_n_swf_l = 2048; // nb sample	170	param_norm.sy_lfr_n_swf_l = 2048; // nb sample
170	param_norm.sy_lfr_n_swf_p = 300; // sec	171	param_norm.sy_lfr_n_swf_p = 300; // sec
@@ -182,6 +183,39 void init_default_mode_parameters()
182	param_sbm2.sy_lfr_s2_bp_p0 = 5; // sec	183	param_sbm2.sy_lfr_s2_bp_p0 = 5; // sec
183	}	184	}
184		185
		186	void init_housekeeping_parameters(void)
		187	{
		188	unsigned int i = 0;
		189	unsigned int j = 0;
		190	unsigned int k = 0;
		191	char *parameters;
		192
		193	parameters = (char*) &housekeeping_packet.lfr_status_word;
		194	for(i = 0; i< SIZE_HK_PARAMETERS; i++)
		195	{
		196	parameters[i] = 0x00;
		197	}
		198	// init status word
		199	housekeeping_packet.lfr_status_word[0] = 0x00;
		200	housekeeping_packet.lfr_status_word[1] = 0x00;
		201	// init software version
		202	housekeeping_packet.lfr_sw_version[0] = SW_VERSION_N1;
		203	housekeeping_packet.lfr_sw_version[1] = SW_VERSION_N2;
		204	housekeeping_packet.lfr_sw_version[2] = SW_VERSION_N3;
		205	housekeeping_packet.lfr_sw_version[3] = SW_VERSION_N4;
		206	// init sequence counters
		207	for (i = 0; i<SEQ_CNT_NB_PID; i++)
		208	{
		209	for(j = 0; j<SEQ_CNT_NB_CAT; j++)
		210	{
		211	for(k = 0; k<SEQ_CNT_NB_DEST_ID; k++)
		212	{
		213	sequenceCounters[i][j][k] = 0x00;
		214	}
		215	}
		216	}
		217	}
		218
185	int create_names( void )	219	int create_names( void )
186	{	220	{
187	// task names	221	// task names

src/fsw_misc.c +63 -63

             int configure_timer(gptimer_regs_t *gptimer_regs, unsigned char timer, unsigned int clock_divider,
                                 unsigned char interrupt_level, rtems_isr (*timer_isr)() )
             { // configure the timer for the waveforms simulation
                 rtems_status_code status;
                 rtems_isr_entry old_isr_handler;
                 status = rtems_interrupt_catch( timer_isr, interrupt_level, &old_isr_handler) ; // see sparcv8.pdf p.76 for interrupt levels
                 //if (status==RTEMS_SUCCESSFUL) PRINTF("In configure_timer_for_wf_simulation *** rtems_interrupt_catch successfullly configured\n")
                 gptimer_regs->timer[timer].reload = clock_divider; // base clock frequency is 1 MHz
                 return 1;
             }
             void print_statistics(spw_stats *stats)
+            {
                     //printf(" ******** STATISTICS ********  \n");
                     printf("Transmit link errors: %i\n", stats->tx_link_err);
                     printf("Receiver RMAP header CRC errors: %i\n", stats->rx_rmap_header_crc_err);
                     printf("Receiver RMAP data CRC errors: %i\n", stats->rx_rmap_data_crc_err);
                     printf("Receiver EEP errors: %i\n", stats->rx_eep_err);
                     printf("Receiver truncation errors: %i\n", stats->rx_truncated);
                     printf("Parity errors: %i\n", stats->parity_err);
                     printf("Escape errors: %i\n", stats->escape_err);
                     printf("Credit errors: %i\n", stats->credit_err);
                     printf("Disconnect errors: %i\n", stats->disconnect_err);
                     printf("Write synchronization errors: %i\n", stats->write_sync_err);
                     printf("Early EOP/EEP: %i\n", stats->early_ep);
                     printf("Invalid Node Address: %i\n", stats->invalid_address);
                     printf("Packets transmitted: %i\n", stats->packets_sent);
                     printf("Packets received: %i\n", stats->packets_received);
             }
             int send_console_outputs_on_serial_port( void ) // Send the console outputs on the serial port
             {
                 struct apbuart_regs_str *apbuart_regs = (struct apbuart_regs_str *) REGS_ADDR_APBUART;
                 apbuart_regs->ctrl = apbuart_regs->ctrl & APBUART_CTRL_REG_MASK_DB;
                 PRINTF("\n\n\n\n\nIn INIT *** Now the console is on port COM1\n")
                 return 0;
             }
             int set_apbuart_scaler_reload_register(unsigned int regs, unsigned int value)
             {
                 struct apbuart_regs_str *apbuart_regs = (struct apbuart_regs_str *) regs;
                 apbuart_regs->scaler = value;
                 PRINTF1("OK  *** COM port scaler reload register set to %x\n", value)
                 return 0;
             }
             // RTEMS TASKS
             rtems_task stat_task(rtems_task_argument argument)
+            {
                 int i;
                 int j;
                 i = 0;
                 j = 0;
                 PRINTF("in STAT *** \n")
                 while(1){
                     rtems_task_wake_after(1000);
                     PRINTF1("%d\n", j)
                     if (i == 2) {
                         #ifdef PRINT_TASK_STATISTICS
                         rtems_cpu_usage_report();
                         rtems_cpu_usage_reset();
                         #endif
                         i = 0;
+                    }
                     else i++;
                     j++;
+                }
             }
             rtems_task hous_task(rtems_task_argument argument)
             {
                 int result;
                 rtems_status_code status;
                 PRINTF("in HOUS ***\n")
-                if (rtems_rate_monotonic_ident( HK_name, &HK_id)!=RTEMS_SUCCESSFUL) {
+                if (rtems_rate_monotonic_ident( HK_name, &HK_id) != RTEMS_SUCCESSFUL) {
                     status = rtems_rate_monotonic_create( HK_name, &HK_id );
                     if( status != RTEMS_SUCCESSFUL ) {
                         PRINTF1( "rtems_rate_monotonic_create failed with status of %d\n", status )
                     }
                 }
                 housekeeping_packet.targetLogicalAddress = CCSDS_DESTINATION_ID;
                 housekeeping_packet.protocolIdentifier = 0x02;
                 housekeeping_packet.reserved = 0x00;
                 housekeeping_packet.userApplication = 0x00;
                 housekeeping_packet.packetID[0] = 0x0c;
                 housekeeping_packet.packetID[1] = 0xc4;
                 housekeeping_packet.packetSequenceControl[0] = 0xc0;
                 housekeeping_packet.packetSequenceControl[1] = 0x00;
                 housekeeping_packet.packetLength[0] = 0x00;
                 housekeeping_packet.packetLength[1] = 0x77;
                 housekeeping_packet.dataFieldHeader[0] = 0x10;
-                housekeeping_packet.dataFieldHeader[1] = 0x03;
+                housekeeping_packet.dataFieldHeader[1] = TM_TYPE_HK;
-                housekeeping_packet.dataFieldHeader[2] = 0x19;
+                housekeeping_packet.dataFieldHeader[2] = TM_SUBTYPE_HK;
-                housekeeping_packet.dataFieldHeader[3] = 0x00;
+                housekeeping_packet.dataFieldHeader[3] = CCSDS_DESTINATION_ID_GROUND;
                 status = rtems_rate_monotonic_cancel(HK_id);
                 if( status != RTEMS_SUCCESSFUL )
                 PRINTF1( "ERR *** in HOUS *** rtems_rate_monotonic_cancel(HK_id) ***code: %d\n", status )
                 else
                 PRINTF("OK  *** in HOUS *** rtems_rate_monotonic_cancel(HK_id)\n")
                 while(1){ // launch the rate monotonic task
                     status = rtems_rate_monotonic_period( HK_id, HK_PERIOD );
                     if ( status != RTEMS_SUCCESSFUL ){
                         PRINTF1( "ERR *** in HOUS *** rtems_rate_monotonic_period *** code %d\n", status);
                     }
                     else
                     {
                         housekeeping_packet.dataFieldHeader[7] = (unsigned char) (time_management_regs->coarse_time);
                         housekeeping_packet.dataFieldHeader[8] = (unsigned char) (time_management_regs->fine_time>>8);
                         housekeeping_packet.dataFieldHeader[9] = (unsigned char) (time_management_regs->fine_time);
-                        housekeeping_packet.data[0] = CCSDS_DESTINATION_ID_DPU;
+                        housekeeping_packet.sid = CCSDS_DESTINATION_ID_DPU;
                         result = write ( fdSPW, &housekeeping_packet, LEN_TM_LFR_HK);
                         if (result==-1)
                         {
                             PRINTF("ERR *** in HOUS *** HK send\n");
                         }
+                    }
+                }
                 PRINTF("in HOUS *** deleting task\n")
                 status = rtems_task_delete( RTEMS_SELF ); // should not return
                 printf( "rtems_task_delete returned with status of %d.\n", status );
                 exit( 1 );
             }

src/tc_handler.c +155 -34

             #include <tc_handler.h>
             #include <fsw_params.h>
-            char *DumbMessages[5] = {"default",
+            char *DumbMessages[5] = {"in DUMB *** default",
-                                "timecode_irq_handler",
+                                "in DUMB *** timecode_irq_handler",
-                                "waveforms_isr",
+                                "in DUMB *** waveforms_isr",
                                 "",
                                 ""
             };
             rtems_task actn_task( rtems_task_argument unused )
             {
                 int result = 0;
+                unsigned int val;
                 rtems_status_code status;           // RTEMS status code
                 ccsdsTelecommandPacket_t TC;        // TC sent to the ACTN task
                 size_t size;                        // size of the incoming TC packet
                                 break;
                                 //
                             case TC_SUBTYPE_LOAD_COMM:
-                                result = action_default( &TC );
+                                result = action_load_comm( &TC );
+                                close_action( &TC, result );
                                 break;
                                 //
                             case TC_SUBTYPE_LOAD_NORM:
                                 result = action_load_norm( &TC );
-                                send_tm_lfr_tc_exe_success( &TC );
+                                close_action( &TC, result );
                                 break;
                                 //
                             case TC_SUBTYPE_LOAD_BURST:
                                 result = action_default( &TC );
+                                close_action( &TC, result );
                                 break;
                                 //
                             case TC_SUBTYPE_LOAD_SBM1:
                                 result = action_default( &TC );
+                                close_action( &TC, result );
                                 break;
                                 //
                             case TC_SUBTYPE_LOAD_SBM2:
                                 result = action_default( &TC );
+                                close_action( &TC, result );
                                 break;
                                 //
                             case TC_SUBTYPE_DUMP:
                                 result = action_default( &TC );
+                                close_action( &TC, result );
                                 break;
                                 //
                             case TC_SUBTYPE_ENTER:
                                 result = action_enter( &TC );
-                                send_tm_lfr_tc_exe_success( &TC );
+                                close_action( &TC, result );
                                 break;
                                 //
                             case TC_SUBTYPE_UPDT_INFO:
                                 result = action_default( &TC );
+                                val = housekeeping_packet.hk_lfr_update_info_tc_cnt[0] * 256
+                                        + housekeeping_packet.hk_lfr_update_info_tc_cnt[1];