HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r50:668726f2ef59

priority modifications...

paul -

r50:668726f2ef59 default

parent child

Context file:

r50:668726f2ef59

FSW-qt/Makefile +2 -2

             #############################################################################
             # Makefile for building: bin/fsw
-            # Generated by qmake (2.01a) (Qt 4.8.5) on: Fri Oct 25 15:35:04 2013
+            # Generated by qmake (2.01a) (Qt 4.8.5) on: Sun Oct 27 15:33:40 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=18 -DPRINT_MESSAGES_ON_CONSOLE
+            DEFINES       = -DSW_VERSION_N1=0 -DSW_VERSION_N2=0 -DSW_VERSION_N3=0 -DSW_VERSION_N4=19 -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/bin/fsw binary modified 0 0

NO CONTENT: modified file, binary diff hidden

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

             include(./sparc.pri)
             # flight software version
-            SWVERSION=-0-18
+            SWVERSION=-0-19
             DEFINES += SW_VERSION_N1=0
             DEFINES += SW_VERSION_N2=0
             DEFINES += SW_VERSION_N3=0
-            DEFINES += SW_VERSION_N4=18
+            DEFINES += SW_VERSION_N4=19
             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.0, 2013-10-25T06:57:59. -->
+            <!-- Written by QtCreator 2.8.0, 2013-10-27T14:25:30. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

header/fsw_params.h +7 -5

             //
             #define TASK_PRIORITY_WTDG 20
             //
-            #define TASK_PRIORITY_HOUS 40
+            #define TASK_PRIORITY_HOUS 30
-            #define TASK_PRIORITY_CWF1 40
+            //
-            #define TASK_PRIORITY_CWF2 40
+            #define TASK_PRIORITY_CWF1 35   // CWF1 and CWF2 are never running together
+            #define TASK_PRIORITY_CWF2 35   //
+            //
             #define TASK_PRIORITY_WFRM 40
-            #define TASK_PRIORITY_CWF3 40
+            #define TASK_PRIORITY_CWF3 40   // there is a printf in this function, be careful with its priority wrt CWF1
             //
-            #define TASK_PRIORITY_SEND 40
+            #define TASK_PRIORITY_SEND 45
             //
             #define TASK_PRIORITY_RECV 50
             #define TASK_PRIORITY_ACTN 50

src/fsw_misc.c +2 -2

                 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);
+                        PRINTF1( "in HOUS *** ERR period: %d\n", status);
                     }
                     else {
                         housekeeping_packet.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                         status =  rtems_message_queue_send( queue_id, &housekeeping_packet,
                                                             PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);
                         if (status != RTEMS_SUCCESSFUL) {
-                            PRINTF1("in HOUS *** ERR %d\n", status)
+                            PRINTF1("in HOUS *** ERR send: %d\n", status)
                         }
                     }
                 }

src/wf_handler.c +4 -1

             {
                 rtems_id queue_id;
                 rtems_status_code status;
+                rtems_name queue_send_name;
-                status =  rtems_message_queue_ident( misc_name[QUEUE_SEND], 0, &queue_id );
+                queue_send_name = rtems_build_name( 'Q', '_', 'S', 'D' );
+                status =  rtems_message_queue_ident( queue_send_name, 0, &queue_id );
                 if (status != RTEMS_SUCCESSFUL)
                 {
                     PRINTF1("in get_pkts_queue_id *** ERR %d\n", status)

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