diff --git a/libraries/dateTimeHelpers/.arduino-ci.yml b/libraries/dateTimeHelpers/.arduino-ci.yml index 86e8815a..77a333f9 100644 --- a/libraries/dateTimeHelpers/.arduino-ci.yml +++ b/libraries/dateTimeHelpers/.arduino-ci.yml @@ -20,9 +20,9 @@ compile: # - due # - zero # - leonardo - # - m4 - # - esp32 - # - esp8266 + - m4 + - esp32 + - esp8266 # - mega2560 - # - rpipico + - rpipico diff --git a/libraries/dateTimeHelpers/CHANGELOG.md b/libraries/dateTimeHelpers/CHANGELOG.md index eb611231..d72e7b83 100644 --- a/libraries/dateTimeHelpers/CHANGELOG.md +++ b/libraries/dateTimeHelpers/CHANGELOG.md @@ -6,12 +6,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [0.1.1] - 2023-03-07 +## [0.1.2] - 2023-01-18 +- fix build (PM is a reserved word on M4 / samd platform) +- minor fix changelog.md + + +## [0.1.1] - 2023-01-07 - initial release - clean up first version - add examples - ## [0.1.0] - 2020-07-01 - initial version diff --git a/libraries/dateTimeHelpers/dateTimeHelpers.h b/libraries/dateTimeHelpers/dateTimeHelpers.h index dd1fb9b2..dc91c662 100644 --- a/libraries/dateTimeHelpers/dateTimeHelpers.h +++ b/libraries/dateTimeHelpers/dateTimeHelpers.h @@ -2,7 +2,7 @@ // // FILE: datetimeHelpers.h // AUTHOR: Rob Tillaart -// VERSION: 0.1.1 +// VERSION: 0.1.2 // PURPOSE: Arduino library with date time helper functions. // DATE: 2020-07-01 // URL: https://github.com/RobTillaart/dateTimeHelpers @@ -145,7 +145,7 @@ char * seconds2clock12(uint32_t seconds, bool displaySeconds = false) // (false) 00:00 .. 12:59 AM/PM char * seconds2clockAMPM(uint32_t seconds, bool displaySeconds = false) { - bool PM = false; + bool PMflag = false; char * buf = __dateTimeHelperBuffer; uint8_t pos = 0; @@ -155,7 +155,7 @@ char * seconds2clockAMPM(uint32_t seconds, bool displaySeconds = false) if (hours >= 12) { - PM = true; + PMflag = true; if (hours > 12) hours -= 12; } uint8_t t = hours / 10; @@ -175,7 +175,7 @@ char * seconds2clockAMPM(uint32_t seconds, bool displaySeconds = false) } buf[pos++] = ' '; - if (PM) buf[pos++] = 'P'; + if (PMflag == true) buf[pos++] = 'P'; else buf[pos++] = 'A'; buf[pos++] = 'M'; buf[pos] = '\0'; diff --git a/libraries/dateTimeHelpers/library.json b/libraries/dateTimeHelpers/library.json index 4871ed2c..9b403e74 100644 --- a/libraries/dateTimeHelpers/library.json +++ b/libraries/dateTimeHelpers/library.json @@ -15,7 +15,7 @@ "type": "git", "url": "https://github.com/RobTillaart/dateTimeHelpers.git" }, - "version":"0.1.1", + "version":"0.1.2", "frameworks": "arduino", "platforms": "*" } diff --git a/libraries/dateTimeHelpers/library.properties b/libraries/dateTimeHelpers/library.properties index fb036f0c..09611fa3 100644 --- a/libraries/dateTimeHelpers/library.properties +++ b/libraries/dateTimeHelpers/library.properties @@ -1,5 +1,5 @@ name=dateTimeHelpers -version=0.1.1 +version=0.1.2 author=Rob Tillaart maintainer=Rob Tillaart sentence=Arduino library with date and time helper functions. @@ -7,5 +7,5 @@ paragraph= category=Data Processing url=https://github.com/RobTillaart/dateTimeHelpers architectures=* -includes=datetimeHelpers.h +includes=dateTimeHelpers.h depends=