瀏覽代碼

Transformed config seed into uint8_t and removed apn from config

tags/v1.2.0
Bertrand Lemasle 7 年之前
父節點
當前提交
f7679c8187
共有 4 個檔案被更改,包括 12 行新增10 行删除
  1. +4
    -5
      GpsTracker/Config.cpp
  2. +3
    -4
      GpsTracker/Config.h
  3. +1
    -1
      GpsTracker/Hardware.cpp
  4. +4
    -0
      GpsTracker/NetworkPositionsConfig.h

+ 4
- 5
GpsTracker/Config.cpp 查看文件

@@ -15,12 +15,12 @@ namespace config {
VERBOSE("read"); VERBOSE("read");
hardware::i2c::powerOn(); hardware::i2c::powerOn();
hardware::i2c::eeprom.readBlock(CONFIG_ADDR, value); hardware::i2c::eeprom.readBlock(CONFIG_ADDR, value);
if (!String(CONFIG_SEED).equals(value.seed)) reset();
if (CONFIG_SEED != value.seed) reset();
hardware::i2c::powerOff(); hardware::i2c::powerOff();
} }


void write() { void write() {
VERBOSE_FORMAT("write", "%s, %s, %s, %d, %d", value.seed, value.version, value.apn, value.firstEntry, value.lastEntry);
VERBOSE_FORMAT("write", "%d, %s, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry);


hardware::i2c::powerOn(); hardware::i2c::powerOn();
int written = hardware::i2c::eeprom.writeBlock(CONFIG_ADDR, value); int written = hardware::i2c::eeprom.writeBlock(CONFIG_ADDR, value);
@@ -29,9 +29,9 @@ namespace config {
} }


Config_t get() { Config_t get() {
if (value.seed[0] == '\0') details::read();
if (value.seed == 0) details::read();


VERBOSE_FORMAT("get", "%s, %s, %s, %d, %d", value.seed, value.version, value.apn, value.firstEntry, value.lastEntry);
VERBOSE_FORMAT("get", "%d, %s, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry);
return value; return value;
} }


@@ -45,7 +45,6 @@ namespace config {
Config_t config = { Config_t config = {
CONFIG_SEED, CONFIG_SEED,
VERSION, VERSION,
"Vodafone", //TODO : read from SD
0xFFFF, 0xFFFF,
0xFFFF, 0xFFFF,
}; };


+ 3
- 4
GpsTracker/Config.h 查看文件

@@ -3,11 +3,11 @@
#include <Arduino.h> #include <Arduino.h>


#define BACKUP_ENABLE_SDCARD 0 #define BACKUP_ENABLE_SDCARD 0
#define BACKUP_ENABLE_NETWORK 0
#define BACKUP_ENABLE_NETWORK 1


#define CONFIG_ADDR 0 #define CONFIG_ADDR 0
#define CONFIG_RESERVED_SIZE 128 #define CONFIG_RESERVED_SIZE 128
#define CONFIG_SEED "UIYA"
#define CONFIG_SEED 13
#define VERSION "1.00" #define VERSION "1.00"


#define SLEEP_DEFAULT_TIME_SECONDS 1800 #define SLEEP_DEFAULT_TIME_SECONDS 1800
@@ -21,9 +21,8 @@ struct sleepTimings_t {
}; };


struct Config_t { struct Config_t {
char seed[5];
uint8_t seed;
char version[5]; char version[5];
char apn[20];
uint16_t firstEntry; uint16_t firstEntry;
uint16_t lastEntry; uint16_t lastEntry;
}; };


+ 1
- 1
GpsTracker/Hardware.cpp 查看文件

@@ -65,7 +65,7 @@ namespace hardware {
VERBOSE("networkPowerOn"); VERBOSE("networkPowerOn");
powerOn(); powerOn();
device.setPhoneFunctionality(SIM808_PHONE_FUNCTIONALITY::FULL); device.setPhoneFunctionality(SIM808_PHONE_FUNCTIONALITY::FULL);
device.enableGprs(config::main::get().apn);
device.enableGprs("Vodafone"); //TODO : get from config
} }


void networkPowerOff() { void networkPowerOff() {


+ 4
- 0
GpsTracker/NetworkPositionsConfig.h 查看文件

@@ -0,0 +1,4 @@
#pragma once


#define POSITIONS_CONFIG_DEFAULT_SAVE_THRESHOLD 10

Loading…
取消
儲存