diff --git a/data/initialize_files/components/rm3100_external.ini b/data/initialize_files/components/rm3100_external.ini index fef4930..f430a3d 100644 --- a/data/initialize_files/components/rm3100_external.ini +++ b/data/initialize_files/components/rm3100_external.ini @@ -45,6 +45,9 @@ normal_random_standard_deviation_c_nT(2) = 15.0 range_to_constant_nT = 1.0e6 // smaller than Range_to_zero range_to_zero_nT = 1.5e6 +[I2C_PORT_2] +i2c_address = 0x23 + [POWER_PORT] minimum_voltage_V = 3.3 // V assumed_power_consumption_W = 0.03 //W diff --git a/example/data/initialize_files/components/rm3100_external.ini b/example/data/initialize_files/components/rm3100_external.ini index fef4930..f430a3d 100644 --- a/example/data/initialize_files/components/rm3100_external.ini +++ b/example/data/initialize_files/components/rm3100_external.ini @@ -45,6 +45,9 @@ normal_random_standard_deviation_c_nT(2) = 15.0 range_to_constant_nT = 1.0e6 // smaller than Range_to_zero range_to_zero_nT = 1.5e6 +[I2C_PORT_2] +i2c_address = 0x23 + [POWER_PORT] minimum_voltage_V = 3.3 // V assumed_power_consumption_W = 0.03 //W diff --git a/src/simulation/spacecraft/aocs_module_components.cpp b/src/simulation/spacecraft/aocs_module_components.cpp index 12eccbb..4b52aa1 100644 --- a/src/simulation/spacecraft/aocs_module_components.cpp +++ b/src/simulation/spacecraft/aocs_module_components.cpp @@ -75,9 +75,11 @@ AocsModuleComponents::AocsModuleComponents(const Dynamics *dynamics, Structure * 0, rm3100_aobc_hils_port_id, 0x20, aobc_, hils_port_manager_); const std::string rm3100_ext_ini_path = iniAccess.ReadString("COMPONENTS_FILE", "magsensor_h_ext_file"); const unsigned int rm3100_ext_hils_port_id = iniAccess.ReadInt("COM_PORT", "rm3100_ext_hils_port_id"); + IniAccess rm3100_ext_ini_access = IniAccess(rm3100_ext_ini_path); + const uint8_t rm3100_ext_i2c_address = (uint8_t)rm3100_ext_ini_access.ReadInt("I2C_PORT_2", "i2c_address"); rm3100_ext_ = new RM3100(Magnetometer(InitMagnetometer(clock_generator, power_controller_->GetPowerPort((int)PowerPortIdx::RM), 2, rm3100_ext_ini_path, compo_step_sec, &local_environment_->GetGeomagneticField())), - 0, rm3100_ext_hils_port_id, 0x23, aobc_, hils_port_manager_); + 0, rm3100_ext_hils_port_id, rm3100_ext_i2c_address, aobc_, hils_port_manager_); const std::string nanoSSOC_D60_ini_path = iniAccess.ReadString("COMPONENTS_FILE", "ss_file"); const unsigned int nanoSSOC_D60_pz_hils_port_id = iniAccess.ReadInt("COM_PORT", "nanoSSOC_D60_pz_hils_port_id");