##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SOLO_LFR » DEV_PLE
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/DEV_PLE

3.2.0.8...
paul -
r358:b7b6742fb439 R3++ draft
parent child
Show More
Show file before | Show file after | Hide comments
@@ -64,7 +64,7 option(FSW_debug_tch "?" OFF)
64 set(SW_VERSION_N1 "3" CACHE STRING "Choose N1 FSW Version." FORCE)
64 set(SW_VERSION_N1 "3" CACHE STRING "Choose N1 FSW Version." FORCE)
65 set(SW_VERSION_N2 "2" CACHE STRING "Choose N2 FSW Version." FORCE)
65 set(SW_VERSION_N2 "2" CACHE STRING "Choose N2 FSW Version." FORCE)
66 set(SW_VERSION_N3 "0" CACHE STRING "Choose N3 FSW Version." FORCE)
66 set(SW_VERSION_N3 "0" CACHE STRING "Choose N3 FSW Version." FORCE)
67 set(SW_VERSION_N4 "7" CACHE STRING "Choose N4 FSW Version." FORCE)
67 set(SW_VERSION_N4 "8" CACHE STRING "Choose N4 FSW Version." FORCE)
68
68
69 if(FSW_verbose)
69 if(FSW_verbose)
70 add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)
70 add_definitions(-DPRINT_MESSAGES_ON_CONSOLE)
Show file before | Show file after | Hide comments
@@ -430,10 +430,10 rtems_task avgv_task(rtems_task_argument
430 current_v = waveform_picker_regs->v;
430 current_v = waveform_picker_regs->v;
431 current_e1 = waveform_picker_regs->e1;
431 current_e1 = waveform_picker_regs->e1;
432 current_e2 = waveform_picker_regs->e2;
432 current_e2 = waveform_picker_regs->e2;
433 if ( (current_v != old_v)
433 // if ( (current_v != old_v)
434 && (current_e1 != old_e1)
434 // && (current_e1 != old_e1)
435 && (current_e2 != old_e2))
435 // && (current_e2 != old_e2))
436 {
436 // {
437 // get new values
437 // get new values
438 newValue_v = getIntFromShort( current_v );
438 newValue_v = getIntFromShort( current_v );
439 newValue_e1 = getIntFromShort( current_e1 );
439 newValue_e1 = getIntFromShort( current_e1 );
@@ -461,7 +461,7 rtems_task avgv_task(rtems_task_argument
461 hk_lfr_sc_v_f3_as_int16 = (int16_t) (average_v / MOVING_AVERAGE );
461 hk_lfr_sc_v_f3_as_int16 = (int16_t) (average_v / MOVING_AVERAGE );
462 hk_lfr_sc_e1_f3_as_int16 = (int16_t) (average_e1 / MOVING_AVERAGE );
462 hk_lfr_sc_e1_f3_as_int16 = (int16_t) (average_e1 / MOVING_AVERAGE );
463 hk_lfr_sc_e2_f3_as_int16 = (int16_t) (average_e2 / MOVING_AVERAGE );
463 hk_lfr_sc_e2_f3_as_int16 = (int16_t) (average_e2 / MOVING_AVERAGE );
464 }
464 // }
465 old_v = current_v;
465 old_v = current_v;
466 old_e1 = current_e1;
466 old_e1 = current_e1;
467 old_e2 = current_e2;
467 old_e2 = current_e2;
General Comments 0
You need to be logged in to leave comments. Login now