Skip to content

Commit a53a773

Browse files
authored
Merge pull request #394 from pennam/rtc_merge_h7_rp
Time Service: merge STM42H7 and NANO RP2040 RTC functions
2 parents ad862b5 + 4b0ef29 commit a53a773

File tree

1 file changed

+14
-43
lines changed

1 file changed

+14
-43
lines changed

src/utility/time/TimeService.cpp

+14-43
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,10 @@ void samd_setRTC(unsigned long time);
6666
unsigned long samd_getRTC();
6767
#endif
6868

69-
#ifdef ARDUINO_NANO_RP2040_CONNECT
70-
void rp2040_connect_initRTC();
71-
void rp2040_connect_setRTC(unsigned long time);
72-
unsigned long rp2040_connect_getRTC();
73-
#endif
74-
75-
#ifdef BOARD_STM32H7
76-
void stm32h7_initRTC();
77-
void stm32h7_setRTC(unsigned long time);
78-
unsigned long stm32h7_getRTC();
69+
#ifdef ARDUINO_ARCH_MBED
70+
void mbed_initRTC();
71+
void mbed_setRTC(unsigned long time);
72+
unsigned long mbed_getRTC();
7973
#endif
8074

8175
#ifdef ARDUINO_ARCH_ESP32
@@ -337,10 +331,8 @@ void TimeServiceClass::initRTC()
337331
{
338332
#if defined (ARDUINO_ARCH_SAMD)
339333
samd_initRTC();
340-
#elif defined (ARDUINO_NANO_RP2040_CONNECT)
341-
rp2040_connect_initRTC();
342-
#elif defined (BOARD_STM32H7)
343-
stm32h7_initRTC();
334+
#elif defined (ARDUINO_ARCH_MBED)
335+
mbed_initRTC();
344336
#elif defined (ARDUINO_ARCH_ESP32)
345337
esp32_initRTC();
346338
#elif defined (ARDUINO_ARCH_ESP8266)
@@ -356,10 +348,8 @@ void TimeServiceClass::setRTC(unsigned long time)
356348
{
357349
#if defined (ARDUINO_ARCH_SAMD)
358350
samd_setRTC(time);
359-
#elif defined (ARDUINO_NANO_RP2040_CONNECT)
360-
rp2040_connect_setRTC(time);
361-
#elif defined (BOARD_STM32H7)
362-
stm32h7_setRTC(time);
351+
#elif defined (ARDUINO_ARCH_MBED)
352+
mbed_setRTC(time);
363353
#elif defined (ARDUINO_ARCH_ESP32)
364354
esp32_setRTC(time);
365355
#elif defined (ARDUINO_ARCH_ESP8266)
@@ -375,10 +365,8 @@ unsigned long TimeServiceClass::getRTC()
375365
{
376366
#if defined (ARDUINO_ARCH_SAMD)
377367
return samd_getRTC();
378-
#elif defined (ARDUINO_NANO_RP2040_CONNECT)
379-
return rp2040_connect_getRTC();
380-
#elif defined (BOARD_STM32H7)
381-
return stm32h7_getRTC();
368+
#elif defined (ARDUINO_ARCH_MBED)
369+
return mbed_getRTC();
382370
#elif defined (ARDUINO_ARCH_ESP32)
383371
return esp32_getRTC();
384372
#elif defined (ARDUINO_ARCH_ESP8266)
@@ -447,35 +435,18 @@ unsigned long samd_getRTC()
447435
}
448436
#endif
449437

450-
#ifdef ARDUINO_NANO_RP2040_CONNECT
451-
void rp2040_connect_initRTC()
452-
{
453-
/* Nothing to do */
454-
}
455-
456-
void rp2040_connect_setRTC(unsigned long time)
457-
{
458-
set_time(time);
459-
}
460-
461-
unsigned long rp2040_connect_getRTC()
462-
{
463-
return time(NULL);
464-
}
465-
#endif
466-
467-
#ifdef BOARD_STM32H7
468-
void stm32h7_initRTC()
438+
#ifdef ARDUINO_ARCH_MBED
439+
void mbed_initRTC()
469440
{
470441
/* Nothing to do */
471442
}
472443

473-
void stm32h7_setRTC(unsigned long time)
444+
void mbed_setRTC(unsigned long time)
474445
{
475446
set_time(time);
476447
}
477448

478-
unsigned long stm32h7_getRTC()
449+
unsigned long mbed_getRTC()
479450
{
480451
return time(NULL);
481452
}

0 commit comments

Comments
 (0)