Browse Source

Code cleanup

tags/v1.2.0
Bertrand Lemasle 7 years ago
parent
commit
75eaaaab26
3 changed files with 9 additions and 10 deletions
  1. +1
    -1
      GpsTracker/Config.cpp
  2. +2
    -3
      GpsTracker/GpsTracker.ino
  3. +6
    -6
      GpsTracker/Rtc.cpp

+ 1
- 1
GpsTracker/Config.cpp View File

@@ -35,7 +35,7 @@ namespace config {
}; };


value = config; value = config;
format();
//format();
write(); write();


VERBOSE_FORMAT("reset", "value : %s, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry); VERBOSE_FORMAT("reset", "value : %s, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry);


+ 2
- 3
GpsTracker/GpsTracker.ino View File

@@ -10,10 +10,9 @@ void setup() {
if(Serial) Log.begin(LOG_LEVEL_NOTICE, &Serial); if(Serial) Log.begin(LOG_LEVEL_NOTICE, &Serial);
#endif #endif
rtc::powerOn();
rtc::setup();
rtc::powerOff();
config::read();


rtc::setup();
hardware::sim808::setup(); hardware::sim808::setup();
} }




+ 6
- 6
GpsTracker/Rtc.cpp View File

@@ -35,16 +35,16 @@ namespace rtc {
} }
void setup() { void setup() {
hardware::i2c::rtcPowerOn();
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
hardware::i2c::rtcPowerOff();
powerOff();
} }


void getTime(tmElements_t &time) { void getTime(tmElements_t &time) {
hardware::i2c::rtcPowerOn();
powerOn();
RTC.readTime(); RTC.readTime();
hardware::i2c::rtcPowerOff();
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);
@@ -54,9 +54,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);


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


void setAlarm(uint16_t seconds) { void setAlarm(uint16_t seconds) {


Loading…
Cancel
Save