3 files changed, 30 insertions, 8 deletions
diff --git a/src/components/ble/MotionService.cpp b/src/components/ble/MotionService.cpp
index 4b223c1e..44ad755f 100644
--- a/src/components/ble/MotionService.cpp
+++ b/src/components/ble/MotionService.cpp
@@ -64,7 +64,7 @@ int MotionService::OnStepCountRequested(uint16_t attributeHandle, ble_gatt_acces
     NRF_LOG_INFO("Motion-stepcount : handle = %d", stepCountHandle);
     uint32_t buffer = motionController.NbSteps();
 
-    int res = os_mbuf_append(context->om, &buffer, 4);
+    int res = os_mbuf_append(context->om, &buffer, sizeof(buffer));
     return (res == 0) ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
   }
   if (attributeHandle == motionValuesHandle) {
@@ -82,7 +82,7 @@ void MotionService::OnNewStepCountValue(uint32_t stepCount) {
   }
 
   uint32_t buffer = stepCount;
-  auto* om = ble_hs_mbuf_from_flat(&buffer, 4);
+  auto* om = ble_hs_mbuf_from_flat(&buffer, sizeof(buffer));
 
   uint16_t connectionHandle = nimble.connHandle();
 
diff --git a/src/components/motion/MotionController.cpp b/src/components/motion/MotionController.cpp
index 6cfff61f..ce959f0e 100644
--- a/src/components/motion/MotionController.cpp
+++ b/src/components/motion/MotionController.cpp
@@ -35,8 +35,17 @@ namespace {
   }
 }
 
+void MotionController::AdvanceDay() {
+  --nbSteps; // Higher index = further in the past
+  SetSteps(Days::Today, 0);
+  if (service != nullptr) {
+    service->OnNewStepCountValue(NbSteps(Days::Today));
+  }
+}
+
 void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps) {
-  if (this->nbSteps != nbSteps && service != nullptr) {
+  uint32_t oldSteps = NbSteps(Days::Today);
+  if (oldSteps != nbSteps && service != nullptr) {
     service->OnNewStepCountValue(nbSteps);
   }
 
@@ -64,11 +73,11 @@ void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps)
 
   stats = GetAccelStats();
 
-  int32_t deltaSteps = nbSteps - this->nbSteps;
+  int32_t deltaSteps = nbSteps - oldSteps;
   if (deltaSteps > 0) {
     currentTripSteps += deltaSteps;
   }
-  this->nbSteps = nbSteps;
+  SetSteps(Days::Today, nbSteps);
 }
 
 MotionController::AccelStats MotionController::GetAccelStats() const {
diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h
index ad95f31f..ed6cbbd1 100644
--- a/src/components/motion/MotionController.h
+++ b/src/components/motion/MotionController.h
@@ -18,6 +18,15 @@ namespace Pinetime {
         BMA425,
       };
 
+      enum class Days : uint8_t {
+        Today = 0,
+        Yesterday,
+      };
+
+      static constexpr size_t stepHistorySize = 2; // Store this many day's step counter
+
+      void AdvanceDay();
+
       void Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps);
 
       int16_t X() const {
@@ -32,8 +41,8 @@ namespace Pinetime {
         return zHistory[0];
       }
 
-      uint32_t NbSteps() const {
-        return nbSteps;
+      uint32_t NbSteps(Days day = Days::Today) const {
+        return nbSteps[static_cast<std::underlying_type_t<Days>>(day)];
       }
 
       void ResetTrip() {
@@ -66,9 +75,13 @@ namespace Pinetime {
       }
 
     private:
-      uint32_t nbSteps = 0;
+      Utility::CircularBuffer<uint32_t, stepHistorySize> nbSteps = {0};
       uint32_t currentTripSteps = 0;
 
+      void SetSteps(Days day, uint32_t steps) {
+        nbSteps[static_cast<std::underlying_type_t<Days>>(day)] = steps;
+      }
+
       TickType_t lastTime = 0;
       TickType_t time = 0;