HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r362:0f33a04cb747

3.2.0.12...

paul -

r362:0f33a04cb747 R3++

parent child

Context file:

r362:0f33a04cb747

src/CMakeLists.txt +1 -1

             set(SW_VERSION_N1 "3" CACHE STRING  "Choose N1 FSW Version." FORCE)
             set(SW_VERSION_N2 "2" CACHE STRING  "Choose N2 FSW Version." FORCE)
             set(SW_VERSION_N3 "0" CACHE STRING  "Choose N3 FSW Version." FORCE)
-            set(SW_VERSION_N4 "11" CACHE STRING  "Choose N4 FSW Version." FORCE)
+            set(SW_VERSION_N4 "12" CACHE STRING  "Choose N4 FSW Version." FORCE)
             if(FSW_verbose)
             	add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)

src/fsw_misc.c +3 -3

                             average_e2 = filter( current_e2, &ctx_e2 );
                             //update int16 values
-                            hk_lfr_sc_v_f3_as_int16 =  (int16_t) (average_v / MOVING_AVERAGE );
+                            hk_lfr_sc_v_f3_as_int16 =  (int16_t) average_v;
-                            hk_lfr_sc_e1_f3_as_int16 = (int16_t) (average_e1 / MOVING_AVERAGE );
+                            hk_lfr_sc_e1_f3_as_int16 = (int16_t) average_e1;
-                            hk_lfr_sc_e2_f3_as_int16 = (int16_t) (average_e2 / MOVING_AVERAGE );
+                            hk_lfr_sc_e2_f3_as_int16 = (int16_t) average_e2;
                         }
                         old_v = current_v;
                         old_e1 = current_e1;

src/wf_handler.c +1 -1

                 delta_f0_in_float = (nb_samples_per_snapshot / 2.) * ( (1. / FREQ_F2) - (1. / FREQ_F0) ) * FREQ_F2;
                 waveform_picker_regs->delta_f0      = delta_snapshot - floor( delta_f0_in_float );
-                waveform_picker_regs->delta_f0_2    = DFLT_WFP_DELTA_F0_2; // 48 = 11 0000, max 7 bits
+                waveform_picker_regs->delta_f0_2    = DFLT_WFP_DELTA_F0_2;
             }
             void set_wfp_delta_f1( void )

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