From 6a15aa14a25cab28c98ad8c5bf5e160438194add Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 8 Mar 2023 11:37:11 +0100
Subject: [PATCH] changelog and new action cmd

---
 CHANGELOG.md                    |  7 +++++++
 bsp_q7s/core/CoreController.cpp | 20 ++++++++++++++------
 bsp_q7s/core/CoreController.h   |  2 ++
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0e04a6c..5631578e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,13 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+## Added
+
+- New `REBOOT_COUNTER` and `INDIVIDUAL_BOOT_COUNTS` events. The first contains the total boot count
+  as a u64, the second one contains the individual boot counts as 4 u16. Add new core controller
+  action command `ANNOUNCE_BOOT_COUNTS` with action ID 3 which triggers both events. These events
+  will also be triggered on each reboot.
+
 ## Changed
 
 - Persistent TM stores will now create new files on each reboot.
diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index 1eb89c6c..95ff671a 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -190,6 +190,10 @@ ReturnValue_t CoreController::executeAction(ActionId_t actionId, MessageQueueId_
       triggerEvent(VERSION_INFO, p1, p2);
       return HasActionsIF::EXECUTION_FINISHED;
     }
+    case (ANNOUNCE_BOOT_COUNTS): {
+      announceBootCounts();
+      return HasActionsIF::EXECUTION_FINISHED;
+    }
     case (ANNOUNCE_CURRENT_IMAGE): {
       triggerEvent(CURRENT_IMAGE_INFO, CURRENT_CHIP, CURRENT_COPY);
       return HasActionsIF::EXECUTION_FINISHED;
@@ -1326,12 +1330,7 @@ void CoreController::performRebootFileHandling(bool recreateFile) {
     rebootFile.bootFlag = false;
   }
 
-  uint32_t totalBootCount =
-      rebootFile.img00Cnt + rebootFile.img01Cnt + rebootFile.img10Cnt + rebootFile.img11Cnt;
-  uint32_t individualBootCountsP1 = (rebootFile.img00Cnt << 16) | rebootFile.img01Cnt;
-  uint32_t individualBootCountsP2 = (rebootFile.img10Cnt << 16) | rebootFile.img11Cnt;
-  triggerEvent(INDIVIDUAL_BOOT_COUNTS, individualBootCountsP1, individualBootCountsP2);
-  triggerEvent(REBOOT_COUNTER, totalBootCount, 0);
+  announceBootCounts();
 
   if (rebootFile.mechanismNextChip != xsc::NO_CHIP and
       rebootFile.mechanismNextCopy != xsc::NO_COPY) {
@@ -1988,6 +1987,15 @@ bool CoreController::startSdStateMachine(sd::SdCard targetActiveSd, SdCfgMode mo
   return true;
 }
 
+void CoreController::announceBootCounts() {
+  uint64_t totalBootCount =
+      rebootFile.img00Cnt + rebootFile.img01Cnt + rebootFile.img10Cnt + rebootFile.img11Cnt;
+  uint32_t individualBootCountsP1 = (rebootFile.img00Cnt << 16) | rebootFile.img01Cnt;
+  uint32_t individualBootCountsP2 = (rebootFile.img10Cnt << 16) | rebootFile.img11Cnt;
+  triggerEvent(INDIVIDUAL_BOOT_COUNTS, individualBootCountsP1, individualBootCountsP2);
+  triggerEvent(REBOOT_COUNTER, (totalBootCount >> 32) & 0xffffffff, totalBootCount & 0xffffffff);
+}
+
 bool CoreController::isNumber(const std::string &s) {
   return !s.empty() && std::find_if(s.begin(), s.end(),
                                     [](unsigned char c) { return !std::isdigit(c); }) == s.end();
diff --git a/bsp_q7s/core/CoreController.h b/bsp_q7s/core/CoreController.h
index a462a281..c5e23d48 100644
--- a/bsp_q7s/core/CoreController.h
+++ b/bsp_q7s/core/CoreController.h
@@ -78,6 +78,7 @@ class CoreController : public ExtendedControllerBase {
   static constexpr ActionId_t LIST_DIRECTORY_INTO_FILE = 0;
   static constexpr ActionId_t ANNOUNCE_VERSION = 1;
   static constexpr ActionId_t ANNOUNCE_CURRENT_IMAGE = 2;
+  static constexpr ActionId_t ANNOUNCE_BOOT_COUNTS = 3;
   static constexpr ActionId_t SWITCH_REBOOT_FILE_HANDLING = 5;
   static constexpr ActionId_t RESET_REBOOT_COUNTERS = 6;
   static constexpr ActionId_t SWITCH_IMG_LOCK = 7;
@@ -301,6 +302,7 @@ class CoreController : public ExtendedControllerBase {
   void setRebootMechanismLock(bool lock, xsc::Chip tgtChip, xsc::Copy tgtCopy);
   bool parseRebootFile(std::string path, RebootFile& file);
   void rewriteRebootFile(RebootFile file);
+  void announceBootCounts();
   void readHkData();
   bool isNumber(const std::string& s);
 };