Skip to content

Commit 56c7cca

Browse files
committed
getHour() 1-12
fix #40
1 parent e06f6b4 commit 56c7cca

7 files changed

Lines changed: 12 additions & 6 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
*.py

ESP32Time.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ int ESP32Time::getMinute(){
278278
@brief get the current hour as int
279279
@param mode
280280
true = 24 hour mode (0-23)
281-
false = 12 hour mode (0-12)
281+
false = 12 hour mode (1-12)
282282
*/
283283
int ESP32Time::getHour(bool mode){
284284
struct tm timeinfo = getTimeStruct();
@@ -293,6 +293,10 @@ int ESP32Time::getHour(bool mode){
293293
{
294294
return timeinfo.tm_hour-12;
295295
}
296+
else if (hour == 0)
297+
{
298+
return 12; // 12 am
299+
}
296300
else
297301
{
298302
return timeinfo.tm_hour;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ getEpoch() // (unsigned long) 1609459200
2727
getLocalEpoch() // (unsigned long) 1609459200 // local epoch without offset
2828
getSecond() // (int) 38 (0-59)
2929
getMinute() // (int) 24 (0-59)
30-
getHour() // (int) 3 (0-12)
30+
getHour() // (int) 3 (1-12)
3131
getHour(true) // (int) 15 (0-23)
3232
getAmPm() // (String) PM
3333
getAmPm(true) // (String) pm

examples/esp32_time/esp32_time.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void loop() {
5555
// Serial.println(rtc.getEpoch()); // (long) 1609459200
5656
// Serial.println(rtc.getSecond()); // (int) 38 (0-59)
5757
// Serial.println(rtc.getMinute()); // (int) 24 (0-59)
58-
// Serial.println(rtc.getHour()); // (int) 3 (0-12)
58+
// Serial.println(rtc.getHour()); // (int) 3 (1-12)
5959
// Serial.println(rtc.getHour(true)); // (int) 15 (0-23)
6060
// Serial.println(rtc.getAmPm()); // (String) pm
6161
// Serial.println(rtc.getAmPm(true)); // (String) PM

examples/esp32_time_multiple/esp32_time_multiple.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void loop() {
5252
// Serial.println(rtc.getEpoch()); // (unsigned long) 1609459200
5353
// Serial.println(rtc.getSecond()); // (int) 38 (0-59)
5454
// Serial.println(rtc.getMinute()); // (int) 24 (0-59)
55-
// Serial.println(rtc.getHour()); // (int) 3 (0-12)
55+
// Serial.println(rtc.getHour()); // (int) 3 (1-12)
5656
// Serial.println(rtc.getHour(true)); // (int) 15 (0-23)
5757
// Serial.println(rtc.getAmPm()); // (String) pm
5858
// Serial.println(rtc.getAmPm(true)); // (String) PM

library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ESP32Time",
3-
"version": "2.0.5",
3+
"version": "2.0.6",
44
"keywords": "Arduino, ESP32, Time, Internal RTC",
55
"description": "An Arduino library for setting and retrieving internal RTC time on ESP32 boards",
66
"repository":

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=ESP32Time
2-
version=2.0.5
2+
version=2.0.6
33
author=fbiego
44
maintainer=fbiego
55
sentence=Set and retrieve internal RTC time on ESP32 boards.

0 commit comments

Comments
 (0)