Merge pull request #663 from ut-issl/feature/refactor-settings

Feature/refactor settings
ut-issl · Aug 9, 2024 · 8d31bf6 · 8d31bf6
2 parents fd45f1a + 159361f
commit 8d31bf6
Show file tree

Hide file tree

Showing 46 changed files with 408 additions and 48 deletions.
diff --git a/scripts/Plot/plot_gs_visibility.py b/scripts/Plot/plot_gs_visibility.py
@@ -43,7 +43,7 @@
 print("log: " + read_file_tag)
 
 # Read Gound Station position from the ini file in the logs directory
-gs_ini_file_name  = path_to_logs + '/' + 'logs_' + read_file_tag + "/sample_ground_station.ini"
+gs_ini_file_name  = path_to_logs + '/' + 'logs_' + read_file_tag + "/ground_station.ini"
 configur = ConfigParser(comment_prefixes=('#', ';', '//'), inline_comment_prefixes=('#', ';', '//'))
 configur.read(gs_ini_file_name)
 gs_lat_deg = configur.getfloat('GROUND_STATION_0', 'latitude_deg')

diff --git a/settings/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini b/settings/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini
diff --git a/settings/gnss/final_products/.gitkeep → .../environment/gnss/final_products/.gitkeep b/settings/gnss/final_products/.gitkeep → .../environment/gnss/final_products/.gitkeep
diff --git a/settings/sample_gnss.ini → settings/environment/sample_gnss.ini b/settings/sample_gnss.ini → settings/environment/sample_gnss.ini
@@ -1,5 +1,5 @@
 [GNSS_SATELLITES]
-directory_path = INI_FILE_DIR_FROM_EXE/gnss/final_products/
+directory_path = INI_FILE_DIR_FROM_EXE/environment/gnss/final_products/
 calculation = DISABLE
 logging = DISABLE
 

diff --git a/settings/sample_ground_station.ini b/settings/sample_ground_station.ini
diff --git a/...iles/sample_antenna_radiation_pattern.csv → ...iles/sample_antenna_radiation_pattern.csv b/...iles/sample_antenna_radiation_pattern.csv → ...iles/sample_antenna_radiation_pattern.csv
diff --git a/...ngs/components/ground_station_antenna.ini → ...ion/components/ground_station_antenna.ini b/...ngs/components/ground_station_antenna.ini → ...ion/components/ground_station_antenna.ini
@@ -65,7 +65,7 @@ rx_antenna_gain_model = ISOTROPIC
 rx_gain_dBi = 43.27
 
 // Antenna radiation pattern CSV file path
-rx_antenna_radiation_pattern_file = INI_FILE_DIR_FROM_EXE/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
+rx_antenna_radiation_pattern_file = INI_FILE_DIR_FROM_EXE/sample_ground_station/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
 // General information of the CSV file
 rx_length_theta = 360
 rx_length_phi = 181

diff --git a/.../components/ground_station_calculator.ini → .../components/ground_station_calculator.ini b/.../components/ground_station_calculator.ini → .../components/ground_station_calculator.ini
diff --git a/settings/sample_ground_station/ground_station.ini b/settings/sample_ground_station/ground_station.ini
@@ -0,0 +1,12 @@
+[GROUND_STATION_0]
+// Position of the ground station
+latitude_deg = 26.140837
+longitude_deg = 127.661483
+height_m = 3.4
+
+// The minimum limit of elevation to work the station
+elevation_limit_angle_deg = 5.0
+
+[COMPONENT_FILES]
+ground_station_antenna_file = INI_FILE_DIR_FROM_EXE/sample_ground_station/components/ground_station_antenna.ini
+ground_station_calculator_file = INI_FILE_DIR_FROM_EXE/sample_ground_station/components/ground_station_calculator.ini
diff --git a/.../components/angular_velocity_observer.ini → .../components/angular_velocity_observer.ini b/.../components/angular_velocity_observer.ini → .../components/angular_velocity_observer.ini
diff --git a/...llite/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv b/...llite/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
diff --git a/settings/components/attitude_observer.ini → ...atellite/components/attitude_observer.ini b/settings/components/attitude_observer.ini → ...atellite/components/attitude_observer.ini
diff --git a/settings/components/battery.ini → ...s/sample_satellite/components/battery.ini b/settings/components/battery.ini → ...s/sample_satellite/components/battery.ini
diff --git a/...ngs/components/component_interference.ini → ...ite/components/component_interference.ini b/...ngs/components/component_interference.ini → ...ite/components/component_interference.ini
diff --git a/settings/components/force_generator.ini → ..._satellite/components/force_generator.ini b/settings/components/force_generator.ini → ..._satellite/components/force_generator.ini
diff --git a/settings/components/gnss_receiver.ini → ...le_satellite/components/gnss_receiver.ini b/settings/components/gnss_receiver.ini → ...le_satellite/components/gnss_receiver.ini
diff --git a/settings/components/gyro_sensor.ini → ...mple_satellite/components/gyro_sensor.ini b/settings/components/gyro_sensor.ini → ...mple_satellite/components/gyro_sensor.ini
diff --git a/settings/components/magnetometer.ini → ...ple_satellite/components/magnetometer.ini b/settings/components/magnetometer.ini → ...ple_satellite/components/magnetometer.ini
diff --git a/settings/components/magnetorquer.ini → ...ple_satellite/components/magnetorquer.ini b/settings/components/magnetorquer.ini → ...ple_satellite/components/magnetorquer.ini
diff --git a/settings/components/orbit_observer.ini → ...e_satellite/components/orbit_observer.ini b/settings/components/orbit_observer.ini → ...e_satellite/components/orbit_observer.ini
diff --git a/settings/components/pcu_initial_study.ini → ...atellite/components/pcu_initial_study.ini b/settings/components/pcu_initial_study.ini → ...atellite/components/pcu_initial_study.ini
diff --git a/settings/components/reaction_wheel.ini → ...e_satellite/components/reaction_wheel.ini b/settings/components/reaction_wheel.ini → ...e_satellite/components/reaction_wheel.ini
@@ -56,8 +56,8 @@ jitter_logging = DISABLE
 // prescaler for calculation of RW jitter
 // To calculate the jitter, set the update cycle to about 0.1 ms.
 fast_prescaler = 1
-radial_force_harmonics_coefficient_file = INI_FILE_DIR_FROM_EXE/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv
-radial_torque_harmonics_coefficient_file = INI_FILE_DIR_FROM_EXE/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv
+radial_force_harmonics_coefficient_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv
+radial_torque_harmonics_coefficient_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv
 harmonics_degree = 12
 considers_structural_resonance = DISABLE
 structural_resonance_frequency_Hz = 585.0 //[Hz]

diff --git a/...s/radial_force_harmonics_coefficients.csv → ...s/radial_force_harmonics_coefficients.csv b/...s/radial_force_harmonics_coefficients.csv → ...s/radial_force_harmonics_coefficients.csv
diff --git a/.../radial_torque_harmonics_coefficients.csv → .../radial_torque_harmonics_coefficients.csv b/.../radial_torque_harmonics_coefficients.csv → .../radial_torque_harmonics_coefficients.csv
diff --git a/settings/components/solar_array_panel.ini → ...atellite/components/solar_array_panel.ini b/settings/components/solar_array_panel.ini → ...atellite/components/solar_array_panel.ini
diff --git a/settings/components/spacecraft_antenna.ini → ...tellite/components/spacecraft_antenna.ini b/settings/components/spacecraft_antenna.ini → ...tellite/components/spacecraft_antenna.ini
@@ -37,7 +37,7 @@ tx_antenna_gain_model = RADIATION_PATTERN_CSV
 tx_gain_dBi = 8.0
 
 // Antenna radiation pattern CSV file path
-tx_antenna_radiation_pattern_file = INI_FILE_DIR_FROM_EXE/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
+tx_antenna_radiation_pattern_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
 // General information of the CSV file
 tx_length_theta = 360
 tx_length_phi = 181
@@ -65,7 +65,7 @@ rx_antenna_gain_model = RADIATION_PATTERN_CSV
 rx_gain_dBi = 43.27
 
 // Antenna radiation pattern CSV file path
-rx_antenna_radiation_pattern_file = INI_FILE_DIR_FROM_EXE/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
+rx_antenna_radiation_pattern_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv
 // General information of the CSV file
 rx_length_theta = 360
 rx_length_phi = 181

diff --git a/settings/components/star_sensor.ini → ...mple_satellite/components/star_sensor.ini b/settings/components/star_sensor.ini → ...mple_satellite/components/star_sensor.ini
diff --git a/settings/components/sun_sensor.ini → ...ample_satellite/components/sun_sensor.ini b/settings/components/sun_sensor.ini → ...ample_satellite/components/sun_sensor.ini
diff --git a/settings/components/telescope.ini → ...sample_satellite/components/telescope.ini b/settings/components/telescope.ini → ...sample_satellite/components/telescope.ini
diff --git a/settings/components/thermal_components.ini → ...tellite/components/thermal_components.ini b/settings/components/thermal_components.ini → ...tellite/components/thermal_components.ini
diff --git a/settings/components/thruster.ini → .../sample_satellite/components/thruster.ini b/settings/components/thruster.ini → .../sample_satellite/components/thruster.ini
diff --git a/settings/components/torque_generator.ini → ...satellite/components/torque_generator.ini b/settings/components/torque_generator.ini → ...satellite/components/torque_generator.ini
diff --git a/...nder_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv → ...nder_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv b/...nder_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv → ...nder_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv
diff --git a/...s/wings_command_sender_to_c2a/example.ops → ...s/wings_command_sender_to_c2a/example.ops b/...s/wings_command_sender_to_c2a/example.ops → ...s/wings_command_sender_to_c2a/example.ops
diff --git a/...s/sample_satellite/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini b/...s/sample_satellite/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini
@@ -0,0 +1,5 @@
+[WINGS_COMMAND_SENDER_TO_C2A]
+command_send_enable = ENABLE
+prescaler = 1
+c2a_command_database_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv
+wings_operation_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/wings_command_sender_to_c2a/example.ops
diff --git a/settings/sample_disturbance.ini → settings/sample_satellite/disturbance.ini b/settings/sample_disturbance.ini → settings/sample_satellite/disturbance.ini
diff --git a/settings/sample_local_environment.ini → ...gs/sample_satellite/local_environment.ini b/settings/sample_local_environment.ini → ...gs/sample_satellite/local_environment.ini
diff --git a/settings/sample_satellite.ini → settings/sample_satellite/satellite.ini b/settings/sample_satellite.ini → settings/sample_satellite/satellite.ini
@@ -128,27 +128,27 @@ error_tolerance = 0.0001
 calculation = DISABLE
 debug = DISABLE
 solar_calc_setting = DISABLE
-thermal_file_directory = INI_FILE_DIR_FROM_EXE/thermal_csv_files/
+thermal_file_directory = INI_FILE_DIR_FROM_EXE/sample_satellite/thermal_csv_files/
 
 [SETTING_FILES]
-local_environment_file = INI_FILE_DIR_FROM_EXE/sample_local_environment.ini
-disturbance_file  = INI_FILE_DIR_FROM_EXE/sample_disturbance.ini
-structure_file = INI_FILE_DIR_FROM_EXE/sample_structure.ini
+local_environment_file = INI_FILE_DIR_FROM_EXE/sample_satellite/local_environment.ini
+disturbance_file  = INI_FILE_DIR_FROM_EXE/sample_satellite/disturbance.ini
+structure_file = INI_FILE_DIR_FROM_EXE/sample_satellite/structure.ini
 
 [COMPONENT_FILES]
-gyro_file = INI_FILE_DIR_FROM_EXE/components/gyro_sensor.ini
-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
-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
-torque_generator_file = INI_FILE_DIR_FROM_EXE/components/torque_generator.ini
-angular_velocity_observer_file = INI_FILE_DIR_FROM_EXE/components/angular_velocity_observer.ini
-attitude_observer_file = INI_FILE_DIR_FROM_EXE/components/attitude_observer.ini
-orbit_observer_file = INI_FILE_DIR_FROM_EXE/components/orbit_observer.ini
-antenna_file = INI_FILE_DIR_FROM_EXE/components/spacecraft_antenna.ini
-component_interference_file = INI_FILE_DIR_FROM_EXE/components/component_interference.ini
-telescope_file = INI_FILE_DIR_FROM_EXE/components/telescope.ini
+gyro_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/gyro_sensor.ini
+magnetometer_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/magnetometer.ini
+stt_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/star_sensor.ini
+ss_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/sun_sensor.ini
+gnss_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/gnss_receiver.ini
+magnetorquer_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/magnetorquer.ini
+rw_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/reaction_wheel.ini
+thruster_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/thruster.ini
+force_generator_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/force_generator.ini
+torque_generator_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/torque_generator.ini
+angular_velocity_observer_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/angular_velocity_observer.ini
+attitude_observer_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/attitude_observer.ini
+orbit_observer_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/orbit_observer.ini
+antenna_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/spacecraft_antenna.ini
+component_interference_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/component_interference.ini
+telescope_file = INI_FILE_DIR_FROM_EXE/sample_satellite/components/telescope.ini
diff --git a/settings/sample_structure.ini → settings/sample_satellite/structure.ini b/settings/sample_structure.ini → settings/sample_satellite/structure.ini
diff --git a/settings/thermal_csv_files/cij.csv → ...ample_satellite/thermal_csv_files/cij.csv b/settings/thermal_csv_files/cij.csv → ...ample_satellite/thermal_csv_files/cij.csv
diff --git a/settings/thermal_csv_files/heaters.csv → ...e_satellite/thermal_csv_files/heaters.csv b/settings/thermal_csv_files/heaters.csv → ...e_satellite/thermal_csv_files/heaters.csv
diff --git a/settings/thermal_csv_files/heatload.csv → ..._satellite/thermal_csv_files/heatload.csv b/settings/thermal_csv_files/heatload.csv → ..._satellite/thermal_csv_files/heatload.csv
diff --git a/settings/thermal_csv_files/node.csv → ...mple_satellite/thermal_csv_files/node.csv b/settings/thermal_csv_files/node.csv → ...mple_satellite/thermal_csv_files/node.csv
diff --git a/settings/thermal_csv_files/rij.csv → ...ample_satellite/thermal_csv_files/rij.csv b/settings/thermal_csv_files/rij.csv → ...ample_satellite/thermal_csv_files/rij.csv
diff --git a/settings/sample_simulation_base.ini b/settings/sample_simulation_base.ini
@@ -144,7 +144,7 @@ save_initialize_files = ENABLE
 // If you want to add a ground station, create the corresponding ground_station.ini, and specify it as ground_station_file(1), ground_station_file(2), ect.
 number_of_simulated_spacecraft = 1
 number_of_simulated_ground_station = 1
-spacecraft_file(0)      = INI_FILE_DIR_FROM_EXE/sample_satellite.ini
-ground_station_file(0)  = INI_FILE_DIR_FROM_EXE/sample_ground_station.ini
-gnss_file               = INI_FILE_DIR_FROM_EXE/sample_gnss.ini
+spacecraft_file(0)      = INI_FILE_DIR_FROM_EXE/sample_satellite/satellite.ini
+ground_station_file(0)  = INI_FILE_DIR_FROM_EXE/sample_ground_station/ground_station.ini
+gnss_file               = INI_FILE_DIR_FROM_EXE/environment/sample_gnss.ini
 log_file_save_directory = ../../logs/
diff --git a/src/s2e.cpp b/src/s2e.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
   system_clock::time_point start, end;
   start = system_clock::now();
 
-  std::string data_path = "../../data/";
+  std::string data_path = "../../";
   std::string ini_path = INI_FILE_DIR_FROM_EXE;
   std::string ini_file = ini_path + "/sample_simulation_base.ini";