HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r58:95058e78e811

fsw-0-20

paul -

r58:95058e78e811 default

parent child

Context file:

r58:95058e78e811

header/fsw_params.h +1 -1

             #define DEFAULT_SY_LFR_COMMON1 0x10 // default value 0 0 0 1 0 0 0 0
             // NORM
             #define SY_LFR_N_SWF_L 2048 // nb sample
-            #define SY_LFR_N_SWF_P 300  // sec
+            #define SY_LFR_N_SWF_P 296  // sec
             #define SY_LFR_N_ASM_P 3600 // sec
             #define SY_LFR_N_BP_P0 4    // sec
             #define SY_LFR_N_BP_P1 20   // sec

src/fsw_init.c +1 -1

                 {
                     status = rtems_task_create(
                         Task_name[TASKID_SEND], TASK_PRIORITY_SEND, RTEMS_MINIMUM_STACK_SIZE,
-                        RTEMS_DEFAULT_MODES,
+                        RTEMS_DEFAULT_MODES | RTEMS_NO_PREEMPT,
                         RTEMS_DEFAULT_ATTRIBUTES, &Task_id[TASKID_SEND]
                     );
                 }

src/fsw_spacewire.c +3 -14

@@ -228,20 +228,9 rtems_task send_task( rtems_task_argumen
228	else // the incoming message is a spw_ioctl_pkt_send structure	228	else // the incoming message is a spw_ioctl_pkt_send structure
229	{	229	{
230	spw_ioctl_send = (spw_ioctl_pkt_send*) incomingData;	230	spw_ioctl_send = (spw_ioctl_pkt_send*) incomingData;
231	if (spw_ioctl_send->hlen == 0)	231	status = ioctl( fdSPW, SPACEWIRE_IOCTRL_SEND, spw_ioctl_send );
232	{	232	if (status == -1){
233	status = write( fdSPW, spw_ioctl_send->data, spw_ioctl_send->dlen );	233	PRINTF2("in SEND *** (2.b) ERRNO = %d, RTEMS = %d\n", errno, status)
234	if (status == -1){
235	PRINTF2("in SEND *** (2.b) ERRNO = %d, dlen = %d\n", errno, spw_ioctl_send->dlen)
236	}
237	}
238	else
239	{
240	status = ioctl( fdSPW, SPACEWIRE_IOCTRL_SEND, spw_ioctl_send );
241	if (status == -1){
242	PRINTF2("in SEND *** (2.c) ERRNO = %d, dlen = %d\n", errno, spw_ioctl_send->dlen)
243	PRINTF1(" hlen = %d\n", spw_ioctl_send->hlen)
244	}
245	}	234	}
246	}	235	}
247	}	236	}

src/tc_load_dump_parameters.c +3 -3

                 int flag;
                 flag = LFR_SUCCESSFUL;
-                result = LFR_SUCCESSFUL;
-                if ( lfrCurrentMode == LFR_MODE_NORMAL ) {
+                if ( (lfrCurrentMode == LFR_MODE_NORMAL) ||
+                     (lfrCurrentMode == LFR_MODE_SBM1) || (lfrCurrentMode == LFR_MODE_SBM2) ) {
                     send_tm_lfr_tc_exe_not_executable( TC, queue_id );
                     flag = LFR_DEFAULT;
                 }
                     }
                 }
-                return result;
+                return flag;
             }
             int action_load_burst_par(ccsdsTelecommandPacket_t *TC, rtems_id queue_id)

src/wf_handler.c +2 -2

                 unsigned short segmentation_grouping_flag;
                 unsigned short new_packet_sequence_control;
-                if ( (sid ==SID_NORM_SWF_F0) || (sid ==SID_NORM_SWF_F1) || (sid ==SID_NORM_SWF_F2)
+                if ( (sid ==SID_NORM_SWF_F0)    || (sid ==SID_NORM_SWF_F1) || (sid ==SID_NORM_SWF_F2)
-                     || (sid ==SID_BURST_CWF_F2) )
+                     || (sid ==SID_NORM_CWF_F3) || (sid ==SID_BURST_CWF_F2) )
                 {
                     sequence_cnt = &sequenceCounters_SCIENCE_NORMAL_BURST;
                 }

General Comments 0

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

No TODOs yet

	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