HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r109:be3fd1d0953f

rev 1.0.0.3

paul -

r109:be3fd1d0953f VHDLib206

parent child

Context file:

r109:be3fd1d0953f

Collapse all files

FSW-qt/Makefile +2 -2

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Mar 25 09:47:02 2014
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Thu Mar 27 13:16:57 2014
             # 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=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=3 -DVHDL_DEV -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=1 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=3 -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../../LFR_basic-parameters

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

             TEMPLATE = app
             # CONFIG += console v8 sim
             # CONFIG options = verbose *** boot_messages *** debug_messages *** cpu_usage_report *** stack_report *** vhdl_dev *** debug_tch
-            CONFIG += console verbose vhdl_dev
+            CONFIG += console verbose
             CONFIG -= qt
             include(./sparc.pri)

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

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by QtCreator 3.0.1, 2014-03-25T08:40:48. -->
+            <!-- Written by QtCreator 3.0.1, 2014-03-27T07:16:29. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/tc_handler.h +2 -1

             int action_update_time( ccsdsTelecommandPacket_t *TC);
             // mode transition
-            int transition_validation(unsigned char requestedMode);
+            int check_mode_value( unsigned char requestedMode );
+            int check_mode_transition( unsigned char requestedMode );
             int stop_current_mode( void );
             int enter_mode( unsigned char mode );
             int restart_science_tasks();

src/fsw_misc.c +4 -3

                 unsigned int fine_time = 0;
                 rtems_event_set event_out;
-                char *DumbMessages[9] = {"in DUMB *** default",                                             // RTEMS_EVENT_0
+                char *DumbMessages[10] = {"in DUMB *** default",                                            // RTEMS_EVENT_0
                                     "in DUMB *** timecode_irq_handler",                                     // RTEMS_EVENT_1
                                     "in DUMB *** waveforms_isr",                                            // RTEMS_EVENT_2
                                     "in DUMB *** in SMIQ *** Error sending event to AVF0",                  // RTEMS_EVENT_3
                                     "in DUMB *** waveforms_simulator_isr",                                  // RTEMS_EVENT_5
                                     "ERR HK",                                                               // RTEMS_EVENT_6
                                     "ready for dump",                                                       // RTEMS_EVENT_7
-                                    "in DUMB *** spectral_matrices_isr"                                     // RTEMS_EVENT_8
+                                    "in DUMB *** spectral_matrices_isr",                                    // RTEMS_EVENT_8
+                                    "tick"                                                                  // RTEMS_EVENT_9
                 };
                 BOOT_PRINTF("in DUMB *** \n")
                 while(1){
                     rtems_event_receive(RTEMS_EVENT_0 | RTEMS_EVENT_1 | RTEMS_EVENT_2 | RTEMS_EVENT_3
                                         | RTEMS_EVENT_4 | RTEMS_EVENT_5 | RTEMS_EVENT_6 | RTEMS_EVENT_7
-                                        | RTEMS_EVENT_8,
+                                        | RTEMS_EVENT_8 | RTEMS_EVENT_9,
                                         RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out); // wait for an RTEMS_EVENT
                     intEventOut =  (unsigned int) event_out;
                     for ( i=0; i<32; i++)

src/fsw_spacewire.c +1 -2

             void timecode_irq_handler( void *pDev, void *regs, int minor, unsigned int tc )
             {
-            //    rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_1 );
+            //    rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_9 );
                 struct grgpio_regs_str *grgpio_regs = (struct grgpio_regs_str *) REGS_ADDR_GRGPIO;
                 grgpio_regs->io_port_direction_register =
                 {
                     grgpio_regs->io_port_output_register = grgpio_regs->io_port_output_register | 0x08;
                 }
             }
             rtems_timer_service_routine user_routine( rtems_id timer_id, void *user_data )

src/tc_handler.c +52 -24

                 requestedMode = TC->dataAndCRC[1];
-                if ( (requestedMode != LFR_MODE_STANDBY)
+                status = check_mode_value( requestedMode );
-                     && (requestedMode != LFR_MODE_NORMAL) && (requestedMode != LFR_MODE_BURST)
+                if ( status != LFR_SUCCESSFUL )
-                     && (requestedMode != LFR_MODE_SBM1) && (requestedMode != LFR_MODE_SBM2) )
                 {
-                    status = RTEMS_UNSATISFIED;
                     send_tm_lfr_tc_exe_inconsistent( TC, queue_id, BYTE_POS_CP_LFR_MODE, requestedMode );
                 }
                 else
                 {
-                    printf("in action_enter_mode *** enter mode %d\n", requestedMode);
+                    status = check_mode_transition(requestedMode);
-                    status = transition_validation(requestedMode);
+                    if ( status == LFR_SUCCESSFUL )
-                    if ( status == LFR_SUCCESSFUL ) {
-                        if ( lfrCurrentMode != LFR_MODE_STANDBY)
                     {
-                            status = stop_current_mode();
+                        PRINTF1("OK  *** in action_enter_mode *** enter mode %d\n", requestedMode);
-                        if (status != RTEMS_SUCCESSFUL)
-                            PRINTF("ERR *** in action_enter *** stop_current_mode\n")
                         status = enter_mode( requestedMode );
                     }
                     else
                     {
-                        PRINTF("ERR *** in action_enter *** transition rejected\n")
+                        PRINTF("ERR *** in action_enter_mode *** transition rejected\n")
                         send_tm_lfr_tc_exe_not_executable( TC, queue_id );
                     }
                 }
                                                             + (TC->dataAndCRC[1] << 16)
                                                             + (TC->dataAndCRC[2] << 8)
                                                             + TC->dataAndCRC[3];
+                PRINTF1("time received: %x\n", time_management_regs->coarse_time_load)
                 val = housekeeping_packet.hk_lfr_update_time_tc_cnt[0] * 256
                         + housekeeping_packet.hk_lfr_update_time_tc_cnt[1];
                 val++;
             //*******************
             // ENTERING THE MODES
+            int check_mode_value( unsigned char requestedMode )
+            {
+                int status;
-            int transition_validation(unsigned char requestedMode)
+                if ( (requestedMode != LFR_MODE_STANDBY)
+                     && (requestedMode != LFR_MODE_NORMAL) && (requestedMode != LFR_MODE_BURST)
+                     && (requestedMode != LFR_MODE_SBM1) && (requestedMode != LFR_MODE_SBM2) )
+                {
+                    status = LFR_DEFAULT;
+                }
+                else
+                {
+                    status = LFR_SUCCESSFUL;
+                }
+                return status;
+            }
+            int check_mode_transition( unsigned char requestedMode )
             {
                 /** This function checks the validity of the transition requested by the TC_LFR_ENTER_MODE.
                  *
                 rtems_status_code status;
-                status = RTEMS_UNSATISFIED;
+                //**********************
+                // STOP THE CURRENT MODE
+                status = stop_current_mode();
+                if (status != RTEMS_SUCCESSFUL)
+                {
+                    PRINTF1("ERR *** in enter_mode *** stop_current_mode with mode = %d\n", mode)
+                }
-                housekeeping_packet.lfr_status_word[0] = (unsigned char) ((mode << 4) + 0x0d);
+                //*************************
-                updateLFRCurrentMode();
+                // ENTER THE REQUESTED MODE
                 if ( (mode == LFR_MODE_NORMAL) || (mode == LFR_MODE_BURST)
                      || (mode == LFR_MODE_SBM1) || (mode == LFR_MODE_SBM2) )
                 {
             #endif
                     status = restart_science_tasks();
                     launch_waveform_picker( mode );
-                    launch_spectral_matrix( mode );
+            //        launch_spectral_matrix( mode );
                 }
                 else if ( mode == LFR_MODE_STANDBY )
                 {
             #ifdef PRINT_STACK_REPORT
                     rtems_stack_checker_report_usage();
             #endif
-                    status = stop_current_mode();
                     PRINTF1("maxCount = %d\n", maxCount)
                 }
                 else
                 if (status != RTEMS_SUCCESSFUL)
                 {
-                    PRINTF1("in enter_mode *** ERR = %d\n", status)
+                    PRINTF1("ERR *** in enter_mode *** status = %d\n", status)
                     status = RTEMS_UNSATISFIED;
                 }
                 reset_spectral_matrix_regs();
             #ifdef VHDL_DEV
+                struct grgpio_regs_str *grgpio_regs = (struct grgpio_regs_str *) REGS_ADDR_GRGPIO;
+                grgpio_regs->io_port_direction_register =
+                        grgpio_regs->io_port_direction_register | 0x01; // [0001 1000], 0 = output disabled, 1 = output enabled
+                grgpio_regs->io_port_output_register = grgpio_regs->io_port_output_register | 0x01; // set the bit 0 to 1
                 set_irq_on_new_ready_matrix( 1 );
                 LEON_Clear_interrupt( IRQ_SPECTRAL_MATRIX );
                 LEON_Unmask_interrupt( IRQ_SPECTRAL_MATRIX );
                  *
                  */
+                unsigned char requestedMode;
                 if (result == LFR_SUCCESSFUL)
                 {
                     if ( !( (TC->serviceType==TC_TYPE_TIME) & (TC->serviceSubType==TC_SUBTYPE_UPDT_TIME) )
                     {
                         send_tm_lfr_tc_exe_success( TC, queue_id );
                     }
+                    if ( (TC->serviceType == TC_TYPE_GEN) & (TC->serviceSubType == TC_SUBTYPE_ENTER) )
+                    {
+                        //**********************************
+                        // UPDATE THE LFRMODE LOCAL VARIABLE
+                        requestedMode = TC->dataAndCRC[1];
+                        housekeeping_packet.lfr_status_word[0] = (unsigned char) ((requestedMode << 4) + 0x0d);
+                        updateLFRCurrentMode();
+                    }
                 }
             }

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