Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into develop

changelog
make health functions virtual
2023-04-04 01:52:29 +02:00 · 2023-04-04 01:52:26 +02:00 · 2023-04-04 01:51:58 +02:00
2 changed files with 6 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 # [unreleased]
 ## Changed
 - Health functions are virtual now.
 # [v6.0.0] 2023-02-10
 ## Fixes
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.h
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.h
@@ -257,8 +257,8 @@ class DeviceHandlerBase : public DeviceHandlerIF,
  Mode_t getTransitionSourceMode() const;
  Submode_t getTransitionSourceSubMode() const;
  virtual void getMode(Mode_t *mode, Submode_t *submode);
-  HealthState getHealth();
+  virtual HealthState getHealth() override;
-  ReturnValue_t setHealth(HealthState health);
+  virtual ReturnValue_t setHealth(HealthState health) override;
  virtual ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId,
                                     ParameterWrapper *parameterWrapper,
                                     const ParameterWrapper *newValues,
Author	SHA1	Message	Date
Robin Mueller	9fca7581dd	Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into develop	2023-04-04 01:52:29 +02:00
Robin Mueller	4af90f99f3	changelog	2023-04-04 01:52:26 +02:00
Robin Mueller	94cdf67a80	make health functions virtual	2023-04-04 01:51:58 +02:00