Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop to main for Major update v7.0.0 #512

Merged
merged 291 commits into from
Oct 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
291 commits
Select commit Hold shift + click to select a range
2aff653
Move initialize function for Gravity gradient
200km Aug 28, 2023
1ff2b07
Move initialize function for mag disturbance
200km Aug 28, 2023
2191ad8
Move initialize function for geopotential
200km Aug 28, 2023
8a64fda
Move initialize function for lunar gravity
200km Aug 28, 2023
d8ef48c
Move initialize function for third body
200km Aug 28, 2023
fd60ec0
Delete initialize file for disturbance
200km Aug 28, 2023
8621604
Add const with interpolation function
200km Aug 29, 2023
6db9796
Add test code for interpolation
200km Aug 29, 2023
b5cb313
Add an interpolation test
200km Aug 29, 2023
31cf472
Add test of interpolation for 2D orbit propagation
200km Aug 29, 2023
427c61e
Add interpolation function to the base class
200km Aug 29, 2023
5febe40
Add 5th order Dormand Prince integrator
200km Aug 30, 2023
59fc983
Add test for DP5
200km Aug 30, 2023
a879995
Add 2 body test for DP5 and fix the coefficient value
200km Aug 30, 2023
1f93dd5
Add C2A command database read feature
200km Aug 30, 2023
a22f4fe
Add argument decode function
200km Aug 30, 2023
9c65c07
Add doxygen comment
200km Aug 31, 2023
69ec000
Remove magic enu,
200km Aug 31, 2023
3c71763
Remove magic enum
200km Aug 31, 2023
8c20b69
Fix doxygen comment decription
200km Aug 31, 2023
a39e84b
Remove debug codes
200km Aug 31, 2023
3d3aed5
Add doxygen comment
200km Aug 31, 2023
d8111ef
Rename file name
200km Aug 31, 2023
46da534
Fix typo
200km Aug 31, 2023
aa62d00
Add WingsOperationFile class
200km Aug 31, 2023
5d7dc40
Add command execution
200km Aug 31, 2023
638581e
Remove unnecessary newline
200km Aug 31, 2023
61ee104
Fix format
200km Aug 31, 2023
a36b2f8
Merge pull request #483 from ut-issl/feature/fix-small-numerical-inte…
200km Sep 1, 2023
facd043
Merge pull request #480 from ut-issl/feature/add-interference-mtq-mag…
200km Sep 1, 2023
345d72a
Merge pull request #479 from ut-issl/feature/remove-initialize-file-l…
200km Sep 1, 2023
06933f0
Merge pull request #481 from ut-issl/feature/remove-initialize-files-…
200km Sep 1, 2023
97cf531
Add component for command sender
200km Sep 1, 2023
e6b711c
Move command parse function to component
200km Sep 1, 2023
49f3ec5
Add ifdef for C2A_USE
200km Sep 1, 2023
5fc1c59
Add ifdef for C2A_USE
200km Sep 1, 2023
3e3831a
Add header for macro
200km Sep 1, 2023
094690b
Add initialize files
200km Sep 1, 2023
340608d
Revert unnecessary change in this PR
200km Sep 1, 2023
89ada36
Revert unnecessary change in this PR
200km Sep 1, 2023
69fe068
Add assertion for let commands
200km Sep 2, 2023
ed32688
Fix format
200km Sep 2, 2023
54582e1
Add enable flag
200km Sep 2, 2023
e2fe76e
Fix interpolation
200km Sep 4, 2023
7ff9db8
Add interpolation test for large eccentricity
200km Sep 4, 2023
b7efa74
Fix comment
200km Sep 4, 2023
1855ee6
Add DP5 to integrator manager
200km Sep 4, 2023
4f4f87d
Fix to add include
200km Sep 4, 2023
ac134a7
Initialize slope coefficients in constructor for interpolation
200km Sep 4, 2023
7cc9f0e
Update actions/checkout action to v4
renovate[bot] Sep 4, 2023
5b001c0
Merge pull request #489 from ut-issl/renovate/actions-checkout-4.x
200km Sep 4, 2023
db4b6a9
Fix to use S2E's endian_memcpy
200km Sep 4, 2023
0c67731
Fix format
200km Sep 4, 2023
5684710
Update crazy-max/ghaction-github-labeler action to v5
renovate[bot] Sep 10, 2023
6ed998c
Add comments to describe used C2A features
200km Sep 11, 2023
57ad1d6
Merge pull request #490 from ut-issl/renovate/crazy-max-ghaction-gith…
200km Sep 11, 2023
cabf3ec
Copy initialize source file to sensor file
200km Sep 26, 2023
e898780
Delete initialize_sensor file
200km Sep 26, 2023
00e3296
Copy initialize function for force generator
200km Sep 26, 2023
08a1a3c
Delete initialize_force_generator
200km Sep 26, 2023
23e5b10
Move initialize function for torque generator
200km Sep 26, 2023
1839e00
Delete initialize_torque_generator
200km Sep 26, 2023
55acf88
Move initialize function for thrusters
200km Sep 26, 2023
f51329d
Delete initialize_simple_thruster
200km Sep 26, 2023
2539a41
Move initialize function for battery
200km Sep 26, 2023
bb9af0c
Delete initialize_battery
200km Sep 26, 2023
fd26017
Move initialize function for PCU initial study
200km Sep 26, 2023
2e879f4
Delete initialize_pcu_initial_study
200km Sep 26, 2023
2058b14
Move initialize function for SAP
200km Sep 26, 2023
988d186
Delete initialize_solar_array_panel
200km Sep 26, 2023
609d755
Move initialize function for telescope
200km Sep 26, 2023
25c7534
Delete initialize_telescope
200km Sep 26, 2023
9c64a0a
Move initialize function for antenna
200km Sep 26, 2023
b80ae57
Delete initialize_antenna
200km Sep 26, 2023
1a79a23
Move initialize function for ground station calculator
200km Sep 26, 2023
3c035b7
Delete initialize_ground_station_calculator
200km Sep 26, 2023
868e082
Move initialize function for gnss receiver
200km Sep 26, 2023
7cff913
Delete initialize_gnss_receiver
200km Sep 26, 2023
d7ca401
Move initialize function for gyro sensor
200km Sep 26, 2023
8b03ffd
Delete initialize_gyro_sensor
200km Sep 26, 2023
46c6a47
Move initialize function for magnetometer
200km Sep 26, 2023
aeb6948
Delete initialize_magnetometer
200km Sep 26, 2023
c378c78
Move initialize function for magnetorquer
200km Sep 26, 2023
4e44429
Delete initialize_magnetorquer
200km Sep 26, 2023
3a6b3ec
Move initialize function for reaction wheel
200km Sep 26, 2023
3e7abb3
Delete initialize_reaction_wheel
200km Sep 26, 2023
e4c885a
Move initialize function for star sensor
200km Sep 26, 2023
e9c058e
Delete initialize_star_sensor
200km Sep 26, 2023
1650ff3
Move initialize function for sun sensor
200km Sep 26, 2023
1a9ba0b
Delete initialize_sun_sensor
200km Sep 26, 2023
0c51350
Fix for RW initial rotation
200km Sep 26, 2023
5228c50
Fix ephemeris time handling for acceleration
200km Sep 26, 2023
2f386de
Update dependency ut-issl/c2a-core to v3.10.1
renovate[bot] Sep 26, 2023
fb6ca69
Merge pull request #496 from ut-issl/renovate/ut-issl-c2a-core-3.x
200km Sep 26, 2023
85ab4b1
resolve conflict in initialize_temperature.cpp
tshibuk Sep 27, 2023
d1591b4
Merge branch 'develop' into feature/add_thermal2
tshibuk Sep 27, 2023
7d43f11
modify CalcSolarRadiation_W based on comments
tshibuk Sep 27, 2023
c6cad97
small fix
tshibuk Sep 27, 2023
0f8daab
Merge pull request #471 from arkedge/feature/add_thermal2
200km Sep 27, 2023
9c9369c
Remove Cmd_ prefix check for v3.9.0 C2A
200km Sep 27, 2023
b654127
Fix argument name to suit the coding rule
200km Sep 27, 2023
444ad59
Add doxygen comment
200km Sep 27, 2023
25d7816
Fix comment
200km Sep 27, 2023
521980b
Fix small
200km Sep 27, 2023
27ed563
Fix initialize order
200km Sep 27, 2023
007c444
Remove unnecessary assertion
200km Sep 27, 2023
4d37888
Remove unnecessary SRP constructor
200km Sep 27, 2023
6c04dbc
Move to private function
200km Sep 27, 2023
a04aee4
Fix assertion in node class
200km Sep 27, 2023
6d17d40
Move private function
200km Sep 27, 2023
f1d8b4d
Fix assertion in heater controller class
200km Sep 27, 2023
e6eabad
Fix small
200km Sep 27, 2023
9462cbe
Remove include
200km Sep 27, 2023
b216cef
Move to private function
200km Sep 27, 2023
48dc461
Fix assertion in heater class
200km Sep 27, 2023
45cc515
Fix typo
200km Sep 27, 2023
8aae173
Move to private function
200km Sep 27, 2023
c3ddfa7
Update PR template
200km Sep 27, 2023
8baee65
Update action item template
200km Sep 27, 2023
36c32d1
Update bug report template
200km Sep 27, 2023
b96e177
Fix to use size_t
200km Sep 27, 2023
deaa797
Fix typo
200km Sep 27, 2023
cf8547f
Fix typo
200km Sep 27, 2023
215ad60
Fix to use size_t
200km Sep 27, 2023
d06720b
Fix to use size_t
200km Sep 27, 2023
475cbd8
Merge pull request #498 from ut-issl/feature/fix-templates
200km Sep 28, 2023
642229c
Fix assertion
200km Sep 28, 2023
a20b44a
Merge pull request #488 from ut-issl/feature/fix-for-initial-interpol…
200km Sep 28, 2023
f92b016
Add vector int read feature for ini file
200km Sep 28, 2023
12f8b7c
Add return
200km Sep 28, 2023
9a83d2c
Add ini read function for std::vector double
200km Sep 28, 2023
9325116
Add ini read for vector unsigned char
200km Sep 28, 2023
be61570
Fix format
200km Sep 28, 2023
60f2bcf
Remove override warning
200km Sep 29, 2023
823771e
Fix typo
200km Sep 29, 2023
62067d2
Fix typo
200km Sep 29, 2023
3d0d4f3
Fix typo
200km Sep 29, 2023
47a2662
Fix typo
200km Sep 29, 2023
0a3612c
Fix local variables name
200km Oct 1, 2023
4d2c314
Fix local variables name
200km Oct 1, 2023
8604ccf
Fix local variables name
200km Oct 1, 2023
df05948
Merge pull request #500 from ut-issl/feature/remove-warning-in-sample
200km Oct 2, 2023
cada2dc
Merge pull request #493 from ut-issl/feature/remove-initialize-for-co…
200km Oct 2, 2023
b394c26
Merge pull request #494 from ut-issl/feature/fix-for-rw-initial-rotation
200km Oct 2, 2023
e8c9a32
Update actions/setup-python action to v4.7.1
renovate[bot] Oct 2, 2023
8c5460d
Merge pull request #502 from ut-issl/renovate/actions-setup-python-4.x
200km Oct 3, 2023
8268a21
Merge pull request #501 from ut-issl/feature/refactor-celes-rotation
200km Oct 4, 2023
5fc5537
Bump pillow from 10.0.0 to 10.0.1 in /scripts/Plot
dependabot[bot] Oct 4, 2023
58fa1e4
Merge pull request #503 from ut-issl/dependabot/pip/scripts/Plot/pill…
200km Oct 4, 2023
c7bcbd1
Merge with develop
200km Oct 4, 2023
ddb4cd8
fix required python version for python-utils
200km Oct 4, 2023
409e9cd
Merge pull request #504 from ut-issl/feature/fix-pipfile
200km Oct 5, 2023
22987e0
Merge pull request #499 from ut-issl/feature/add-vector-int-read
200km Oct 5, 2023
5b15148
Merge pull request #495 from ut-issl/feature/fix-to-accelerate-calcul…
200km Oct 5, 2023
0d6d0cb
Update src/dynamics/thermal/node.cpp
200km Oct 5, 2023
0e58e9c
Merge pull request #487 from ut-issl/feature/add-dp5-propagator
200km Oct 5, 2023
9c21a16
Merge pull request #497 from ut-issl/feature/fix-small-thermal-dynamics
200km Oct 5, 2023
d542d72
Remove warnings in CMake about the position of cmake_minimum_required
200km Oct 5, 2023
92dac67
Remove strcat warnings
200km Oct 5, 2023
75d4065
Fix format
200km Oct 5, 2023
9e43a14
Remove strcat warnings in battery
200km Oct 5, 2023
ebfc298
Fix typo
200km Oct 5, 2023
3d236ea
Remove strcat warnings in pcu
200km Oct 5, 2023
ea99cb9
Remove strcat warnings in sap
200km Oct 5, 2023
126fbf1
Remove strcat warnings in sap
200km Oct 5, 2023
cf068d3
Fix size_t
200km Oct 5, 2023
aa92eb7
Fix size_t
200km Oct 5, 2023
bca3782
Fix format
200km Oct 5, 2023
9be43d4
Fix soze_t
200km Oct 5, 2023
98e79dd
Fix cast to int
200km Oct 5, 2023
584a2d8
Fix int cast
200km Oct 5, 2023
3f2edb9
Merge pull request #505 from ut-issl/feature/remove-warnings
200km Oct 5, 2023
46d1cfa
Update src/components/real/communication/wings_command_sender_to_c2a.cpp
200km Oct 5, 2023
0b29557
Merge pull request #485 from ut-issl/feature/add-c2a-command-handling…
200km Oct 5, 2023
64cb0b7
Remove CMD_DB header info
200km Oct 6, 2023
0252e09
Add command name empty check
200km Oct 6, 2023
cd3e497
Fix sample OPS file
200km Oct 6, 2023
28bcae5
Delete initialize_heater
200km Oct 6, 2023
c4b8a79
Delete initialize_heater
200km Oct 6, 2023
8b4c22b
Delete initialize_heatload
200km Oct 6, 2023
750991c
Delete initialize_node
200km Oct 6, 2023
4da89bc
Remove unnecessary include
200km Oct 6, 2023
e8f03ec
Delete initialize_temperature
200km Oct 6, 2023
5896071
Fix typo in GNSS Satellites
200km Oct 6, 2023
51e8d5d
Fix typo in example serial
200km Oct 6, 2023
06b596b
Fix typo in example serial
200km Oct 6, 2023
ccece69
Fix typo in OBC
200km Oct 6, 2023
64bb4d1
Fix typo in telescope
200km Oct 6, 2023
141dddb
Fix typo in thruster
200km Oct 6, 2023
7a5b4d9
Fix type in sample components
200km Oct 6, 2023
249e701
Merge pull request #506 from ut-issl/feature/fix-c2a-command-sender
200km Oct 7, 2023
d8b7ca4
Merge pull request #508 from ut-issl/feature/fix-typos
200km Oct 7, 2023
8e294bd
Add first order lag library
200km Oct 8, 2023
df026b5
Modify rpm rad/s convert function
200km Oct 8, 2023
e7865e9
Add log of target acceleration
200km Oct 8, 2023
df5d0cf
Delete namespace
200km Oct 8, 2023
4ea9b9d
Fix comment
200km Oct 8, 2023
fc8035c
Fix RW ODE
200km Oct 8, 2023
e8b94be
Delete unnecessary variables
200km Oct 8, 2023
7450cca
Delete unnecessary include
200km Oct 8, 2023
fe2961d
Fix first order lag
200km Oct 8, 2023
ea046b2
Add time constant setting
200km Oct 8, 2023
3b96adf
Fix small
200km Oct 8, 2023
f27842e
Add coasting friction
200km Oct 8, 2023
edd2714
Add stop limit angular velocity
200km Oct 9, 2023
dbb8bf0
Fix RW jitter interface to decrease constructor arguments
200km Oct 9, 2023
7141e15
Add unit
200km Oct 9, 2023
11a278c
Add unit
200km Oct 9, 2023
a7c83ac
Fix argument series
200km Oct 9, 2023
9ffb5d9
Fix ODE algorithm
200km Oct 9, 2023
29b7176
Rename celestial rotation to earth rotation
200km Oct 9, 2023
5076599
Rename CelestialRotation to EarthRotation
200km Oct 9, 2023
b71ff7a
Fix comment and include guard
200km Oct 9, 2023
07bf233
Remove planet name
200km Oct 9, 2023
cc18417
Fix rotation mode handling
200km Oct 9, 2023
3aafd5a
Fix rotation mode handling
200km Oct 9, 2023
7be2d67
Move string to enum conversion functions
200km Oct 9, 2023
3990e9f
Add moon rotation file
200km Oct 9, 2023
727a9ae
Remove unnecessary include
200km Oct 9, 2023
f0b6590
Modify xcxf
200km Oct 9, 2023
0ca4782
Implemente moon rotation
200km Oct 9, 2023
b3333fd
Add moon rotation to celestial info
200km Oct 9, 2023
c821c80
Add initialize
200km Oct 9, 2023
9332a9d
Add body rotation initialize
200km Oct 9, 2023
943931c
Add celestial position and velocity calc function from selected body
200km Oct 9, 2023
b7111a6
Update lunar gravity field
200km Oct 9, 2023
956c3df
Fix conflict
200km Oct 9, 2023
665502d
Separate to library and add spice accurate calculatio for Moon rotation
200km Oct 9, 2023
59bbca1
Add rotation mode list
200km Oct 9, 2023
67cb9ba
Fix format
200km Oct 9, 2023
a82868b
Modify rotation mode input
200km Oct 10, 2023
32dfaee
Fix indent
200km Oct 10, 2023
3b8cf00
Merge pull request #507 from ut-issl/feature/remove-initialize-files-…
200km Oct 10, 2023
1b7b859
Merge pull request #509 from ut-issl/feature/add-first-order-lag
200km Oct 11, 2023
578d7dd
Merge pull request #510 from ut-issl/feature/refactor-celes-rotation
200km Oct 11, 2023
9f7fec9
Merge branch 'develop' into feature/add-moon-rotation
200km Oct 12, 2023
eadf2e5
Add used project and update publication
200km Oct 12, 2023
3228dd7
Add publication
200km Oct 12, 2023
52a1532
Add user side repository example
200km Oct 12, 2023
bcf6eb2
Fix small
200km Oct 12, 2023
4c668f6
Add descriptaion of discussion page
200km Oct 12, 2023
7c5974f
Add initialize ID for multiple interference relationship
200km Oct 12, 2023
df36a05
Fix
200km Oct 12, 2023
d6e87ea
Merge pull request #511 from ut-issl/feature/add-moon-rotation
200km Oct 12, 2023
b4d37b2
Add comment
200km Oct 12, 2023
f83ce70
Merge pull request #513 from ut-issl/feaure/small-fix-for-v7.0.0
200km Oct 13, 2023
b42ab50
Merge pull request #515 from ut-issl/feature/add-comment-moon-rotation
200km Oct 13, 2023
872d5d4
Modify conponent_intererenece.ini
seki-hiro Oct 14, 2023
dda8a42
Merge pull request #514 from ut-issl/feature/fix-mtq-interference-for…
200km Oct 14, 2023
4d5efc0
Merge pull request #518 from ut-issl/feature/modify_compo_inter_ini
seki-hiro Oct 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions .github/ISSUE_TEMPLATE/action_item.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
---
name: Action Item
about: For Action Item management
about: Create an action item
title: ''
labels: ''
assignees: ''

---

## Overview
Write briefly.

## Details
Write in detail.
Provide a detailed description of the issue.

## Conditions for close
When xxx is complete.
## Closing conditions
Provide the conditions that must be met for the issue to be closed.

## Supplement
Write additional comments if you need.
## Supplementary information
Provide any supplementary information.

## Note
- If there are related Projects, tie them together.
- Set `priority` label if possible.
- Assignees should be set if possible.
- Write a conclusion when closing the issue.
- Provide a conclusion before closing the issue.
<!--
- Link the issue to any related projects if applicable.
- Assign the appropriate member(s) to this pull request as `Assignees`.
- Apply the `priority` label.
-->
35 changes: 17 additions & 18 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,35 @@
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
labels: ['bug']
assignees: ''

---

## Overview
Write briefly.

## Details
### Description
What kind of bug?
Describe the bug in detail.

### Conditions of occurrence
The environment in which the bug occurs, the condition, parameters, etc.
Describe the environment, conditions, parameters, etc. under which the bug occurred.

### Additional information
files, link, etc, if any.
### Additional information
Provide any relevant files, links, etc. if available.

## Task
## Tasks
- [ ] Fix xxx
- [ ] Do yyy

## Scope of influence
eg. All tools are not working.
## Impact
Describe the scope of the bug's influence, e.g., `All tools are not working.`

## Supplement
Write additional comments if you need.
## Supplementary notes
Provide any extra notes if necessary.

## Note
- If there are related Projects, tie them together.
- Set `priority` label if possible.
- Assignees should be set if possible.
- Write a conclusion when closing the issue.
## Notes
- Provide a conclusion before closing the issue.
<!--
- Link the issue to any related projects if applicable.
- Assign the appropriate member(s) to this pull request as `Assignees`.
- Apply the `priority` label.
-->
33 changes: 16 additions & 17 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
## Overview
Write briefly.
## Related issues
Mention any issues that this pull request is related (e.g., #1). Consider using the `development` field if you want to close the issue automatically when this pull request is merged.

## Issue
- Related issues
## Description
Provide a detailed description of this pull request.

## Details
Write in detail.
## Test results
Provide the test results and a link to the detailed results log.

## Validation results
Link to tests or validation results.
## Impact
Describe the scope of influence of the changes, e.g., `The behavior of feature ** changes.`

## Scope of influence
eg. The behavior of XX will be change.

## Supplement
Write additional comments if you need.
## Supplementary information
Provide any supplementary information.

<!--
## Note
- If there are related Projects, tie them together.
- Assignees should be set if possible.
- Reviewers should be set if possible.
- Set `priority` label if possible.
- No need to select `Reviewers` because it is automatically assigned.
- Assign the appropriate member(s) to this pull request as `Assignees`.
- Apply the `priority` label.
- Link the issue to any related projects if applicable.
-->
2 changes: 1 addition & 1 deletion .github/workflows/actionlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
actionlint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: reviewdog/action-actionlint@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:

env:
# datasource=github-releases depName=ut-issl/c2a-core
C2A_CORE_VERSION: v3.10.0
C2A_CORE_VERSION: v3.10.1

jobs:
build_s2e_win:
Expand All @@ -32,11 +32,11 @@ jobs:
build_bit: ['BUILD_64BIT=OFF', 'BUILD_64BIT=ON']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: checkout C2A core
if: contains(matrix.use_c2a, 'ON')
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: c2a-core
repository: ut-issl/c2a-core
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
build_bit: ['BUILD_64BIT=OFF', 'BUILD_64BIT=ON']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: set compiler
id: compiler
Expand Down Expand Up @@ -239,7 +239,7 @@ jobs:
ver=$(grep python_version ./Pipfile | sed -e 's/^python_version\s=\s"\(.*\)"$/\1/')
echo "version=$ver" >> "$GITHUB_OUTPUT"

- uses: actions/setup-python@v4.6.1
- uses: actions/setup-python@v4.7.1
with:
python-version: ${{ steps.python-version.outputs.version }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 2

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/google-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
compiler: ['gcc-11 g++-11', 'clang clang++']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: checkout the submodules
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run Labeler
uses: crazy-max/ghaction-github-labeler@v4
uses: crazy-max/ghaction-github-labeler@v5
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
yaml-file: .github/labels.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate-renovate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3

- name: install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate-scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
script_dir: ['./scripts/Plot']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: read python version from Pipfile
id: python-version
Expand All @@ -28,7 +28,7 @@ jobs:
ver=$(grep python_version ./Pipfile | sed -e 's/^python_version\s=\s"\(.*\)"$/\1/')
echo "version=${ver}" >> "$GITHUB_OUTPUT"

- uses: actions/setup-python@v4.6.1
- uses: actions/setup-python@v4.7.1
with:
python-version: ${{ steps.python-version.outputs.version }}

Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
cmake_policy(SET CMP0048 NEW)
cmake_minimum_required(VERSION 3.13)

project(S2E
LANGUAGES CXX
DESCRIPTION "S2E: Spacecraft Simulation Environment"
VERSION 6.4.0
VERSION 7.0.0
)

cmake_minimum_required(VERSION 3.13)

# build config
option(USE_HILS "Use HILS" OFF)
option(USE_C2A "Use C2A" OFF)
Expand Down
28 changes: 17 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
2. Edit, commit, and push in the branch.
- Please check the [coding convention](https://github.com/ut-issl/s2e-documents/blob/develop/General/CodingConvention.md) and the `code format` in next section.
3. Create a new pull request to the `develop` branch.
- The target branch becomes the `main` branch for the `hotfix/*` branchs.
- The target branch becomes the `main` branch for the `hotfix/*` branches.
4. A maintainer reviews the pull request. If some problems are found, the maintainer proposes modifications.
5. According to the maintainer's proposal, the developer modifies the codes and goes back to 3.
6. The maintainer merges the `feature/*` branch to the `develop` branch.
Expand Down Expand Up @@ -73,25 +73,30 @@
## How to use S2E

- Please see [s2e-documents' getting started page](https://github.com/ut-issl/s2e-documents/blob/develop/Tutorials/GettingStarted.md).
- We also have the `Development environment manuals`. You can find the link in the [Discussion page](https://github.com/ut-issl/s2e-core/discussions)
- Sorry, but we only have manuals written in Japanese now. We need help to translate them.
- Support compiler
- The following compilers are supported. The details are shown in GitHub Actions' results.
- gcc/g++
- clang++
- Visual Studio C++s
- Visual Studio C++

## Examples of User side
## Examples of User side repository

- [S2E-FF](https://github.com/ut-issl/s2e-ff)
- An example of S2E user side repository for Formation Flying study.
- [S2E-AOBC](https://github.com/ut-issl/s2e-aobc)
- A user side repository for the AOCS module.

## Used Projects

| Project Name | Developer | Launch | Refs |
| ----------------------| ----------------------- | ------- | ---------- |
| MAGNARO | Nagoya Univ. | 2022 | - |
| EQUULEUS | ISSL, UT / JAXA | 2022 | - |
| Optimal-1 | ArkEdge Space Inc. | - | - |
| ONGLAISAT | ISSL, UT | - | [Ikari 2022](https://archive.ists.ne.jp/upload_pdf/F-9-05.pdf) |
| Project Name | Developer | Launch | Refs |
| ----------------------| ------------------------------------ | ------- | ---------- |
| MAGNARO | Nagoya Univ. | 2022 | - |
| EQUULEUS | ISSL, UT and JAXA | 2022 | - |
| Optimal-1 | ArkEdge Space Inc. | 2023 | - |
| SPHERE-1 EYE | Sony Group Corporation and ISSL, UT | 2023 | [Sekine 2023](https://archive.ists.ne.jp/upload_pdf/2023-f-6-02.pdf) |
| ONGLAISAT | ISSL, UT | - | [Ikari 2022](https://doi.org/10.57350/jesa.63) |


## Collaborators
Expand All @@ -100,5 +105,6 @@


## Publications
1. S. Ikari, and et al., "Development of Compact and Highly Capable Integrated AOCS Module for CubeSats", [2022-f-41](https://archive.ists.ne.jp/upload_pdf/F-9-05.pdf), 33rd ISTS, 2022.
1. 五十里, 他, "宇宙開発の効率化・高度化を目指した東京大学中須賀・船瀬研のOSS活動", [UNISEC2022-04](http://unisec.jp/archives/7836), 12th UNISEC Space Takumi Conference, 2022.
1. S. Ikari, and et al., "Development of Compact and Highly Capable Integrated AOCS Module for CubeSats", Journal of Evolving Space Activities, vol. 1, ID 63, 2023. [Link](https://doi.org/10.57350/jesa.63)
1. 五十里, 他, "宇宙開発の効率化・高度化を目指した東京大学中須賀・船瀬研のOSS活動", UNISEC2022-04, 12th UNISEC Space Takumi Conference, 2022. [Link](http://unisec.jp/archives/7836)
1. H. Sekine, and et al., "Development of Software-In-the-Loop Simulator and Hardware-In-the-Loop Simulator of AOCS Module for CubeSats", 34th ISTS, Kurume, 2023. [Link](https://archive.ists.ne.jp/upload_pdf/2023-f-6-02.pdf)
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[MTQ_MAGNETOMETER_INTERFERENCE_0]

// x: MTQ output vector at MTQ component frame [Am2]
// y: Additional bias at magnetometer component frame [nT]
// A1, A2, ...: Polynomial coefficients defined in this file
// ** measns Hadamard product
// y = A1 * x + A2 * x ** x + A3 * x ** x ** x ...

polynomial_degree = 1

// We do not have zero coefficients

// 1st coefficients of additional bias A1 [nT/Am2]
additional_bias_by_mtq_coefficients_1(0) = 10000.0 // MTQ X -> Magnetometer X
additional_bias_by_mtq_coefficients_1(1) = -20000.0 // MTQ X -> Magnetometer Y
additional_bias_by_mtq_coefficients_1(2) = 30000.0 // MTQ X -> Magnetometer Z
additional_bias_by_mtq_coefficients_1(3) = 40000.0 // MTQ Y -> Magnetometer X
additional_bias_by_mtq_coefficients_1(4) = -50000.0 // MTQ Y -> Magnetometer Y
additional_bias_by_mtq_coefficients_1(5) = 60000.0 // MTQ Y -> Magnetometer Z
additional_bias_by_mtq_coefficients_1(6) = 70000.0 // MTQ Z -> Magnetometer X
additional_bias_by_mtq_coefficients_1(7) = -80000.0 // MTQ Z -> Magnetometer Y
additional_bias_by_mtq_coefficients_1(8) = 90000.0 // MTQ Z -> Magnetometer Z

// 2nd coefficients of additional bias A2 [nT/Am2^2]
additional_bias_by_mtq_coefficients_2(0) = -10000.0 // MTQ X -> Magnetometer X
additional_bias_by_mtq_coefficients_2(1) = 20000.0 // MTQ X -> Magnetometer Y
additional_bias_by_mtq_coefficients_2(2) = -30000.0 // MTQ X -> Magnetometer Z
additional_bias_by_mtq_coefficients_2(3) = -40000.0 // MTQ Y -> Magnetometer X
additional_bias_by_mtq_coefficients_2(4) = 50000.0 // MTQ Y -> Magnetometer Y
additional_bias_by_mtq_coefficients_2(5) = -60000.0 // MTQ Y -> Magnetometer Z
additional_bias_by_mtq_coefficients_2(6) = -70000.0 // MTQ Z -> Magnetometer X
additional_bias_by_mtq_coefficients_2(7) = 80000.0 // MTQ Z -> Magnetometer Y
additional_bias_by_mtq_coefficients_2(8) = -90000.0 // MTQ Z -> Magnetometer Z
Loading
Loading