瀏覽代碼

Code cleanup

tags/v1.2.0
Bertrand Lemasle 7 年之前
父節點
當前提交
06c331ce41
共有 8 個文件被更改,包括 8 次插入12 次删除
  1. +2
    -4
      GpsTracker/Config.cpp
  2. +1
    -0
      GpsTracker/Core.cpp
  3. +1
    -0
      GpsTracker/Debug.cpp
  4. +0
    -4
      GpsTracker/Debug.h
  5. +1
    -2
      GpsTracker/GpsTracker.ino
  6. +0
    -1
      GpsTracker/MainUnit.cpp
  7. +2
    -0
      GpsTracker/Rtc.cpp
  8. +1
    -1
      GpsTracker/Rtc.h

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

@@ -19,7 +19,7 @@ namespace config {
} }


void write() { void write() {
VERBOSE_FORMAT("write", "%s, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry);
VERBOSE_FORMAT("write", "%s, %s, %s, %d, %d", value.seed, value.version, value.apn, 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);
@@ -30,7 +30,7 @@ namespace config {
Config get() { Config get() {
if (value.seed[0] == '\0') details::read(); if (value.seed[0] == '\0') details::read();


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


@@ -51,8 +51,6 @@ namespace config {


value = config; value = config;
details::write(); details::write();

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



+ 1
- 0
GpsTracker/Core.cpp 查看文件

@@ -23,6 +23,7 @@ namespace core {


void updateSleepTime() { void updateSleepTime() {
VERBOSE("updateSleepTime"); VERBOSE("updateSleepTime");

uint8_t velocity; uint8_t velocity;
gps::getVelocity(velocity); gps::getVelocity(velocity);
setSleepTime(velocity); setSleepTime(velocity);


+ 1
- 0
GpsTracker/Debug.cpp 查看文件

@@ -160,6 +160,7 @@ namespace debug {


void setFakeGpsPosition() { void setFakeGpsPosition() {
strlcpy_P(gps::lastPosition, FAKE_GPS_ENTRY, GPS_POSITION_SIZE); strlcpy_P(gps::lastPosition, FAKE_GPS_ENTRY, GPS_POSITION_SIZE);

NOTICE_FORMAT("setFakeGpsPosition", "Last position set to : %s", gps::lastPosition); NOTICE_FORMAT("setFakeGpsPosition", "Last position set to : %s", gps::lastPosition);
} }




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

@@ -17,10 +17,6 @@
#define VERBOSE(f) LOG(verbose, f) #define VERBOSE(f) LOG(verbose, f)
#define VERBOSE_MSG(f, msg) LOG_MSG(verbose, f, msg) #define VERBOSE_MSG(f, msg) LOG_MSG(verbose, f, msg)
#define VERBOSE_FORMAT(f, msg, ...) LOG_FORMAT(verbose, f, msg, __VA_ARGS__) #define VERBOSE_FORMAT(f, msg, ...) LOG_FORMAT(verbose, f, msg, __VA_ARGS__)
//#define VERBOSE(f) Log.verbose(F("[" LOGGER_NAME "::" f "]\n"))
//#define VERBOSE_MSG(f, msg) Log.verbose(F("[" LOGGER_NAME "::" f "] " msg "\n"))
//#define VERBOSE_FORMAT(f, msg, ...) Log.verbose(F("[" LOGGER_NAME "::" f "] " msg "\n"), __VA_ARGS__)

#else #else


#define DISABLE_LOGGING 1 #define DISABLE_LOGGING 1


+ 1
- 2
GpsTracker/GpsTracker.ino 查看文件

@@ -1,5 +1,6 @@
#include "GpsTracker.h" #include "GpsTracker.h"
#include "Positions.h" #include "Positions.h"

bool bypassMenu = false; bool bypassMenu = false;


void setup() { void setup() {
@@ -10,8 +11,6 @@ void setup() {
if(Serial) Log.begin(LOG_LEVEL_NOTICE, &Serial); if(Serial) Log.begin(LOG_LEVEL_NOTICE, &Serial);
#endif #endif


Serial.println(sizeof(PositionEntry));
Serial.println(sizeof(PositionEntryMetadata));
rtc::setup(); rtc::setup();
hardware::sim808::setup(); hardware::sim808::setup();
} }


+ 0
- 1
GpsTracker/MainUnit.cpp 查看文件

@@ -4,7 +4,6 @@
#include "Debug.h" #include "Debug.h"


#define LOGGER_NAME "MainUnit" #define LOGGER_NAME "MainUnit"
const char WOKE_UP[] PROGMEM = "Woke up from sleep\n";


namespace mainunit { namespace mainunit {




+ 2
- 0
GpsTracker/Rtc.cpp 查看文件

@@ -41,6 +41,8 @@ namespace rtc {
RTC.control(DS3231_A1_INT_ENABLE, DS3231_OFF); //Alarm 1 OFF RTC.control(DS3231_A1_INT_ENABLE, DS3231_OFF); //Alarm 1 OFF
RTC.control(DS3231_INT_ENABLE, DS3231_ON); //INTCN OFF RTC.control(DS3231_INT_ENABLE, DS3231_ON); //INTCN OFF
hardware::i2c::powerOff(); hardware::i2c::powerOff();

//TODO : check wether the osc has been halted (meaning the battery could be dead)
} }


float getTemperature() { float getTemperature() {


+ 1
- 1
GpsTracker/Rtc.h 查看文件

@@ -1,12 +1,12 @@
#pragma once #pragma once


#include "Time2.h" #include "Time2.h"
#include "Hardware.h"


namespace rtc { namespace rtc {
void setup(); void setup();


float getTemperature(); float getTemperature();

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


Loading…
取消
儲存