Skip to content

Commit

Permalink
Merge pull request #513 from ut-issl/feaure/small-fix-for-v7.0.0
Browse files Browse the repository at this point in the history
Information update for v7.0.0
  • Loading branch information
200km authored Oct 13, 2023
2 parents d6e87ea + 4c668f6 commit f83ce70
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13)
project(S2E
LANGUAGES CXX
DESCRIPTION "S2E: Spacecraft Simulation Environment"
VERSION 6.4.0
VERSION 7.0.0
)

# build config
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)

0 comments on commit f83ce70

Please sign in to comment.