From 64f44a5ee3474d133835f75285a9e7a2b075f5da Mon Sep 17 00:00:00 2001 From: Bertrand Lemasle Date: Sun, 11 Mar 2018 17:32:29 +1300 Subject: [PATCH] Removed rtc::powerOn && rtc::powerOff (handled internally) --- GpsTracker/Rtc.cpp | 16 ++++++++-------- GpsTracker/Rtc.h | 8 -------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/GpsTracker/Rtc.cpp b/GpsTracker/Rtc.cpp index 39062e2..f79a916 100644 --- a/GpsTracker/Rtc.cpp +++ b/GpsTracker/Rtc.cpp @@ -36,16 +36,16 @@ namespace rtc { void setup() { VERBOSE("setup"); - powerOn(); + hardware::i2c::powerOn(); RTC.control(DS3231_12H, DS3231_OFF); //24 hours clock RTC.control(DS3231_INT_ENABLE, DS3231_OFF); //INTCN OFF - powerOff(); + hardware::i2c::powerOff(); } void getTime(tmElements_t &time) { - powerOn(); + hardware::i2c::powerOn(); RTC.readTime(); - powerOff(); + hardware::i2c::powerOff(); details::readTimeFromRegisters(time); VERBOSE_FORMAT("getTime", "%d/%d/%d %d:%d:%d", tmYearToCalendar(time.Year), time.Month, time.Day, time.Hour, time.Minute, time.Second); @@ -55,9 +55,9 @@ namespace rtc { VERBOSE_FORMAT("setTime", "%d/%d/%d %d:%d:%d", tmYearToCalendar(time.Year), time.Month, time.Day, time.Hour, time.Minute, time.Second); details::writeTimeToRegisters(time); - powerOn(); + hardware::i2c::powerOn(); RTC.writeTime(); - powerOff(); + hardware::i2c::powerOff(); } void setAlarm(uint16_t seconds) { @@ -73,13 +73,13 @@ namespace rtc { void setAlarm(tmElements_t &time) { details::writeTimeToRegisters(time); - powerOn(); + hardware::i2c::powerOn(); RTC.writeAlarm1(DS3231_ALM_DTHMS); RTC.control(DS3231_A1_FLAG, DS3231_OFF); //reset Alarm 1 flag RTC.control(DS3231_A1_INT_ENABLE, DS3231_ON); //Alarm 1 ON RTC.control(DS3231_INT_ENABLE, DS3231_ON); //INTCN ON - powerOff(); + hardware::i2c::powerOff(); Log.notice(F("Set alarm to : %d/%d/%d %d:%d:%d\n"), tmYearToCalendar(time.Year), time.Month, time.Day, time.Hour, time.Minute, time.Second); diff --git a/GpsTracker/Rtc.h b/GpsTracker/Rtc.h index 5e2364c..c72dbc3 100644 --- a/GpsTracker/Rtc.h +++ b/GpsTracker/Rtc.h @@ -4,14 +4,6 @@ #include "Hardware.h" namespace rtc { - inline void powerOn() { - hardware::i2c::powerOn(); - } - - inline void powerOff() { - hardware::i2c::powerOff(); - } - void setup(); void getTime(tmElements_t &time);