diff --git a/.hgsubstate b/.hgsubstate --- a/.hgsubstate +++ b/.hgsubstate @@ -1,2 +1,2 @@ 3081d1f9bb20b2b64a192585337a292a9804e0c5 LFR_basic-parameters -058c1234c2defe215d3dd655a7ef65abb33c922d header/lfr_common_headers +21ada91882790323b08a38518ed1af5a36fa4deb header/lfr_common_headers diff --git a/src/fsw_misc.c b/src/fsw_misc.c --- a/src/fsw_misc.c +++ b/src/fsw_misc.c @@ -744,12 +744,12 @@ void set_sy_lfr_pas_filter_enabled( bool if (state == true) { housekeeping_packet.lfr_status_word[1] = - housekeeping_packet.lfr_status_word[1] | STATUS_WORD_SC_POTENTIAL_FLAG_BIT; // [0010 0000] + housekeeping_packet.lfr_status_word[1] | STATUS_WORD_PAS_FILTER_ENABLED_BIT; // [0010 0000] } else { housekeeping_packet.lfr_status_word[1] = - housekeeping_packet.lfr_status_word[1] & STATUS_WORD_SC_POTENTIAL_FLAG_MASK; // [1101 1111] + housekeeping_packet.lfr_status_word[1] & STATUS_WORD_PAS_FILTER_ENABLED_MASK; // [1101 1111] } } diff --git a/src/tc_load_dump_parameters.c b/src/tc_load_dump_parameters.c --- a/src/tc_load_dump_parameters.c +++ b/src/tc_load_dump_parameters.c @@ -1535,23 +1535,6 @@ void floatToChar( float value, unsigned ptr[BYTE_1] = valuePtr[BYTE_1]; ptr[BYTE_2] = valuePtr[BYTE_2]; ptr[BYTE_3] = valuePtr[BYTE_3]; - - // - printf("\n\n\n"); - - float aux = NAN; - unsigned char* auxPtr; - auxPtr = (unsigned char*) &aux; - - printf("aux = %f, value = %f\n", aux, value); - - auxPtr[BYTE_0] = valuePtr[BYTE_0]; - auxPtr[BYTE_1] = valuePtr[BYTE_1]; - auxPtr[BYTE_2] = valuePtr[BYTE_2]; - auxPtr[BYTE_3] = valuePtr[BYTE_3]; - - printf("aux = %f\n", aux); - // } //**********