Merge remote-tracking branch 'origin/develop' into acs-ctrl-v1

CHANGELOG.md

@@ -10,6 +10,13 @@ list yields a list of all related PRs for each release.
 
 # [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
 
 - 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`.
   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
 
 ## Added

CMakeLists.txt

@@ -10,7 +10,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 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(CMAKE_VERBOSE TRUE)