mirror of https://github.com/meshcore-dev/MeshCore
Browse Source
See #2878. Introduces a new function `millisHasPassed` that correctly handles when either millis() or the checked number overflow. Also changes long to explicit uint32_t so that tests pass on non-32-bit platforms, too.pull/2882/head
Christoph Koehler
4 weeks ago
21 changed files with 116 additions and 48 deletions
@ -0,0 +1,17 @@ |
|||
#pragma once |
|||
|
|||
#include <stdint.h> |
|||
|
|||
// Wrap-safe check: has `now` reached or passed timestamp `t`?
|
|||
// Handles uint32_t rollover correctly for intervals up to ~24 days.
|
|||
inline bool millisHasPassed(uint32_t now, uint32_t t) { |
|||
return (int32_t)(now - t) >= 0; |
|||
} |
|||
|
|||
#ifdef ARDUINO |
|||
#include <Arduino.h> |
|||
// Convenience wrapper using Arduino's millis().
|
|||
inline bool millisHasPassed(uint32_t t) { |
|||
return millisHasPassed((uint32_t)millis(), t); |
|||
} |
|||
#endif |
|||
@ -0,0 +1,40 @@ |
|||
#include <gtest/gtest.h> |
|||
#include <helpers/ArduinoTimer.h> |
|||
#include <stdint.h> |
|||
|
|||
static constexpr uint32_t MAX = UINT32_MAX; |
|||
|
|||
TEST(MillisHasPassed, ReturnsTrueWhenNowExceedsTarget) { |
|||
EXPECT_TRUE(millisHasPassed(1000, 500)); |
|||
} |
|||
|
|||
TEST(MillisHasPassed, ReturnsTrueWhenNowEqualsTarget) { |
|||
EXPECT_TRUE(millisHasPassed(1000, 1000)); |
|||
} |
|||
|
|||
TEST(MillisHasPassed, ReturnsFalseWhenNowIsBeforeTarget) { |
|||
EXPECT_FALSE(millisHasPassed(500, 1000)); |
|||
} |
|||
|
|||
TEST(MillisHasPassed, ReturnsTrueAfterRollover) { |
|||
// Target was set when millis was near MAX: next_update = (MAX - 500) + 1000
|
|||
// which wraps to 499. Now millis has rolled over to 500.
|
|||
uint32_t target = MAX - 500 + 1000; // == 499 via wrapping
|
|||
EXPECT_TRUE(millisHasPassed(500, target)); |
|||
} |
|||
|
|||
TEST(MillisHasPassed, ReturnsFalseJustBeforeRolloverFires) { |
|||
// Target is 499 (wrapped), but now is only 498 — not there yet.
|
|||
uint32_t target = MAX - 500 + 1000; // == 499
|
|||
EXPECT_FALSE(millisHasPassed(498, target)); |
|||
} |
|||
|
|||
TEST(MillisHasPassed, ReturnsFalseWhenNowIsHighAndTargetIsHigherStill) { |
|||
// millis near MAX but hasn't reached target yet
|
|||
EXPECT_FALSE(millisHasPassed(MAX - 500, MAX - 100)); |
|||
} |
|||
|
|||
int main(int argc, char **argv) { |
|||
::testing::InitGoogleTest(&argc, argv); |
|||
return RUN_ALL_TESTS(); |
|||
} |
|||
Loading…
Reference in new issue