浏览代码

Merge branch 'code-reduction' into alerts

tags/v1.2.0
Bertrand Lemasle 6 年前
父节点
当前提交
9d77538dd9
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. +2
    -1
      GpsTracker/Core.cpp
  2. +1
    -1
      GpsTracker/NetworkPositionsBackup.cpp

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

@@ -54,7 +54,7 @@ namespace core {


uint8_t notifyFailures(PositionEntryMetadata &metadata) { uint8_t notifyFailures(PositionEntryMetadata &metadata) {
SIM808RegistrationStatus networkStatus; SIM808RegistrationStatus networkStatus;
char buffer[SMS_BUFFER_SIZE] = "Alerts !\n";
char buffer[SMS_BUFFER_SIZE];
const __FlashStringHelper * backupFailureString = F(" Backup battery failure ?\n"); const __FlashStringHelper * backupFailureString = F(" Backup battery failure ?\n");


uint8_t triggered = alerts::getTriggered(metadata); uint8_t triggered = alerts::getTriggered(metadata);
@@ -65,6 +65,7 @@ namespace core {


if (!network::isAvailable(networkStatus.stat)) return NO_ALERTS_NOTIFIED; if (!network::isAvailable(networkStatus.stat)) return NO_ALERTS_NOTIFIED;


details::appendToSmsBuffer(buffer, PSTR("Alerts !\n"));
if (bitRead(triggered, ALERT_BATTERY_LEVEL_1) || bitRead(triggered, ALERT_BATTERY_LEVEL_2)) { if (bitRead(triggered, ALERT_BATTERY_LEVEL_1) || bitRead(triggered, ALERT_BATTERY_LEVEL_2)) {
details::appendToSmsBuffer(buffer, PSTR("- Battery at %d%%.\n"), metadata.batteryLevel); details::appendToSmsBuffer(buffer, PSTR("- Battery at %d%%.\n"), metadata.batteryLevel);
} }


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

@@ -26,7 +26,7 @@ namespace positions {


bool NetworkPositionsBackup::appendPosition(PositionEntry &entry) { bool NetworkPositionsBackup::appendPosition(PositionEntry &entry) {
char buffer[BUFFER_SIZE]; char buffer[BUFFER_SIZE];
snprintf(buffer, BUFFER_SIZE, "%d,%d,%d,%d,%d,%d,%d,",
snprintf_P(buffer, BUFFER_SIZE, PSTR("%d,%d,%d,%d,%d,%d,%d,"),
debug::freeRam(), debug::freeRam(),
hardware::sim808::device.getSignalQuality().attenuation, hardware::sim808::device.getSignalQuality().attenuation,
entry.metadata.batteryLevel, entry.metadata.batteryLevel,


正在加载...
取消
保存