HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r55:278c7d92e10c

HK emission using the directive...

paul -

r55:278c7d92e10c default

parent child

Context file:

r55:278c7d92e10c

Collapse all files

FSW-qt/Makefile +1 -1

              #############################################################################
              # Makefile for building: bin/fsw
-             # Generated by qmake (2.01a) (Qt 4.8.5) on: Mon Nov 4 07:05:32 2013
+             # Generated by qmake (2.01a) (Qt 4.8.5) on: Tue Nov 5 13:12:35 2013
              # Project:  fsw-qt.pro
              # Template: app
              # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro

FSW-qt/bin/fsw binary modified 0 0

NO CONTENT: modified file, binary diff hidden

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

              <?xml version="1.0" encoding="UTF-8"?>
              <!DOCTYPE QtCreatorProject>
-             <!-- Written by QtCreator 2.8.0, 2013-11-04T07:04:49. -->
+             <!-- Written by QtCreator 2.8.1, 2013-11-05T13:11:18. -->
              <qtcreator>
               <data>
                <variable>ProjectExplorer.Project.ActiveTarget</variable>

src/fsw_init.c +3 -1

                  //send_console_outputs_on_apbuart_port();
                  set_apbuart_scaler_reload_register(REGS_ADDR_APBUART, APBUART_SCALER_RELOAD_VALUE);
+                 reset_wfp_burst_enable();       // stop the waveform picker if it was running
                  init_parameter_dump();
                  init_local_mode_parameters();
                  init_housekeeping_parameters();
                  {
                      status = rtems_task_create(
                          Task_name[TASKID_SEND], TASK_PRIORITY_SEND, RTEMS_MINIMUM_STACK_SIZE,
-                         RTEMS_DEFAULT_MODES | RTEMS_NO_PREEMPT,
+                         RTEMS_DEFAULT_MODES,
                          RTEMS_DEFAULT_ATTRIBUTES, &Task_id[TASKID_SEND]
                      );
                  }

src/fsw_misc.c +8 -5

              #include "fsw_misc.h"
-             char *DumbMessages[6] = {"in DUMB *** default",                                             // RTEMS_EVENT_0
+             char *DumbMessages[7] = {"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 *** spectral_matrices_isr *** Error sending event to SMIQ",    // RTEMS_EVENT_4
-                                 "in DUMB *** waveforms_simulator_isr"                                   // RTEMS_EVENT_5
+                                 "in DUMB *** waveforms_simulator_isr",                                  // RTEMS_EVENT_5
+                                 "ERR HK"                                                                // RTEMS_EVENT_6
              };
              int configure_timer(gptimer_regs_t *gptimer_regs, unsigned char timer, unsigned int clock_divider,
                      status = rtems_rate_monotonic_period( HK_id, HK_PERIOD );
                      if ( status != RTEMS_SUCCESSFUL ) {
                          PRINTF1( "in HOUS *** ERR period: %d\n", status);
+                         rtems_event_send( Task_id[TASKID_DUMB], RTEMS_EVENT_6 );
                      }
                      else {
                          housekeeping_packet.time[0] = (unsigned char) (time_management_regs->coarse_time>>24);
                          spacewire_update_statistics();
                          // SEND PACKET
-                         status =  rtems_message_queue_send( queue_id, &housekeeping_packet,
+                         status =  rtems_message_queue_urgent( queue_id, &housekeeping_packet,
                                                              PACKET_LENGTH_HK + CCSDS_TC_TM_PACKET_OFFSET + CCSDS_PROTOCOLE_EXTRA_BYTES);
                          if (status != RTEMS_SUCCESSFUL) {
                              PRINTF1("in HOUS *** ERR send: %d\n", status)
                  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_receive(RTEMS_EVENT_0 | RTEMS_EVENT_1 | RTEMS_EVENT_2 | RTEMS_EVENT_3
+                                         | RTEMS_EVENT_4 | RTEMS_EVENT_5 | RTEMS_EVENT_6,
                                          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++)
                          {
                              coarse_time = time_management_regs->coarse_time;
                              fine_time = time_management_regs->fine_time;
-                             printf("in DUMB *** time = coarse: %x, fine: %x, %s\n", coarse_time, fine_time, DumbMessages[i]);
+                             printf("in DUMB *** coarse: %x, fine: %x, %s\n", coarse_time, fine_time, DumbMessages[i]);
                          }
                      }
                  }

src/wf_handler.c 0 -19

              #endif
              }
-             void reset_waveform_picker_regs_alt()
+             {
-                 waveform_picker_regs_alt->data_shaping = 0x01;      // 0x00 00      *** R1 R0 SP1 SP0 BW
-                 waveform_picker_regs_alt->run_burst_enable = 0x00;  // 0x04 01      *** [run *** burst f2, f1, f0 *** enable f3, f2, f1, f0 ]
-                 waveform_picker_regs_alt->addr_data_f0 = (int) (wf_snap_f0);    // 0x08
-                 waveform_picker_regs_alt->addr_data_f1 = (int) (wf_snap_f1);    // 0x0c
-                 waveform_picker_regs_alt->addr_data_f2 = (int) (wf_snap_f2);    // 0x10
-                 waveform_picker_regs_alt->addr_data_f3 = (int) (wf_cont_f3);    // 0x14
-                 waveform_picker_regs_alt->status = 0x00;                        // 0x18
-                 waveform_picker_regs_alt->delta_snapshot = 0x12800;             // 0x1c
-                 waveform_picker_regs_alt->delta_f0 = 0x3f5;                     // 0x20 *** 1013
-                 waveform_picker_regs_alt->delta_f0_2 = 0x7;                     // 0x24 *** 7
-                 waveform_picker_regs_alt->delta_f1 = 0x3c0;                     // 0x28 *** 960
-                 waveform_picker_regs_alt->delta_f2 = 0x12200;                   // 0x2c *** 74240
-                 waveform_picker_regs_alt->nb_data_by_buffer = 0x1802;           // 0x30 *** 2048 * 3 + 2
-                 waveform_picker_regs_alt->snapshot_param = 0x7ff;               // 0x34 *** 2048 -1
-                 waveform_picker_regs_alt->start_date = 0x00;
+             }
              //*****************
              // local parameters
              void set_local_sbm1_nb_cwf_max()

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