eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Merge remote-tracking branch 'origin/develop' into acs-ctrl-v1
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2022-12-01 16:39:54 +01:00
commit 72300f0217
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG.md
View File

@ -10,6 +10,13 @@ list yields a list of all related PRs for each release.
# [unreleased] # [unreleased]
## Added
- First version of ACS controller
PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/329
# [v1.18.0] 01.12.2022
## Changed ## Changed
- PLOC Supervisor: Changes baudrate to 921600 - PLOC Supervisor: Changes baudrate to 921600
@ -17,11 +24,6 @@ list yields a list of all related PRs for each release.
- Renamed `/dev/i2c_eive` to `/dev/i2c_pl` and `/dev/i2c-2` to `/dev/i2c_ps`. - Renamed `/dev/i2c_eive` to `/dev/i2c_pl` and `/dev/i2c-2` to `/dev/i2c_ps`.
PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/328 PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/328
## Added
- First version of ACS controller
PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/329
# [v1.17.0] 28.11.2022 # [v1.17.0] 28.11.2022
## Added ## Added

2
CMakeLists.txt
View File

@ -10,7 +10,7 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 1) set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 1)
set(OBSW_VERSION_MINOR_IF_GIT_FAILS 17) set(OBSW_VERSION_MINOR_IF_GIT_FAILS 18)
set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0) set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0)
# set(CMAKE_VERBOSE TRUE) # set(CMAKE_VERBOSE TRUE)

2
tmtc

@ -1 +1 @@
Subproject commit 6308bbb3f0e4387508371bd3d18c52f404c4e18b Subproject commit 6e152818707c7a12be8900bc239a0073053c0bec