HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r73:8d0190b179ad

Bug ...

paul -

r73:8d0190b179ad VHDLib206

parent child

Context file:

r73:8d0190b179ad

Collapse all files

FSW-qt/Makefile +2 -2

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Wed Nov 13 08:18:19 2013
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Thu Nov 14 08:56:42 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       = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=22 -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=23 -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

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

             include(./sparc.pri)
             # flight software version
-            SWVERSION=-0-22
+            SWVERSION=-0-23
             DEFINES += SW_VERSION_N1=0
             DEFINES += SW_VERSION_N2=0
             DEFINES += SW_VERSION_N3=0
-            DEFINES += SW_VERSION_N4=22
+            DEFINES += SW_VERSION_N4=23
             contains( CONFIG, verbose ) {
                 DEFINES += PRINT_MESSAGES_ON_CONSOLE

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

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 2.8.1, 2013-11-13T13:39:43. -->
+            <!-- Written by QtCreator 2.8.1, 2013-11-14T09:19:44. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/tc_handler.h +2 -2

             // other functions
             void updateLFRCurrentMode();
-            void update_last_TC_exe(ccsdsTelecommandPacket_t *TC);
+            void update_last_TC_exe(ccsdsTelecommandPacket_t *TC, unsigned char *time);
-            void update_last_TC_rej(ccsdsTelecommandPacket_t *TC);
+            void update_last_TC_rej(ccsdsTelecommandPacket_t *TC, unsigned char *time);
             void close_action(ccsdsTelecommandPacket_t *TC, int result, rtems_id queue_id);
             #endif // TC_HANDLER_H_INCLUDED

header/tm_lfr_tc_exe.h +1 -1

             extern Packet_TM_LFR_HK_t housekeeping_packet;
             extern unsigned short sequenceCounters_TC_EXE[];
-            int send_tm_lfr_tc_exe_success(ccsdsTelecommandPacket_t *TC, rtems_id queue_id);
+            int send_tm_lfr_tc_exe_success(ccsdsTelecommandPacket_t *TC, rtems_id queue_id, unsigned char *time);
             int send_tm_lfr_tc_exe_inconsistent(ccsdsTelecommandPacket_t *TC, rtems_id queue_id,
                                                 unsigned char byte_position, unsigned char rcv_value);
             int send_tm_lfr_tc_exe_not_executable(ccsdsTelecommandPacket_t *TC, rtems_id queue_id);

src/tc_handler.c +26 -17

             //****************
             // CLOSING ACTIONS
-            void update_last_TC_exe(ccsdsTelecommandPacket_t *TC)
+            void update_last_TC_exe(ccsdsTelecommandPacket_t *TC, unsigned char *time)
             {
                 housekeeping_packet.hk_lfr_last_exe_tc_id[0] = TC->packetID[0];
                 housekeeping_packet.hk_lfr_last_exe_tc_id[1] = TC->packetID[1];
                 housekeeping_packet.hk_lfr_last_exe_tc_type[1] = TC->serviceType;
                 housekeeping_packet.hk_lfr_last_exe_tc_subtype[0] = 0x00;
                 housekeeping_packet.hk_lfr_last_exe_tc_subtype[1] = TC->serviceSubType;
-                housekeeping_packet.hk_lfr_last_exe_tc_time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
+                housekeeping_packet.hk_lfr_last_exe_tc_time[0] = time[0];
-                housekeeping_packet.hk_lfr_last_exe_tc_time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
+                housekeeping_packet.hk_lfr_last_exe_tc_time[1] = time[1];
-                housekeeping_packet.hk_lfr_last_exe_tc_time[2] = (unsigned char) (time_management_regs->coarse_time>>8);
+                housekeeping_packet.hk_lfr_last_exe_tc_time[2] = time[2];
-                housekeeping_packet.hk_lfr_last_exe_tc_time[3] = (unsigned char) (time_management_regs->coarse_time);
+                housekeeping_packet.hk_lfr_last_exe_tc_time[3] = time[3];
-                housekeeping_packet.hk_lfr_last_exe_tc_time[4] = (unsigned char) (time_management_regs->fine_time>>8);
+                housekeeping_packet.hk_lfr_last_exe_tc_time[4] = time[4];
-                housekeeping_packet.hk_lfr_last_exe_tc_time[5] = (unsigned char) (time_management_regs->fine_time);
+                housekeeping_packet.hk_lfr_last_exe_tc_time[5] = time[5];
             }
-            void update_last_TC_rej(ccsdsTelecommandPacket_t *TC)
+            void update_last_TC_rej(ccsdsTelecommandPacket_t *TC, unsigned char *time)
             {
                 housekeeping_packet.hk_lfr_last_rej_tc_id[0] = TC->packetID[0];
                 housekeeping_packet.hk_lfr_last_rej_tc_id[1] = TC->packetID[1];
                 housekeeping_packet.hk_lfr_last_rej_tc_type[1] = TC->serviceType;
                 housekeeping_packet.hk_lfr_last_rej_tc_subtype[0] = 0x00;
                 housekeeping_packet.hk_lfr_last_rej_tc_subtype[1] = TC->serviceSubType;
-                housekeeping_packet.hk_lfr_last_rej_tc_time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
+                housekeeping_packet.hk_lfr_last_rej_tc_time[0] = time[0];
-                housekeeping_packet.hk_lfr_last_rej_tc_time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
+                housekeeping_packet.hk_lfr_last_rej_tc_time[1] = time[1];
-                housekeeping_packet.hk_lfr_last_rej_tc_time[2] = (unsigned char) (time_management_regs->coarse_time>>8);
+                housekeeping_packet.hk_lfr_last_rej_tc_time[2] = time[2];
-                housekeeping_packet.hk_lfr_last_rej_tc_time[3] = (unsigned char) (time_management_regs->coarse_time);
+                housekeeping_packet.hk_lfr_last_rej_tc_time[3] = time[3];
-                housekeeping_packet.hk_lfr_last_rej_tc_time[4] = (unsigned char) (time_management_regs->fine_time>>8);
+                housekeeping_packet.hk_lfr_last_rej_tc_time[4] = time[4];
-                housekeeping_packet.hk_lfr_last_rej_tc_time[5] = (unsigned char) (time_management_regs->fine_time);
+                housekeeping_packet.hk_lfr_last_rej_tc_time[5] = time[5];
             }
             void close_action(ccsdsTelecommandPacket_t *TC, int result, rtems_id queue_id)
             {
                 unsigned int val = 0;
+                unsigned char time[6];
+                time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
+                time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
+                time[2] = (unsigned char) (time_management_regs->coarse_time>>8);
+                time[3] = (unsigned char) (time_management_regs->coarse_time);
+                time[4] = (unsigned char) (time_management_regs->fine_time>>8);
+                time[5] = (unsigned char) (time_management_regs->fine_time);
                 if (result == LFR_SUCCESSFUL)
                 {
                     if ( !( (TC->serviceType==TC_TYPE_TIME) && (TC->serviceSubType==TC_SUBTYPE_UPDT_TIME) )
                          !( (TC->serviceType==TC_TYPE_GEN) && (TC->serviceSubType==TC_SUBTYPE_UPDT_INFO))
                          )
                     {
-                        send_tm_lfr_tc_exe_success( TC, queue_id );
+                        send_tm_lfr_tc_exe_success( TC, queue_id, time );
                     }
-                    update_last_TC_exe( TC );
+                    update_last_TC_exe( TC, time );
                     val = housekeeping_packet.hk_dpu_exe_tc_lfr_cnt[0] * 256 + housekeeping_packet.hk_dpu_exe_tc_lfr_cnt[1];
                     val++;
                     housekeeping_packet.hk_dpu_exe_tc_lfr_cnt[0] = (unsigned char) (val >> 8);
                 }
                 else
                 {
-                    update_last_TC_rej( TC );
+                    update_last_TC_rej( TC, time );
                     val = housekeeping_packet.hk_dpu_rej_tc_lfr_cnt[0] * 256 + housekeeping_packet.hk_dpu_rej_tc_lfr_cnt[1];
                     val++;
                     housekeeping_packet.hk_dpu_rej_tc_lfr_cnt[0] = (unsigned char) (val >> 8);

src/tm_lfr_tc_exe.c +7 -7

             #include "tm_lfr_tc_exe.h"
-            int send_tm_lfr_tc_exe_success( ccsdsTelecommandPacket_t *TC, rtems_id queue_id )
+            int send_tm_lfr_tc_exe_success( ccsdsTelecommandPacket_t *TC, rtems_id queue_id, unsigned char *time )
             {
                 /** This function sends a TM_LFR_TC_EXE_SUCCESS packet in the dedicated RTEMS message queue.
                  *
                 TM.serviceType = TM_TYPE_TC_EXE;
                 TM.serviceSubType = TM_SUBTYPE_EXE_OK;
                 TM.destinationID = TC->sourceID;
-                TM.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
+                TM.time[0] = time[0];
-                TM.time[1] = (unsigned char) (time_management_regs->coarse_time>>16);
+                TM.time[1] = time[1];
-                TM.time[2] = (unsigned char) (time_management_regs->coarse_time>>8);
+                TM.time[2] = time[2];
-                TM.time[3] = (unsigned char) (time_management_regs->coarse_time);
+                TM.time[3] = time[3];
-                TM.time[4] = (unsigned char) (time_management_regs->fine_time>>8);
+                TM.time[4] = time[4];
-                TM.time[5] = (unsigned char) (time_management_regs->fine_time);
+                TM.time[5] = time[5];
                 //
                 TM.telecommand_pkt_id[0] = TC->packetID[0];
                 TM.telecommand_pkt_id[1] = TC->packetID[1];

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages