diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bb75dab4..19400a55e 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" -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,20 +117,20 @@ 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" -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 shell: bash - working-directory: ./data/sample/initialize_files + 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) 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 "::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: | @@ -208,25 +208,25 @@ 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 -DINI_FILE_DIR_FROM_EXE=./settings -DCORE_DIR_FROM_EXE=./ -D${{ matrix.build_bit }} 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' {} \; + find . -type f -name '*.ini' -exec sed -i 's/..\/..\/logs/.\/logs/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 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) diff --git a/data/sample/initialize_files/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini b/data/sample/initialize_files/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini deleted file mode 100644 index 0d8a2811e..000000000 --- a/data/sample/initialize_files/components/wings_command_sender_to_c2a/wings_command_sender_to_c2a.ini +++ /dev/null @@ -1,5 +0,0 @@ -[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 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/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 new file mode 100644 index 000000000..22dad4d70 --- /dev/null +++ b/settings/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/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 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