From dbd58835685c517c5fbbbf0a1fe089e303ea5123 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sat, 20 Jul 2024 18:18:06 +0900 Subject: [PATCH 01/17] Move and rename initialize_files --- .../components/angular_velocity_observer.ini | 0 .../sample_antenna_radiation_pattern.csv | 0 .../components/attitude_observer.ini | 0 {data/sample/initialize_files => settings}/components/battery.ini | 0 .../components/component_interference.ini | 0 .../initialize_files => settings}/components/force_generator.ini | 0 .../initialize_files => settings}/components/gnss_receiver.ini | 0 .../components/ground_station_antenna.ini | 0 .../components/ground_station_calculator.ini | 0 .../initialize_files => settings}/components/gyro_sensor.ini | 0 .../initialize_files => settings}/components/magnetometer.ini | 0 .../initialize_files => settings}/components/magnetorquer.ini | 0 .../initialize_files => settings}/components/orbit_observer.ini | 0 .../components/pcu_initial_study.ini | 0 .../initialize_files => settings}/components/reaction_wheel.ini | 0 .../radial_force_harmonics_coefficients.csv | 0 .../radial_torque_harmonics_coefficients.csv | 0 .../components/solar_array_panel.ini | 0 .../components/spacecraft_antenna.ini | 0 .../initialize_files => settings}/components/star_sensor.ini | 0 .../initialize_files => settings}/components/sun_sensor.ini | 0 .../sample/initialize_files => settings}/components/telescope.ini | 0 .../components/thermal_components.ini | 0 .../sample/initialize_files => settings}/components/thruster.ini | 0 .../initialize_files => settings}/components/torque_generator.ini | 0 .../wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv | 0 .../components/wings_command_sender_to_c2a/example.ops | 0 .../wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini | 0 .../initialize_files => settings}/gnss/final_products/.gitkeep | 0 {data/sample/initialize_files => settings}/sample_disturbance.ini | 0 {data/sample/initialize_files => settings}/sample_gnss.ini | 0 .../initialize_files => settings}/sample_ground_station.ini | 0 .../sample_inter_satellite_communication.ini | 0 .../initialize_files => settings}/sample_local_environment.ini | 0 {data/sample/initialize_files => settings}/sample_satellite.ini | 0 .../initialize_files => settings}/sample_simulation_base.ini | 0 {data/sample/initialize_files => settings}/sample_structure.ini | 0 .../initialize_files => settings}/thermal_csv_files/cij.csv | 0 .../initialize_files => settings}/thermal_csv_files/heaters.csv | 0 .../initialize_files => settings}/thermal_csv_files/heatload.csv | 0 .../initialize_files => settings}/thermal_csv_files/node.csv | 0 .../initialize_files => settings}/thermal_csv_files/rij.csv | 0 42 files changed, 0 insertions(+), 0 deletions(-) rename {data/sample/initialize_files => settings}/components/angular_velocity_observer.ini (100%) rename {data/sample/initialize_files => settings}/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv (100%) rename {data/sample/initialize_files => settings}/components/attitude_observer.ini (100%) rename {data/sample/initialize_files => settings}/components/battery.ini (100%) rename {data/sample/initialize_files => settings}/components/component_interference.ini (100%) rename {data/sample/initialize_files => settings}/components/force_generator.ini (100%) rename {data/sample/initialize_files => settings}/components/gnss_receiver.ini (100%) rename {data/sample/initialize_files => settings}/components/ground_station_antenna.ini (100%) rename {data/sample/initialize_files => settings}/components/ground_station_calculator.ini (100%) rename {data/sample/initialize_files => settings}/components/gyro_sensor.ini (100%) rename {data/sample/initialize_files => settings}/components/magnetometer.ini (100%) rename {data/sample/initialize_files => settings}/components/magnetorquer.ini (100%) rename {data/sample/initialize_files => settings}/components/orbit_observer.ini (100%) rename {data/sample/initialize_files => settings}/components/pcu_initial_study.ini (100%) rename {data/sample/initialize_files => settings}/components/reaction_wheel.ini (100%) rename {data/sample/initialize_files => settings}/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv (100%) rename {data/sample/initialize_files => settings}/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv (100%) rename {data/sample/initialize_files => settings}/components/solar_array_panel.ini (100%) rename {data/sample/initialize_files => settings}/components/spacecraft_antenna.ini (100%) rename {data/sample/initialize_files => settings}/components/star_sensor.ini (100%) rename {data/sample/initialize_files => settings}/components/sun_sensor.ini (100%) rename {data/sample/initialize_files => settings}/components/telescope.ini (100%) rename {data/sample/initialize_files => settings}/components/thermal_components.ini (100%) rename {data/sample/initialize_files => settings}/components/thruster.ini (100%) rename {data/sample/initialize_files => settings}/components/torque_generator.ini (100%) rename {data/sample/initialize_files => settings}/components/wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv (100%) rename {data/sample/initialize_files => settings}/components/wings_command_sender_to_c2a/example.ops (100%) rename {data/sample/initialize_files => settings}/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini (100%) rename {data/sample/initialize_files => settings}/gnss/final_products/.gitkeep (100%) rename {data/sample/initialize_files => settings}/sample_disturbance.ini (100%) rename {data/sample/initialize_files => settings}/sample_gnss.ini (100%) rename {data/sample/initialize_files => settings}/sample_ground_station.ini (100%) rename {data/sample/initialize_files => settings}/sample_inter_satellite_communication.ini (100%) rename {data/sample/initialize_files => settings}/sample_local_environment.ini (100%) rename {data/sample/initialize_files => settings}/sample_satellite.ini (100%) rename {data/sample/initialize_files => settings}/sample_simulation_base.ini (100%) rename {data/sample/initialize_files => settings}/sample_structure.ini (100%) rename {data/sample/initialize_files => settings}/thermal_csv_files/cij.csv (100%) rename {data/sample/initialize_files => settings}/thermal_csv_files/heaters.csv (100%) rename {data/sample/initialize_files => settings}/thermal_csv_files/heatload.csv (100%) rename {data/sample/initialize_files => settings}/thermal_csv_files/node.csv (100%) rename {data/sample/initialize_files => settings}/thermal_csv_files/rij.csv (100%) diff --git a/data/sample/initialize_files/components/angular_velocity_observer.ini b/settings/components/angular_velocity_observer.ini similarity index 100% rename from data/sample/initialize_files/components/angular_velocity_observer.ini rename to settings/components/angular_velocity_observer.ini diff --git a/data/sample/initialize_files/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv b/settings/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv similarity index 100% rename from data/sample/initialize_files/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv rename to settings/components/antenna_radiation_pattern_csv_files/sample_antenna_radiation_pattern.csv diff --git a/data/sample/initialize_files/components/attitude_observer.ini b/settings/components/attitude_observer.ini similarity index 100% rename from data/sample/initialize_files/components/attitude_observer.ini rename to settings/components/attitude_observer.ini diff --git a/data/sample/initialize_files/components/battery.ini b/settings/components/battery.ini similarity index 100% rename from data/sample/initialize_files/components/battery.ini rename to settings/components/battery.ini diff --git a/data/sample/initialize_files/components/component_interference.ini b/settings/components/component_interference.ini similarity index 100% rename from data/sample/initialize_files/components/component_interference.ini rename to settings/components/component_interference.ini diff --git a/data/sample/initialize_files/components/force_generator.ini b/settings/components/force_generator.ini similarity index 100% rename from data/sample/initialize_files/components/force_generator.ini rename to settings/components/force_generator.ini diff --git a/data/sample/initialize_files/components/gnss_receiver.ini b/settings/components/gnss_receiver.ini similarity index 100% rename from data/sample/initialize_files/components/gnss_receiver.ini rename to settings/components/gnss_receiver.ini diff --git a/data/sample/initialize_files/components/ground_station_antenna.ini b/settings/components/ground_station_antenna.ini similarity index 100% rename from data/sample/initialize_files/components/ground_station_antenna.ini rename to settings/components/ground_station_antenna.ini diff --git a/data/sample/initialize_files/components/ground_station_calculator.ini b/settings/components/ground_station_calculator.ini similarity index 100% rename from data/sample/initialize_files/components/ground_station_calculator.ini rename to settings/components/ground_station_calculator.ini diff --git a/data/sample/initialize_files/components/gyro_sensor.ini b/settings/components/gyro_sensor.ini similarity index 100% rename from data/sample/initialize_files/components/gyro_sensor.ini rename to settings/components/gyro_sensor.ini diff --git a/data/sample/initialize_files/components/magnetometer.ini b/settings/components/magnetometer.ini similarity index 100% rename from data/sample/initialize_files/components/magnetometer.ini rename to settings/components/magnetometer.ini diff --git a/data/sample/initialize_files/components/magnetorquer.ini b/settings/components/magnetorquer.ini similarity index 100% rename from data/sample/initialize_files/components/magnetorquer.ini rename to settings/components/magnetorquer.ini diff --git a/data/sample/initialize_files/components/orbit_observer.ini b/settings/components/orbit_observer.ini similarity index 100% rename from data/sample/initialize_files/components/orbit_observer.ini rename to settings/components/orbit_observer.ini diff --git a/data/sample/initialize_files/components/pcu_initial_study.ini b/settings/components/pcu_initial_study.ini similarity index 100% rename from data/sample/initialize_files/components/pcu_initial_study.ini rename to settings/components/pcu_initial_study.ini diff --git a/data/sample/initialize_files/components/reaction_wheel.ini b/settings/components/reaction_wheel.ini similarity index 100% rename from data/sample/initialize_files/components/reaction_wheel.ini rename to settings/components/reaction_wheel.ini diff --git a/data/sample/initialize_files/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv b/settings/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv similarity index 100% rename from data/sample/initialize_files/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv rename to settings/components/rw_disturbance_csv_files/radial_force_harmonics_coefficients.csv diff --git a/data/sample/initialize_files/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv b/settings/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv similarity index 100% rename from data/sample/initialize_files/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv rename to settings/components/rw_disturbance_csv_files/radial_torque_harmonics_coefficients.csv diff --git a/data/sample/initialize_files/components/solar_array_panel.ini b/settings/components/solar_array_panel.ini similarity index 100% rename from data/sample/initialize_files/components/solar_array_panel.ini rename to settings/components/solar_array_panel.ini diff --git a/data/sample/initialize_files/components/spacecraft_antenna.ini b/settings/components/spacecraft_antenna.ini similarity index 100% rename from data/sample/initialize_files/components/spacecraft_antenna.ini rename to settings/components/spacecraft_antenna.ini diff --git a/data/sample/initialize_files/components/star_sensor.ini b/settings/components/star_sensor.ini similarity index 100% rename from data/sample/initialize_files/components/star_sensor.ini rename to settings/components/star_sensor.ini diff --git a/data/sample/initialize_files/components/sun_sensor.ini b/settings/components/sun_sensor.ini similarity index 100% rename from data/sample/initialize_files/components/sun_sensor.ini rename to settings/components/sun_sensor.ini diff --git a/data/sample/initialize_files/components/telescope.ini b/settings/components/telescope.ini similarity index 100% rename from data/sample/initialize_files/components/telescope.ini rename to settings/components/telescope.ini diff --git a/data/sample/initialize_files/components/thermal_components.ini b/settings/components/thermal_components.ini similarity index 100% rename from data/sample/initialize_files/components/thermal_components.ini rename to settings/components/thermal_components.ini diff --git a/data/sample/initialize_files/components/thruster.ini b/settings/components/thruster.ini similarity index 100% rename from data/sample/initialize_files/components/thruster.ini rename to settings/components/thruster.ini diff --git a/data/sample/initialize_files/components/torque_generator.ini b/settings/components/torque_generator.ini similarity index 100% rename from data/sample/initialize_files/components/torque_generator.ini rename to settings/components/torque_generator.ini diff --git a/data/sample/initialize_files/components/wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv b/settings/components/wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv similarity index 100% rename from data/sample/initialize_files/components/wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv rename to settings/components/wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv diff --git a/data/sample/initialize_files/components/wings_command_sender_to_c2a/example.ops b/settings/components/wings_command_sender_to_c2a/example.ops similarity index 100% rename from data/sample/initialize_files/components/wings_command_sender_to_c2a/example.ops rename to settings/components/wings_command_sender_to_c2a/example.ops diff --git a/data/sample/initialize_files/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 similarity index 100% rename from data/sample/initialize_files/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini rename to settings/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini diff --git a/data/sample/initialize_files/gnss/final_products/.gitkeep b/settings/gnss/final_products/.gitkeep similarity index 100% rename from data/sample/initialize_files/gnss/final_products/.gitkeep rename to settings/gnss/final_products/.gitkeep diff --git a/data/sample/initialize_files/sample_disturbance.ini b/settings/sample_disturbance.ini similarity index 100% rename from data/sample/initialize_files/sample_disturbance.ini rename to settings/sample_disturbance.ini diff --git a/data/sample/initialize_files/sample_gnss.ini b/settings/sample_gnss.ini similarity index 100% rename from data/sample/initialize_files/sample_gnss.ini rename to settings/sample_gnss.ini diff --git a/data/sample/initialize_files/sample_ground_station.ini b/settings/sample_ground_station.ini similarity index 100% rename from data/sample/initialize_files/sample_ground_station.ini rename to settings/sample_ground_station.ini diff --git a/data/sample/initialize_files/sample_inter_satellite_communication.ini b/settings/sample_inter_satellite_communication.ini similarity index 100% rename from data/sample/initialize_files/sample_inter_satellite_communication.ini rename to settings/sample_inter_satellite_communication.ini diff --git a/data/sample/initialize_files/sample_local_environment.ini b/settings/sample_local_environment.ini similarity index 100% rename from data/sample/initialize_files/sample_local_environment.ini rename to settings/sample_local_environment.ini diff --git a/data/sample/initialize_files/sample_satellite.ini b/settings/sample_satellite.ini similarity index 100% rename from data/sample/initialize_files/sample_satellite.ini rename to settings/sample_satellite.ini diff --git a/data/sample/initialize_files/sample_simulation_base.ini b/settings/sample_simulation_base.ini similarity index 100% rename from data/sample/initialize_files/sample_simulation_base.ini rename to settings/sample_simulation_base.ini diff --git a/data/sample/initialize_files/sample_structure.ini b/settings/sample_structure.ini similarity index 100% rename from data/sample/initialize_files/sample_structure.ini rename to settings/sample_structure.ini diff --git a/data/sample/initialize_files/thermal_csv_files/cij.csv b/settings/thermal_csv_files/cij.csv similarity index 100% rename from data/sample/initialize_files/thermal_csv_files/cij.csv rename to settings/thermal_csv_files/cij.csv diff --git a/data/sample/initialize_files/thermal_csv_files/heaters.csv b/settings/thermal_csv_files/heaters.csv similarity index 100% rename from data/sample/initialize_files/thermal_csv_files/heaters.csv rename to settings/thermal_csv_files/heaters.csv diff --git a/data/sample/initialize_files/thermal_csv_files/heatload.csv b/settings/thermal_csv_files/heatload.csv similarity index 100% rename from data/sample/initialize_files/thermal_csv_files/heatload.csv rename to settings/thermal_csv_files/heatload.csv diff --git a/data/sample/initialize_files/thermal_csv_files/node.csv b/settings/thermal_csv_files/node.csv similarity index 100% rename from data/sample/initialize_files/thermal_csv_files/node.csv rename to settings/thermal_csv_files/node.csv diff --git a/data/sample/initialize_files/thermal_csv_files/rij.csv b/settings/thermal_csv_files/rij.csv similarity index 100% rename from data/sample/initialize_files/thermal_csv_files/rij.csv rename to settings/thermal_csv_files/rij.csv From 57efaba1a624cca36e625a5a32213ad7e8c41f31 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sat, 20 Jul 2024 18:19:49 +0900 Subject: [PATCH 02/17] Fix initialize_files path --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bb75dab4..50ea99116 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -122,7 +122,7 @@ jobs: - name: fix simulation config shell: bash - working-directory: ./data/sample/initialize_files + working-directory: ./settings run: | find . -type f -name '*.ini' -exec sed -i 's/..\/..\/..\/ExtLibraries/..\/..\/ExtLibraries/g' {} \; @@ -212,7 +212,7 @@ jobs: cmake --build . - name: fix simulation config - working-directory: ./data/sample/initialize_files + working-directory: ./settings run: | find . -type f -name '*.ini' -exec sed -i 's/..\/..\/..\/ExtLibraries/..\/..\/ExtLibraries/g' {} \; From 3720ab5ab3ebaf8f65073dddd34bd999b8783145 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sat, 20 Jul 2024 18:20:27 +0900 Subject: [PATCH 03/17] Fix to use macro --- .../wings_command_sender_to_c2a.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 0d8a2811e..22dad4d70 100644 --- 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 @@ -1,5 +1,5 @@ [WINGS_COMMAND_SENDER_TO_C2A] command_send_enable = ENABLE prescaler = 1 -c2a_command_database_file = ../../data/initialize_files/components/wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv -wings_operation_file = ../../data/initialize_files/components/wings_command_sender_to_c2a/example.ops +c2a_command_database_file = INI_FILE_DIR_FROM_EXE/components/wings_command_sender_to_c2a/SAMPLE_MOBC_CMD_DB_CMD_DB.csv +wings_operation_file = INI_FILE_DIR_FROM_EXE/components/wings_command_sender_to_c2a/example.ops From 536052af9773aefc629bf4c9819a85923f8a7c44 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sat, 20 Jul 2024 23:22:12 +0900 Subject: [PATCH 04/17] Fix to use GITHUB_OUTPUT --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50ea99116..023ee40e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,8 +149,8 @@ jobs: run: | COMPILER="${{ matrix.compiler }}" read -r -a COMPILER <<< "$COMPILER" - echo "::set-output name=CC::${COMPILER[0]}" - echo "::set-output name=CXX::${COMPILER[1]}" + echo "CC=${COMPILER[0]}" >> "$GITHUB_OUTPUT" + echo "CXX=${COMPILER[1]}" >> "$GITHUB_OUTPUT" - name: install deps run: | From dcd483986bb29eec1326d5c544e743447028fe80 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sat, 20 Jul 2024 23:33:30 +0900 Subject: [PATCH 05/17] Fix small --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 023ee40e5..2290e90f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,8 +149,8 @@ jobs: run: | COMPILER="${{ matrix.compiler }}" read -r -a COMPILER <<< "$COMPILER" - echo "CC=${COMPILER[0]}" >> "$GITHUB_OUTPUT" - echo "CXX=${COMPILER[1]}" >> "$GITHUB_OUTPUT" + echo "CC=$COMPILER[0]" >> "$GITHUB_OUTPUT" + echo "CXX=$COMPILER[1]" >> "$GITHUB_OUTPUT" - name: install deps run: | From 0bd6d364a7ac900a65e527cbda357d8b146905b1 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sat, 20 Jul 2024 23:42:21 +0900 Subject: [PATCH 06/17] Fix small --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2290e90f3..023ee40e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,8 +149,8 @@ jobs: run: | COMPILER="${{ matrix.compiler }}" read -r -a COMPILER <<< "$COMPILER" - echo "CC=$COMPILER[0]" >> "$GITHUB_OUTPUT" - echo "CXX=$COMPILER[1]" >> "$GITHUB_OUTPUT" + echo "CC=${COMPILER[0]}" >> "$GITHUB_OUTPUT" + echo "CXX=${COMPILER[1]}" >> "$GITHUB_OUTPUT" - name: install deps run: | From ecf0dafc581d825d96e2621d5b7bf779cbfff956 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sat, 20 Jul 2024 23:54:36 +0900 Subject: [PATCH 07/17] Fix small --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 023ee40e5..13e4492ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,8 +149,8 @@ jobs: run: | COMPILER="${{ matrix.compiler }}" read -r -a COMPILER <<< "$COMPILER" - echo "CC=${COMPILER[0]}" >> "$GITHUB_OUTPUT" - echo "CXX=${COMPILER[1]}" >> "$GITHUB_OUTPUT" + # echo "CC=${COMPILER[0]}" >> "$GITHUB_OUTPUT" + # echo "CXX=${COMPILER[1]}" >> "$GITHUB_OUTPUT" - name: install deps run: | From 859389af346e56fcb9e8a798a6f6621d08649421 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 21 Jul 2024 09:09:55 +0900 Subject: [PATCH 08/17] Fix data directory path in CI --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13e4492ea..b607210a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -128,9 +128,9 @@ jobs: - name: run simulation(SampleSat) if: matrix.build_bit == 'BUILD_64BIT=OFF' || (matrix.build_bit == 'BUILD_64BIT=ON' && matrix.use_c2a == 'USE_C2A=OFF') - working-directory: ./data/sample + working-directory: ./ run: | - ..\..\Debug\S2E.exe + .\Debug\S2E.exe build_s2e_linux: name: Build on Linux @@ -149,8 +149,8 @@ jobs: run: | COMPILER="${{ matrix.compiler }}" read -r -a COMPILER <<< "$COMPILER" - # echo "CC=${COMPILER[0]}" >> "$GITHUB_OUTPUT" - # echo "CXX=${COMPILER[1]}" >> "$GITHUB_OUTPUT" + echo "CC=${COMPILER[0]}" >> "$GITHUB_OUTPUT" + echo "CXX=${COMPILER[1]}" >> "$GITHUB_OUTPUT" - name: install deps run: | @@ -217,16 +217,16 @@ jobs: find . -type f -name '*.ini' -exec sed -i 's/..\/..\/..\/ExtLibraries/..\/..\/ExtLibraries/g' {} \; - name: run simulation(SampleSat) - working-directory: ./data/sample + working-directory: ./ run: | - ../../S2E + S2E - name: generate graph working-directory: ./scripts/Plot run: | sudo apt-get install -y gnuplot pip3 install yq - LOG=$(ls ../../data/sample/logs/logs_*/*.csv) + LOG=$(ls ../../logs/logs_*/*.csv) echo "plot $LOG" ./gen_graph.sh "${LOG}" ls From c4b4edf2987ebc0dceb39fc71d3fad37b5eb74fa Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 21 Jul 2024 09:15:24 +0900 Subject: [PATCH 09/17] Modify default settings directory path --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4426f1e9..e42256c80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ endif() ## Directory path for ini files if(NOT DEFINED INI_FILE_DIR_FROM_EXE) - set(INI_FILE_DIR_FROM_EXE ../../data/sample/initialize_files) + set(INI_FILE_DIR_FROM_EXE ../../settings) endif() if(NOT DEFINED EXT_LIB_DIR_FROM_EXE) From 97107aabf1c545ba98dc51478434c42fa59fa4c2 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 21 Jul 2024 09:51:37 +0900 Subject: [PATCH 10/17] Add EXT_LIB_DIR_FROM_EXE option to CI --- .github/workflows/build.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b607210a4..496610e26 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,7 +109,7 @@ jobs: shell: cmd run: | cl.exe - cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DEXT_LIB_DIR=./ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} + cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} cmake --build . - name: build 64bit @@ -117,18 +117,11 @@ jobs: shell: cmd run: | cl.exe - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DEXT_LIB_DIR=./ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} + cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} cmake --build . - - name: fix simulation config - shell: bash - working-directory: ./settings - run: | - find . -type f -name '*.ini' -exec sed -i 's/..\/..\/..\/ExtLibraries/..\/..\/ExtLibraries/g' {} \; - - name: run simulation(SampleSat) if: matrix.build_bit == 'BUILD_64BIT=OFF' || (matrix.build_bit == 'BUILD_64BIT=ON' && matrix.use_c2a == 'USE_C2A=OFF') - working-directory: ./ run: | .\Debug\S2E.exe From 57c8a857324d45e2b3346089c90c3542b3fdd635 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 21 Jul 2024 10:30:33 +0900 Subject: [PATCH 11/17] Fix Linux build --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 496610e26..9c699fd80 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -122,6 +122,7 @@ jobs: - name: run simulation(SampleSat) if: matrix.build_bit == 'BUILD_64BIT=OFF' || (matrix.build_bit == 'BUILD_64BIT=ON' && matrix.use_c2a == 'USE_C2A=OFF') + working-directory: ./ run: | .\Debug\S2E.exe @@ -201,7 +202,7 @@ jobs: CC: ${{ steps.compiler.outputs.CC }} CXX: ${{ steps.compiler.outputs.CXX }} run: | - cmake . -DEXT_LIB_DIR=./ExtLibraries -D${{ matrix.build_bit }} + cmake . -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=./ExtLibraries -D${{ matrix.build_bit }} cmake --build . - name: fix simulation config @@ -212,7 +213,7 @@ jobs: - name: run simulation(SampleSat) working-directory: ./ run: | - S2E + ./S2E - name: generate graph working-directory: ./scripts/Plot From 227931843ea9939bf83812a295d3382cca45cfe9 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 21 Jul 2024 10:45:21 +0900 Subject: [PATCH 12/17] Fix INI file path --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c699fd80..5e920c9c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,7 +109,7 @@ jobs: shell: cmd run: | cl.exe - cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} + cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DINI_FILE_DIR_FROM_EXE=../settings -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} cmake --build . - name: build 64bit @@ -117,7 +117,7 @@ jobs: shell: cmd run: | cl.exe - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} + cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DINI_FILE_DIR_FROM_EXE=../settings -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} cmake --build . - name: run simulation(SampleSat) @@ -202,7 +202,7 @@ jobs: CC: ${{ steps.compiler.outputs.CC }} CXX: ${{ steps.compiler.outputs.CXX }} run: | - cmake . -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=./ExtLibraries -D${{ matrix.build_bit }} + cmake . -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=./ExtLibraries -DINI_FILE_DIR_FROM_EXE=./settings -D${{ matrix.build_bit }} cmake --build . - name: fix simulation config From 60905854e202c2708cee69dcf33633d17c3306c7 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 21 Jul 2024 10:57:47 +0900 Subject: [PATCH 13/17] Add CORE_DIR_FROM_EXE setting in CI --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e920c9c8..bc0c0b751 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,7 +109,7 @@ jobs: shell: cmd run: | cl.exe - cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DINI_FILE_DIR_FROM_EXE=../settings -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} + cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DINI_FILE_DIR_FROM_EXE=../settings -DCORE_DIR_FROM_EXE=../ -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} cmake --build . - name: build 64bit @@ -117,14 +117,14 @@ jobs: shell: cmd run: | cl.exe - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DINI_FILE_DIR_FROM_EXE=../settings -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} + cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DINI_FILE_DIR_FROM_EXE=../settings -DCORE_DIR_FROM_EXE=../ -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} cmake --build . - name: run simulation(SampleSat) if: matrix.build_bit == 'BUILD_64BIT=OFF' || (matrix.build_bit == 'BUILD_64BIT=ON' && matrix.use_c2a == 'USE_C2A=OFF') - working-directory: ./ + working-directory: ./Debug run: | - .\Debug\S2E.exe + .\S2E.exe build_s2e_linux: name: Build on Linux @@ -202,7 +202,7 @@ jobs: CC: ${{ steps.compiler.outputs.CC }} CXX: ${{ steps.compiler.outputs.CXX }} run: | - cmake . -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=./ExtLibraries -DINI_FILE_DIR_FROM_EXE=./settings -D${{ matrix.build_bit }} + cmake . -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=./ExtLibraries -DINI_FILE_DIR_FROM_EXE=./settings -DCORE_DIR_FROM_EXE=./ -D${{ matrix.build_bit }} cmake --build . - name: fix simulation config From cf8aebf3c37813639aef3d23789d212013146881 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 21 Jul 2024 11:00:47 +0900 Subject: [PATCH 14/17] Fix simulation config setting --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc0c0b751..769b9269d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -120,6 +120,11 @@ jobs: cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DINI_FILE_DIR_FROM_EXE=../settings -DCORE_DIR_FROM_EXE=../ -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} cmake --build . + - name: fix simulation config + working-directory: ./settings + run: | + find . -type f -name '*.ini' -exec sed -i 's/..\/..\/logs/.\/logs/g' {} \; + - name: run simulation(SampleSat) if: matrix.build_bit == 'BUILD_64BIT=OFF' || (matrix.build_bit == 'BUILD_64BIT=ON' && matrix.use_c2a == 'USE_C2A=OFF') working-directory: ./Debug @@ -208,7 +213,7 @@ jobs: - name: fix simulation config working-directory: ./settings run: | - find . -type f -name '*.ini' -exec sed -i 's/..\/..\/..\/ExtLibraries/..\/..\/ExtLibraries/g' {} \; + find . -type f -name '*.ini' -exec sed -i 's/..\/..\/logs/.\/logs/g' {} \; - name: run simulation(SampleSat) working-directory: ./ From 8cdc86beb316ecb567a5d5e4cd30908c08e62ced Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 21 Jul 2024 11:01:21 +0900 Subject: [PATCH 15/17] Fix simulation config setting --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 769b9269d..05d60651b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -123,7 +123,7 @@ jobs: - name: fix simulation config working-directory: ./settings run: | - find . -type f -name '*.ini' -exec sed -i 's/..\/..\/logs/.\/logs/g' {} \; + find . -type f -name '*.ini' -exec sed -i 's/..\/..\/logs/..\/logs/g' {} \; - name: run simulation(SampleSat) if: matrix.build_bit == 'BUILD_64BIT=OFF' || (matrix.build_bit == 'BUILD_64BIT=ON' && matrix.use_c2a == 'USE_C2A=OFF') From efff45b55cb2597c1d5a566a0da1bdea5d3ef533 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 21 Jul 2024 11:41:43 +0900 Subject: [PATCH 16/17] Fix working directory for Win --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 05d60651b..1fe12b28f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,7 +109,7 @@ jobs: shell: cmd run: | cl.exe - cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DINI_FILE_DIR_FROM_EXE=../settings -DCORE_DIR_FROM_EXE=../ -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} + cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DINI_FILE_DIR_FROM_EXE=./settings -DCORE_DIR_FROM_EXE=./ -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=./ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} cmake --build . - name: build 64bit @@ -117,19 +117,19 @@ jobs: shell: cmd run: | cl.exe - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DINI_FILE_DIR_FROM_EXE=../settings -DCORE_DIR_FROM_EXE=../ -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=../ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} + cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DINI_FILE_DIR_FROM_EXE=./settings -DCORE_DIR_FROM_EXE=./ -DEXT_LIB_DIR=./ExtLibraries -DEXT_LIB_DIR_FROM_EXE=./ExtLibraries -DFLIGHT_SW_DIR=./c2a-core -DC2A_NAME=Examples/minimum_user -D${{ matrix.use_c2a }} -D${{ matrix.build_bit }} cmake --build . - name: fix simulation config working-directory: ./settings run: | - find . -type f -name '*.ini' -exec sed -i 's/..\/..\/logs/..\/logs/g' {} \; + find . -type f -name '*.ini' -exec sed -i 's/..\/..\/logs/.\/logs/g' {} \; - name: run simulation(SampleSat) if: matrix.build_bit == 'BUILD_64BIT=OFF' || (matrix.build_bit == 'BUILD_64BIT=ON' && matrix.use_c2a == 'USE_C2A=OFF') - working-directory: ./Debug + working-directory: ./ run: | - .\S2E.exe + .\Debug\S2E.exe build_s2e_linux: name: Build on Linux From 7f4afcc1b84add4277a9e3891c97365f3551e6d0 Mon Sep 17 00:00:00 2001 From: Satoshi Ikari Date: Sun, 21 Jul 2024 14:00:35 +0900 Subject: [PATCH 17/17] Revive shell:bash --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fe12b28f..19400a55e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,6 +121,7 @@ jobs: cmake --build . - name: fix simulation config + shell: bash working-directory: ./settings run: | find . -type f -name '*.ini' -exec sed -i 's/..\/..\/logs/.\/logs/g' {} \;