##// END OF EJS Templates
3.2.0.12...
paul -
r362:0f33a04cb747 R3++ draft
parent child
Show More
@@ -64,7 +64,7 option(FSW_debug_tch "?" OFF)
64 64 set(SW_VERSION_N1 "3" CACHE STRING "Choose N1 FSW Version." FORCE)
65 65 set(SW_VERSION_N2 "2" CACHE STRING "Choose N2 FSW Version." FORCE)
66 66 set(SW_VERSION_N3 "0" CACHE STRING "Choose N3 FSW Version." FORCE)
67 set(SW_VERSION_N4 "11" CACHE STRING "Choose N4 FSW Version." FORCE)
67 set(SW_VERSION_N4 "12" CACHE STRING "Choose N4 FSW Version." FORCE)
68 68
69 69 if(FSW_verbose)
70 70 add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)
@@ -454,9 +454,9 rtems_task avgv_task(rtems_task_argument
454 454 average_e2 = filter( current_e2, &ctx_e2 );
455 455
456 456 //update int16 values
457 hk_lfr_sc_v_f3_as_int16 = (int16_t) (average_v / MOVING_AVERAGE );
458 hk_lfr_sc_e1_f3_as_int16 = (int16_t) (average_e1 / MOVING_AVERAGE );
459 hk_lfr_sc_e2_f3_as_int16 = (int16_t) (average_e2 / MOVING_AVERAGE );
457 hk_lfr_sc_v_f3_as_int16 = (int16_t) average_v;
458 hk_lfr_sc_e1_f3_as_int16 = (int16_t) average_e1;
459 hk_lfr_sc_e2_f3_as_int16 = (int16_t) average_e2;
460 460 }
461 461 old_v = current_v;
462 462 old_e1 = current_e1;
@@ -1210,7 +1210,7 void set_wfp_delta_f0_f0_2( void )
1210 1210 delta_f0_in_float = (nb_samples_per_snapshot / 2.) * ( (1. / FREQ_F2) - (1. / FREQ_F0) ) * FREQ_F2;
1211 1211
1212 1212 waveform_picker_regs->delta_f0 = delta_snapshot - floor( delta_f0_in_float );
1213 waveform_picker_regs->delta_f0_2 = DFLT_WFP_DELTA_F0_2; // 48 = 11 0000, max 7 bits
1213 waveform_picker_regs->delta_f0_2 = DFLT_WFP_DELTA_F0_2;
1214 1214 }
1215 1215
1216 1216 void set_wfp_delta_f1( void )
General Comments 0
You need to be logged in to leave comments. Login now