-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #55 from floatplane/moment
Add Moment object, eliminate rollover bugs in time interval calculation
- Loading branch information
Showing
4 changed files
with
296 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #include "moment.hpp" | ||
|
|
||
| uint32_t Moment::_rolloverCount = 0; | ||
| uint32_t Moment::_lastValue = 0; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| #include <climits> | ||
| #include <cstdint> | ||
| #include <cstdio> | ||
|
|
||
| class Moment { | ||
| public: | ||
| struct MomentParts { | ||
| // ordered for packing | ||
| uint16_t milliseconds; | ||
| uint16_t days; | ||
| uint8_t years; | ||
| uint8_t hours; | ||
| uint8_t seconds; | ||
| uint8_t minutes; | ||
| }; | ||
|
|
||
| static void resetRolloverCount() { | ||
| _rolloverCount = 0; | ||
| _lastValue = 0; | ||
| } | ||
|
|
||
| #ifdef Arduino_h | ||
| static Moment now() { | ||
| return Moment(millis()); | ||
| } | ||
| #endif | ||
|
|
||
| static Moment never() { | ||
| return Moment(Never::never); | ||
| } | ||
|
|
||
| explicit Moment(uint32_t value) { | ||
| assign(value); | ||
| } | ||
|
|
||
| Moment(const Moment &rhs) = default; | ||
| Moment(Moment &&rhs) = default; | ||
| Moment &operator=(const Moment &rhs) = default; | ||
| Moment &operator=(Moment &&rhs) = default; | ||
|
|
||
| Moment &offset(int32_t value) { | ||
| _milliseconds += value; | ||
| return *this; | ||
| } | ||
|
|
||
| int64_t operator-(const Moment &other) const { | ||
| if (other._milliseconds == LLONG_MIN) { | ||
| return LLONG_MAX; | ||
| } | ||
| if (_milliseconds == LLONG_MIN) { | ||
| return -other._milliseconds; | ||
| } | ||
| return _milliseconds - other._milliseconds; | ||
| } | ||
|
|
||
| bool operator<(const Moment &other) const { | ||
| return _milliseconds < other._milliseconds; | ||
| } | ||
| bool operator>(const Moment &other) const { | ||
| return _milliseconds > other._milliseconds; | ||
| } | ||
| bool operator<=(const Moment &other) const { | ||
| return _milliseconds <= other._milliseconds; | ||
| } | ||
| bool operator>=(const Moment &other) const { | ||
| return _milliseconds >= other._milliseconds; | ||
| } | ||
| bool operator==(const Moment &other) const { | ||
| return _milliseconds == other._milliseconds; | ||
| } | ||
| bool operator!=(const Moment &other) const { | ||
| return _milliseconds != other._milliseconds; | ||
| } | ||
|
|
||
| MomentParts get() const { | ||
| return { | ||
| .milliseconds = static_cast<uint16_t>(_milliseconds % 1000UL), | ||
| .days = static_cast<uint16_t>(_milliseconds / 1000UL / 60UL / 60UL / 24UL % 365UL), | ||
| .years = static_cast<uint8_t>(_milliseconds / 1000UL / 60UL / 60UL / 24UL / 365UL), | ||
| .hours = static_cast<uint8_t>(_milliseconds / 1000UL / 60UL / 60UL % 24UL), | ||
| .seconds = static_cast<uint8_t>(_milliseconds / 1000UL % 60UL), | ||
| .minutes = static_cast<uint8_t>(_milliseconds / 1000UL / 60UL % 60UL), | ||
| }; | ||
| } | ||
|
|
||
| private: | ||
| void assign(uint32_t value) { | ||
| if (value < _lastValue) { | ||
| _rolloverCount++; | ||
| } | ||
| _lastValue = value; | ||
| _milliseconds = | ||
| static_cast<int64_t>(value) + static_cast<int64_t>(_rolloverCount) * 0xFFFFFFFFLL; | ||
| } | ||
|
|
||
| enum class Never { | ||
| never, | ||
| }; | ||
|
|
||
| explicit Moment(Never /*never*/) : _milliseconds(LLONG_MIN) { | ||
| } | ||
|
|
||
| int64_t _milliseconds; | ||
|
|
||
| static uint32_t _rolloverCount; | ||
| static uint32_t _lastValue; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.