Skip to content

Commit

Permalink
Merge pull request #512 from ut-issl/develop
Browse files Browse the repository at this point in the history
Merge develop to main for Major update v7.0.0
  • Loading branch information
200km authored Oct 14, 2023
2 parents c1b44b7 + 4d5efc0 commit 45c0c76
Show file tree
Hide file tree
Showing 202 changed files with 6,124 additions and 3,630 deletions.
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)
33 changes: 33 additions & 0 deletions data/sample/initialize_files/components/component_interference.ini
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

0 comments on commit 45c0c76

Please sign in to comment.