From b29ee58e0a6df2596f1cfca3ef3f97094da8060a Mon Sep 17 00:00:00 2001 From: Steve Evans Date: Sun, 26 Dec 2021 18:08:50 +0000 Subject: [PATCH] Display stats on disarm --- src/main/osd/osd.c | 2 +- src/test/unit/osd_unittest.cc | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/osd/osd.c b/src/main/osd/osd.c index 934c9055f6..4ab1853c76 100644 --- a/src/main/osd/osd.c +++ b/src/main/osd/osd.c @@ -1151,7 +1151,7 @@ void osdUpdate(timeUs_t currentTimeUs) osdUpdateAlarms(); if (resumeRefreshAt) { - osdState = OSD_STATE_IDLE; + osdState = OSD_STATE_TRANSFER; } else { osdState = OSD_STATE_UPDATE_CANVAS; } diff --git a/src/test/unit/osd_unittest.cc b/src/test/unit/osd_unittest.cc index 3272f83027..7439c30efd 100644 --- a/src/test/unit/osd_unittest.cc +++ b/src/test/unit/osd_unittest.cc @@ -709,7 +709,7 @@ TEST_F(OsdTest, TestAlarms) // elements showing values in alarm range should flash simulationTime += 1000000; simulationTime -= simulationTime % 1000000; - timeUs_t startTime = simulationTime; + timeUs_t startTime = simulationTime + 0.25e6; for (int i = 0; i < 15; i++) { // Blinking should happen at 2Hz simulationTime = startTime + i*0.25e6; @@ -1083,7 +1083,6 @@ TEST_F(OsdTest, TestElementWarningsBattery) // Delay as the warnings are flashing simulationTime += 1000000; simulationTime -= simulationTime % 1000000; - simulationTime += 0.25e6; osdRefresh(); // then @@ -1099,7 +1098,6 @@ TEST_F(OsdTest, TestElementWarningsBattery) // Delay as the warnings are flashing simulationTime += 1000000; simulationTime -= simulationTime % 1000000; - simulationTime += 0.25e6; osdRefresh(); // then @@ -1206,7 +1204,7 @@ TEST_F(OsdTest, TestGpsElements) // Sat indicator should blink and show "NC" simulationTime += 1000000; simulationTime -= simulationTime % 1000000; - timeUs_t startTime = simulationTime; + timeUs_t startTime = simulationTime + 0.25e6; for (int i = 0; i < 15; i++) { // Blinking should happen at 2Hz simulationTime = startTime + i*0.25e6; @@ -1230,7 +1228,7 @@ TEST_F(OsdTest, TestGpsElements) // Sat indicator should blink and show "0" simulationTime += 1000000; simulationTime -= simulationTime % 1000000; - startTime = simulationTime; + startTime = simulationTime + 0.25e6; for (int i = 0; i < 15; i++) { // Blinking should happen at 2Hz simulationTime = startTime + i*0.25e6;