diff --git a/src/src_user/Settings/SatelliteParameters/Sample/nanossoc_d60_parameters.c b/src/src_user/Settings/SatelliteParameters/Sample/nanossoc_d60_parameters.c index da9bf71e..783e9ec2 100644 --- a/src/src_user/Settings/SatelliteParameters/Sample/nanossoc_d60_parameters.c +++ b/src/src_user/Settings/SatelliteParameters/Sample/nanossoc_d60_parameters.c @@ -24,5 +24,5 @@ float NANOSSOC_D60_PARAMETERS_sun_intensity_lower_threshold_percent = 80.0f; float NANOSSOC_D60_PARAMETERS_sun_intensity_upper_threshold_percent = 120.0f; // Magnetic sensor bias calibration -const float NANOSSOC_D60_PARAMETERS_mag_bias_rm3100_aobc_compo_nT[PHYSICAL_CONST_THREE_DIM] = { 186.15f, 110.34f, 91.00f }; -const float NANOSSOC_D60_PARAMETERS_mag_bias_rm3100_ext_compo_nT[PHYSICAL_CONST_THREE_DIM] = { -19.59f, -69.73f, -39.56f }; +const float NANOSSOC_D60_PARAMETERS_mag_bias_rm3100_aobc_compo_nT[PHYSICAL_CONST_THREE_DIM] = { 215.09f, 92.66f, 169.0f }; +const float NANOSSOC_D60_PARAMETERS_mag_bias_rm3100_ext_compo_nT[PHYSICAL_CONST_THREE_DIM] = { 78.02f, 21.57f, 5.01f }; diff --git a/src/src_user/Settings/SatelliteParameters/Sample/oem7600_parameters.c b/src/src_user/Settings/SatelliteParameters/Sample/oem7600_parameters.c index d1c000e6..05fd37b7 100644 --- a/src/src_user/Settings/SatelliteParameters/Sample/oem7600_parameters.c +++ b/src/src_user/Settings/SatelliteParameters/Sample/oem7600_parameters.c @@ -22,4 +22,4 @@ double OEM7600_PARAMETERS_total_gps_time_spike_filter_config_reject_threshold_s double OEM7600_PARAMETERS_total_gps_time_spike_filter_config_amplitude_limit_to_accept_as_step_s = 3000.0; // Magnetic sensor bias calibration -const float OEM7600_PARAMETERS_mag_bias_rm3100_ext_compo_nT[PHYSICAL_CONST_THREE_DIM] = {-50.13f, 259.41f, -219.48f}; +const float OEM7600_PARAMETERS_mag_bias_rm3100_ext_compo_nT[PHYSICAL_CONST_THREE_DIM] = { 172.9f, 132.60f, -16.9f}; diff --git a/src/src_user/Settings/SatelliteParameters/Sample/rm3100_parameters.c b/src/src_user/Settings/SatelliteParameters/Sample/rm3100_parameters.c index c14fb8bf..adf40ec1 100644 --- a/src/src_user/Settings/SatelliteParameters/Sample/rm3100_parameters.c +++ b/src/src_user/Settings/SatelliteParameters/Sample/rm3100_parameters.c @@ -8,7 +8,7 @@ // AOBC RM3100 // Magnetometer bias // The following parameter should be tuned with magnetic experiment -const float RM3100_PARAMETERS_mag_aobc_bias_compo_nT[PHYSICAL_CONST_THREE_DIM] = { 2692.75f, -77195.48f, 25628.46f }; +const float RM3100_PARAMETERS_mag_aobc_bias_compo_nT[PHYSICAL_CONST_THREE_DIM] = { 30115.84f, -2553.2f, -3568.5f }; // Magnetometer filter // 1st order Low Pass Filter @@ -26,7 +26,7 @@ const Quaternion RM3100_PARAMETERS_mag_ext_quaternion_c2b = {-0.707106471, 0.707 // Magnetometer bias // The following parameter should be tuned with magnetic experiment -const float RM3100_PARAMETERS_mag_ext_bias_compo_nT[PHYSICAL_CONST_THREE_DIM] = { 36739.17f, -1727.35f, 3670.1f }; +const float RM3100_PARAMETERS_mag_ext_bias_compo_nT[PHYSICAL_CONST_THREE_DIM] = { 85.8f, -2869.13f, -4803.5f }; // Magnetometer filter // 1st order Low Pass Filter diff --git a/src/src_user/Settings/SatelliteParameters/Sample/sagitta_parameters.c b/src/src_user/Settings/SatelliteParameters/Sample/sagitta_parameters.c index 3aa553b0..22a24a68 100644 --- a/src/src_user/Settings/SatelliteParameters/Sample/sagitta_parameters.c +++ b/src/src_user/Settings/SatelliteParameters/Sample/sagitta_parameters.c @@ -13,6 +13,6 @@ double SAGITTA_PARAMETERS_q_i2b_spike_filter_config_reject_threshold_rad = PARAM double SAGITTA_PARAMETERS_q_i2b_spike_filter_config_amplitude_limit_to_accept_as_step_rad = PARAMETER_SETTING_MACRO_DEGREE_TO_RADIAN(0.6f); // Magnetic sensor bias calibration -const float SAGITTA_PARAMETERS_mag_bias_rm3100_ext_compo_nT[PHYSICAL_CONST_THREE_DIM] = { 16.28f, 107.19f, -81.11f }; //!< Magnetic sensor bias calibration +const float SAGITTA_PARAMETERS_mag_bias_rm3100_ext_compo_nT[PHYSICAL_CONST_THREE_DIM] = {71.50f, 70.20f, -14.3f}; //!< Magnetic sensor bias calibration // Sun intensity threshold diff --git a/src/src_user/Settings/SatelliteParameters/Sample/stim210_parameters.c b/src/src_user/Settings/SatelliteParameters/Sample/stim210_parameters.c index 72f40da5..b35cb981 100644 --- a/src/src_user/Settings/SatelliteParameters/Sample/stim210_parameters.c +++ b/src/src_user/Settings/SatelliteParameters/Sample/stim210_parameters.c @@ -30,4 +30,4 @@ const float STIM210_PARAMETERS_gyro_spike_reject_threshold_rad_s[PHYSICAL_CONST_ const float STIM210_PARAMETERS_gyro_spike_amplitude_limit_to_accept_as_step_rad_s[PHYSICAL_CONST_THREE_DIM] = { 0.002f, 0.002f, 0.002f }; // Magnetic sensor bias calibration -const float STIM210_mag_bias_rm3100_ext_compo_nT[PHYSICAL_CONST_THREE_DIM] = { -15.45f, 111.48f, -101.68f }; +const float STIM210_mag_bias_rm3100_ext_compo_nT[PHYSICAL_CONST_THREE_DIM] = { 86.94f, 43.95f, 30.08f}; diff --git a/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_oem7600.c b/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_oem7600.c index 181b9e15..3666efc9 100644 --- a/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_oem7600.c +++ b/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_oem7600.c @@ -60,9 +60,9 @@ void BCL_load_power_on_oem7600(void) #ifndef SILS_FW // TODO_L S2Eに電源ON/OFFでのバイアス変更機能を追加する // 磁気バイアス補正 BCL_tool_prepare_param_uint8(RM3100_IDX_ON_AOBC); - BCL_tool_prepare_param_float(654.19f); - BCL_tool_prepare_param_float(374.0f); - BCL_tool_prepare_param_float(348.14f); + BCL_tool_prepare_param_float(773.50f); + BCL_tool_prepare_param_float(292.5f); + BCL_tool_prepare_param_float(521.30f); BCL_tool_prepare_param_uint8(1); // Add BCL_tool_register_cmd(bc_cycle, Cmd_CODE_DI_RM3100_SET_MAG_BIAS_COMPO_NT); @@ -101,9 +101,9 @@ void BCL_load_power_off_oem7600(void) #ifndef SILS_FW // TODO_L S2Eに電源ON/OFFでのバイアス変更機能を追加する // 磁気バイアス補正 BCL_tool_prepare_param_uint8(RM3100_IDX_ON_AOBC); - BCL_tool_prepare_param_float(-654.19f); - BCL_tool_prepare_param_float(-374.0f); - BCL_tool_prepare_param_float(-348.14f); + BCL_tool_prepare_param_float(-773.50f); + BCL_tool_prepare_param_float(-292.5f); + BCL_tool_prepare_param_float(-521.30f); BCL_tool_prepare_param_uint8(1); // Add BCL_tool_register_cmd(bc_cycle, Cmd_CODE_DI_RM3100_SET_MAG_BIAS_COMPO_NT); diff --git a/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_sagitta.c b/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_sagitta.c index 4bd839cb..a4300d52 100644 --- a/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_sagitta.c +++ b/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_sagitta.c @@ -48,9 +48,9 @@ void BCL_load_power_on_sagitta(void) #ifndef SILS_FW // TODO_L S2Eに電源ON/OFFでのバイアス変更機能を追加する // 磁気バイアス補正 BCL_tool_prepare_param_uint8(RM3100_IDX_ON_AOBC); - BCL_tool_prepare_param_float(445.64f); - BCL_tool_prepare_param_float(478.48f); - BCL_tool_prepare_param_float(-885.402f); + BCL_tool_prepare_param_float(443.30f); + BCL_tool_prepare_param_float(640.9f); + BCL_tool_prepare_param_float(-1457.30f); BCL_tool_prepare_param_uint8(1); // Add BCL_tool_register_cmd(bc_cycle, Cmd_CODE_DI_RM3100_SET_MAG_BIAS_COMPO_NT); @@ -108,9 +108,9 @@ void BCL_load_power_off_sagitta(void) #ifndef SILS_FW // TODO_L S2Eに電源ON/OFFでのバイアス変更機能を追加する // 磁気バイアス補正 BCL_tool_prepare_param_uint8(RM3100_IDX_ON_AOBC); - BCL_tool_prepare_param_float(-445.64f); - BCL_tool_prepare_param_float(-478.48f); - BCL_tool_prepare_param_float(885.402f); + BCL_tool_prepare_param_float(-443.30f); + BCL_tool_prepare_param_float(-640.9f); + BCL_tool_prepare_param_float(1457.30f); BCL_tool_prepare_param_uint8(1); // Add BCL_tool_register_cmd(bc_cycle, Cmd_CODE_DI_RM3100_SET_MAG_BIAS_COMPO_NT); diff --git a/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_stim210.c b/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_stim210.c index b7273152..f6bfc5db 100644 --- a/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_stim210.c +++ b/src/src_user/TlmCmd/NormalBlockCommandDefinition/nbc_stim210.c @@ -47,9 +47,9 @@ void BCL_load_power_on_stim210(void) #ifndef SILS_FW // TODO_L S2Eに電源ON/OFFでのバイアス変更機能を追加する // 磁気バイアス補正 BCL_tool_prepare_param_uint8(RM3100_IDX_ON_AOBC); - BCL_tool_prepare_param_float(370.26f); - BCL_tool_prepare_param_float(224.98f); - BCL_tool_prepare_param_float(34.26f); + BCL_tool_prepare_param_float(364.75f); + BCL_tool_prepare_param_float(443.0f); + BCL_tool_prepare_param_float(-1061.14f); BCL_tool_prepare_param_uint8(1); // Add BCL_tool_register_cmd(bc_cycle, Cmd_CODE_DI_RM3100_SET_MAG_BIAS_COMPO_NT); @@ -130,9 +130,9 @@ void BCL_load_power_off_stim210(void) #ifndef SILS_FW // TODO_L S2Eに電源ON/OFFでのバイアス変更機能を追加する // 磁気バイアス補正 BCL_tool_prepare_param_uint8(RM3100_IDX_ON_AOBC); - BCL_tool_prepare_param_float(-370.26f); - BCL_tool_prepare_param_float(-224.98f); - BCL_tool_prepare_param_float(-34.26f); + BCL_tool_prepare_param_float(-364.75f); + BCL_tool_prepare_param_float(-443.0f); + BCL_tool_prepare_param_float(1061.14f); BCL_tool_prepare_param_uint8(1); // Add BCL_tool_register_cmd(bc_cycle, Cmd_CODE_DI_RM3100_SET_MAG_BIAS_COMPO_NT);