소스 검색

Removed rtc::powerOn && rtc::powerOff (handled internally)

tags/v1.2.0
Bertrand Lemasle 7 년 전
부모
커밋
64f44a5ee3
2개의 변경된 파일8개의 추가작업 그리고 16개의 파일을 삭제
  1. +8
    -8
      GpsTracker/Rtc.cpp
  2. +0
    -8
      GpsTracker/Rtc.h

+ 8
- 8
GpsTracker/Rtc.cpp 파일 보기

@@ -36,16 +36,16 @@ namespace rtc {
void setup() { void setup() {
VERBOSE("setup"); VERBOSE("setup");
powerOn();
hardware::i2c::powerOn();
RTC.control(DS3231_12H, DS3231_OFF); //24 hours clock RTC.control(DS3231_12H, DS3231_OFF); //24 hours clock
RTC.control(DS3231_INT_ENABLE, DS3231_OFF); //INTCN OFF RTC.control(DS3231_INT_ENABLE, DS3231_OFF); //INTCN OFF
powerOff();
hardware::i2c::powerOff();
} }


void getTime(tmElements_t &time) { void getTime(tmElements_t &time) {
powerOn();
hardware::i2c::powerOn();
RTC.readTime(); RTC.readTime();
powerOff();
hardware::i2c::powerOff();


details::readTimeFromRegisters(time); 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); 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); 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); details::writeTimeToRegisters(time);


powerOn();
hardware::i2c::powerOn();
RTC.writeTime(); RTC.writeTime();
powerOff();
hardware::i2c::powerOff();
} }


void setAlarm(uint16_t seconds) { void setAlarm(uint16_t seconds) {
@@ -73,13 +73,13 @@ namespace rtc {
void setAlarm(tmElements_t &time) { void setAlarm(tmElements_t &time) {
details::writeTimeToRegisters(time); details::writeTimeToRegisters(time);


powerOn();
hardware::i2c::powerOn();
RTC.writeAlarm1(DS3231_ALM_DTHMS); RTC.writeAlarm1(DS3231_ALM_DTHMS);


RTC.control(DS3231_A1_FLAG, DS3231_OFF); //reset Alarm 1 flag 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_A1_INT_ENABLE, DS3231_ON); //Alarm 1 ON
RTC.control(DS3231_INT_ENABLE, DS3231_ON); //INTCN 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); 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);




+ 0
- 8
GpsTracker/Rtc.h 파일 보기

@@ -4,14 +4,6 @@
#include "Hardware.h" #include "Hardware.h"


namespace rtc { namespace rtc {
inline void powerOn() {
hardware::i2c::powerOn();
}

inline void powerOff() {
hardware::i2c::powerOff();
}

void setup(); void setup();


void getTime(tmElements_t &time); void getTime(tmElements_t &time);


불러오는 중...
취소
저장