diff --git a/data/sample/initialize_files/sample_gnss.ini b/data/sample/initialize_files/sample_gnss.ini index 812d9c668..081b5672a 100644 --- a/data/sample/initialize_files/sample_gnss.ini +++ b/data/sample/initialize_files/sample_gnss.ini @@ -1,4 +1,4 @@ -[GNSS_SATELLIES] +[GNSS_SATELLITES] directory_path = EXT_LIB_DIR_FROM_EXE/sp3/ calculation = DISABLE diff --git a/data/sample/initialize_files/sample_satellite.ini b/data/sample/initialize_files/sample_satellite.ini index ce610f401..11945da77 100644 --- a/data/sample/initialize_files/sample_satellite.ini +++ b/data/sample/initialize_files/sample_satellite.ini @@ -139,7 +139,7 @@ magnetometer_file = INI_FILE_DIR_FROM_EXE/components/magnetometer.ini stt_file = INI_FILE_DIR_FROM_EXE/components/star_sensor.ini ss_file = INI_FILE_DIR_FROM_EXE/components/sun_sensor.ini gnss_file = INI_FILE_DIR_FROM_EXE/components/gnss_receiver.ini -magetorquer_file = INI_FILE_DIR_FROM_EXE/components/magnetorquer.ini +magnetorquer_file = INI_FILE_DIR_FROM_EXE/components/magnetorquer.ini rw_file = INI_FILE_DIR_FROM_EXE/components/reaction_wheel.ini thruster_file = INI_FILE_DIR_FROM_EXE/components/thruster.ini force_generator_file = INI_FILE_DIR_FROM_EXE/components/force_generator.ini diff --git a/src/components/examples/example_serial_communication_for_hils.hpp b/src/components/examples/example_serial_communication_for_hils.hpp index 1f9ca4e86..682d4afe0 100644 --- a/src/components/examples/example_serial_communication_for_hils.hpp +++ b/src/components/examples/example_serial_communication_for_hils.hpp @@ -58,7 +58,7 @@ class ExampleSerialCommunicationForHils : public Component, public UartCommunica const int mode_id_; //!< Mode ID to select sender(0) or responder(1) int counter_ = 0; //!< Internal counter - // Override functions for ObcComunication + // Override functions for ObcCommunication /** * @fn ParseCommand * @brief Parse command received from OnBoardComputer diff --git a/src/components/examples/example_serial_communication_with_obc.cpp b/src/components/examples/example_serial_communication_with_obc.cpp index c5b6f83de..4042fbcb1 100644 --- a/src/components/examples/example_serial_communication_with_obc.cpp +++ b/src/components/examples/example_serial_communication_with_obc.cpp @@ -52,5 +52,5 @@ void ExampleSerialCommunicationWithObc::MainRoutine(const int time_count) { } void ExampleSerialCommunicationWithObc::GpioStateChanged(const int port_id, const bool is_positive_edge) { - printf("interrupted. portid = %d, isPosedge = %d./n", port_id, is_positive_edge); + printf("interrupted. port id = %d, is positive edge = %d./n", port_id, is_positive_edge); } diff --git a/src/components/real/cdh/on_board_computer_with_c2a.hpp b/src/components/real/cdh/on_board_computer_with_c2a.hpp index 492e0794c..c194f70e4 100644 --- a/src/components/real/cdh/on_board_computer_with_c2a.hpp +++ b/src/components/real/cdh/on_board_computer_with_c2a.hpp @@ -153,7 +153,7 @@ class ObcWithC2a : public OnBoardComputer { * @param [in] length: Length of data * @return 0 */ - int I2cComponentWriteRegister(int port_id, const unsigned char i2c_address, const unsigned char rregister_address, const unsigned char* data, + int I2cComponentWriteRegister(int port_id, const unsigned char i2c_address, const unsigned char register_address, const unsigned char* data, const unsigned char length) override; /** * @fn I2cComponentReadRegister diff --git a/src/components/real/mission/telescope.cpp b/src/components/real/mission/telescope.cpp index 462025d6c..0b4b87e31 100644 --- a/src/components/real/mission/telescope.cpp +++ b/src/components/real/mission/telescope.cpp @@ -68,7 +68,7 @@ void Telescope::MainRoutine(const int time_count) { Observe(earth_position_image_sensor, local_celestial_information_->GetPositionFromSpacecraft_b_m("EARTH")); Observe(moon_position_image_sensor, local_celestial_information_->GetPositionFromSpacecraft_b_m("MOON")); // Position calculation of stars from Hipparcos Catalogue - // No update when Hipparocos Catalogue was not readed + // No update when Hipparcos Catalogue was not read if (hipparcos_->IsCalcEnabled) ObserveStars(); // Debug ****************************************************************** // sun_pos_c = quaternion_b2c_.FrameConversion(dynamics_->celestial_->GetPositionFromSpacecraft_b_m("SUN")); diff --git a/src/components/real/propulsion/simple_thruster.cpp b/src/components/real/propulsion/simple_thruster.cpp index dd3796698..31078a501 100644 --- a/src/components/real/propulsion/simple_thruster.cpp +++ b/src/components/real/propulsion/simple_thruster.cpp @@ -123,8 +123,8 @@ libra::Vector<3> SimpleThruster::CalcThrustDirection() { SimpleThruster InitSimpleThruster(ClockGenerator* clock_generator, int thruster_id, const std::string file_name, const Structure* structure, const Dynamics* dynamics) { IniAccess thruster_conf(file_name); - std::string sectionstr = "THRUSTER_" + std::to_string(thruster_id); - auto* Section = sectionstr.c_str(); + std::string section_str = "THRUSTER_" + std::to_string(thruster_id); + auto* Section = section_str.c_str(); int prescaler = thruster_conf.ReadInt(Section, "prescaler"); if (prescaler <= 1) prescaler = 1; @@ -151,8 +151,8 @@ SimpleThruster InitSimpleThruster(ClockGenerator* clock_generator, int thruster_ SimpleThruster InitSimpleThruster(ClockGenerator* clock_generator, PowerPort* power_port, int thruster_id, const std::string file_name, const Structure* structure, const Dynamics* dynamics) { IniAccess thruster_conf(file_name); - std::string sectionstr = "THRUSTER_" + std::to_string(thruster_id); - auto* Section = sectionstr.c_str(); + std::string section_str = "THRUSTER_" + std::to_string(thruster_id); + auto* Section = section_str.c_str(); int prescaler = thruster_conf.ReadInt(Section, "prescaler"); if (prescaler <= 1) prescaler = 1; diff --git a/src/environment/global/initialize_gnss_satellites.cpp b/src/environment/global/initialize_gnss_satellites.cpp index debbc3b85..4d06ce79c 100644 --- a/src/environment/global/initialize_gnss_satellites.cpp +++ b/src/environment/global/initialize_gnss_satellites.cpp @@ -9,7 +9,7 @@ #include #include -std::string return_dirctory_path(std::string sort) { +std::string return_directory_path(std::string sort) { std::string main_directory, sub_directory; if (sort.substr(0, 2) == "IG") { @@ -66,7 +66,7 @@ void get_raw_contents(std::string directory_path, std::string file_name, std::ve void get_sp3_file_contents(std::string directory_path, std::string file_sort, std::string first, std::string last, std::vector>& file_contents, UltraRapidMode& ur_flag) { - std::string all_directory_path = directory_path + return_dirctory_path(file_sort); + std::string all_directory_path = directory_path + return_directory_path(file_sort); ur_flag = kNotUse; if (first.substr(0, 3) == "COD") { @@ -177,7 +177,7 @@ void get_sp3_file_contents(std::string directory_path, std::string file_sort, st void get_clk_file_contents(std::string directory_path, std::string extension, std::string file_sort, std::string first, std::string last, std::vector>& file_contents) { - std::string all_directory_path = directory_path + return_dirctory_path(file_sort) + extension.substr(1) + '/'; + std::string all_directory_path = directory_path + return_directory_path(file_sort) + extension.substr(1) + '/'; if (file_sort.find("Ultra") != std::string::npos) { std::string file_header, file_footer; @@ -256,7 +256,7 @@ void get_clk_file_contents(std::string directory_path, std::string extension, st GnssSatellites* InitGnssSatellites(std::string file_name) { IniAccess ini_file(file_name); - char section[] = "GNSS_SATELLIES"; + char section[] = "GNSS_SATELLITES"; GnssSatellites* gnss_satellites = new GnssSatellites(ini_file.ReadEnable(section, "calculation")); if (!gnss_satellites->IsCalcEnabled()) { return gnss_satellites; diff --git a/src/simulation_sample/spacecraft/sample_components.cpp b/src/simulation_sample/spacecraft/sample_components.cpp index 8ab6660c0..8b5094374 100644 --- a/src/simulation_sample/spacecraft/sample_components.cpp +++ b/src/simulation_sample/spacecraft/sample_components.cpp @@ -61,7 +61,7 @@ SampleComponents::SampleComponents(const Dynamics* dynamics, Structure* structur &(global_environment_->GetGnssSatellites()), &(global_environment_->GetSimulationTime()))); // Magnetorquer - file_name = iniAccess.ReadString("COMPONENT_FILES", "magetorquer_file"); + file_name = iniAccess.ReadString("COMPONENT_FILES", "magnetorquer_file"); configuration_->main_logger_->CopyFileToLogDirectory(file_name); magnetorquer_ = new Magnetorquer(InitMagnetorquer(clock_generator, pcu_->GetPowerPort(2), 1, file_name, global_environment_->GetSimulationTime().GetComponentStepTime_s(),