From 455276fdc8a4b5f05e9db3a63b63594f8c4a20bd Mon Sep 17 00:00:00 2001 From: Bertrand Lemasle Date: Sun, 11 Mar 2018 17:26:50 +1300 Subject: [PATCH] APN is now part of the configuration --- GpsTracker/Config.cpp | 11 ++++++----- GpsTracker/Config.h | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/GpsTracker/Config.cpp b/GpsTracker/Config.cpp index 5528be7..5c9a96d 100644 --- a/GpsTracker/Config.cpp +++ b/GpsTracker/Config.cpp @@ -11,19 +11,19 @@ namespace config { void read() { VERBOSE("read"); - hardware::i2c::eepromPowerOn(); + hardware::i2c::powerOn(); hardware::i2c::eeprom.readBlock(CONFIG_ADDR, value); if (!String(CONFIG_SEED).equals(value.seed)) reset(); - hardware::i2c::eepromPowerOff(); + hardware::i2c::powerOff(); } void write() { VERBOSE_FORMAT("write", "%s, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry); - hardware::i2c::eepromPowerOn(); + hardware::i2c::powerOn(); int written = hardware::i2c::eeprom.writeBlock(CONFIG_ADDR, value); - hardware::i2c::eepromPowerOff(); + hardware::i2c::powerOff(); } } @@ -45,7 +45,8 @@ namespace config { CONFIG_SEED, VERSION, 0xFFFF, - 0xFFFF + 0xFFFF, + "2degrees Internet" //TODO : read from SD }; value = config; diff --git a/GpsTracker/Config.h b/GpsTracker/Config.h index 3d44f49..54fd2dc 100644 --- a/GpsTracker/Config.h +++ b/GpsTracker/Config.h @@ -9,9 +9,10 @@ struct sleepTimings_t { struct Config { char seed[5]; - char version[7]; + char version[5]; uint16_t firstEntry; uint16_t lastEntry; + char apn[20]; }; #define CONFIG_ADDR 0