Merge remote-tracking branch 'origin/develop' into pdec_possible_fixes_and_fdir

CHANGELOG.md

@@ -17,6 +17,38 @@ change warranting a new major release:
 
 # [unreleased]
 
+## Added
+
+- PDEC: Added basic FDIR to limit the number of allowed TC interrupts and to allow complete task
+  lockups in the case an IRQ is immediately re-raised by the PDEC module. This is done by only
+  allowing a certain number of handled IRQs (whether they yield a valid TC or not) during
+  time windows of one second. Right now, 800 IRQs/TCs are allowed per time window.
+  This time window is reset if a TC reception timeout after 500ms occurs. TBD whether the maximum
+  allowed number will be a configurable parameter. If the number of occured IRQs is exceeded,
+  an event is triggered and the task is delayed for 400 ms.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/393
+
+# [v1.29.0]
+
+eive-tmtc: v2.13.0
+
+## Changed
+
+- Refactored IMTQ handlers to also perform low level I2C communication tasks in separate thread.
+  This avoids the various delays needed for I2C communication with that device inside the ACS PST.
+  (e.g. 1 ms delay between each transfer, or 10 ms integration delay for MGM measurements).
+
+## Added
+
+- Added new heater info set for the TCS controller. This set contains the heater switch states
+  and the current draw.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/351
+- The HeaterHandler now exposes a mode which reflects whether the heater power
+  is on or off. It also triggers mode events for its heater children objects
+  which show whether the specific heaters are on or off. The heater handler
+  will be part of the TCS tree.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/351
+
 # [v1.28.1]
 
 ## Fixed
@@ -34,9 +66,6 @@ change warranting a new major release:
 ## Changed
 
 - Add `-Wshadow=local` shadowing warnings and fixed all of them
-- Refactored IMTQ handlers to also perform low level I2C communication tasks in separate thread.
-  This avoids the various delays needed for I2C communication with that device inside the ACS PST.
-  (e.g. 1 ms delay between each transfer, or 10 ms integration delay for MGM measurements).
 - Updated generated CSV files: Support for skip directive and explicit
   "No description" info string
 - The polling threads for actuator polling now have a slightly higher priority than the ACS PST
@@ -44,22 +73,6 @@ change warranting a new major release:
 
 ## Added
 
-- PDEC: Added basic FDIR to limit the number of allowed TC interrupts and to allow complete task
-  lockups in the case an IRQ is immediately re-raised by the PDEC module. This is done by only
-  allowing a certain number of handled IRQs (whether they yield a valid TC or not) during
-  time windows of one second. Right now, 800 IRQs/TCs are allowed per time window.
-  This time window is reset if a TC reception timeout after 500ms occurs. TBD whether the maximum
-  allowed number will be a configurable parameter. If the number of occured IRQs is exceeded,
-  an event is triggered and the task is delayed for 400 ms.
-  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/393
-- Added new heater info set for the TCS controller. This set contains the heater switch states
-  and the current draw.
-  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/351
-- The HeaterHandler now exposes a mode which reflects whether the heater power
-  is on or off. It also triggers mode events for its heater children objects
-  which show whether the specific heaters are on or off. The heater handler
-  will be part of the TCS tree.
-  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/351
 - git post checkout hook which initializes and updates the submodules
   automatically.
 

CMakeLists.txt

@@ -10,8 +10,8 @@
 cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR 1)
-set(OBSW_VERSION_MINOR 28)
-set(OBSW_VERSION_REVISION 1)
+set(OBSW_VERSION_MINOR 29)
+set(OBSW_VERSION_REVISION 0)
 
 # set(CMAKE_VERBOSE TRUE)
 

tmtc

@@ -1 +1 @@
-Subproject commit 5f082cd9fccdaa304f00d92c1f25cdd6a7d8ed0b
+Subproject commit 4ced2d0b185f9949662c946ca71fe666ac25e411