Gateway: remove logging
Timm Bogner
4 months ago
parent
bd3fcb1f7c
commit
023298965e
@ -1,222 +0,0 @@
|
||||
|
||||
#ifdef USE_SD_LOG
|
||||
#include <SPI.h>
|
||||
#include <SD.h>
|
||||
#endif
|
||||
#ifdef USE_FS_LOG
|
||||
#include <LittleFS.h>
|
||||
#endif
|
||||
#include <time.h>
|
||||
|
||||
#define SD_MAX_FILESIZE 1024
|
||||
#define FS_MAX_FILESIZE 1024
|
||||
|
||||
|
||||
char logBuffer[512];
|
||||
uint16_t logBufferPos = 0; // datatype depends on size of sdBuffer
|
||||
uint32_t timeLOGBUF = 0;
|
||||
time_t last_mqtt_success = 0;
|
||||
time_t last_log_write = 0;
|
||||
|
||||
void releaseLogBuffer()
|
||||
{
|
||||
#ifdef USE_SD_LOG
|
||||
DBG("Releasing Log buffer to SD");
|
||||
File logfile = SD.open(LOG_FILENAME, FILE_WRITE);
|
||||
if ((logfile.size() / 1024.0) < SD_MAX_FILESIZE)
|
||||
{
|
||||
logfile.print(logBuffer);
|
||||
}
|
||||
logfile.close();
|
||||
#endif
|
||||
#ifdef USE_FS_LOG
|
||||
DBG("Releasing Log buffer to internal flash.");
|
||||
File logfile = LittleFS.open(LOG_FILENAME, "a");
|
||||
if ((logfile.size() / 1024.0) < FS_MAX_FILESIZE)
|
||||
{
|
||||
logfile.print(logBuffer);
|
||||
}
|
||||
logfile.close();
|
||||
#endif
|
||||
memset(&(logBuffer[0]), 0, sizeof(logBuffer) / sizeof(char));
|
||||
logBufferPos = 0;
|
||||
}
|
||||
|
||||
void handleLogger()
|
||||
{
|
||||
if ((millis() - timeLOGBUF) >= LOGBUF_DELAY)
|
||||
{
|
||||
timeLOGBUF = millis();
|
||||
if (logBufferPos > 0)
|
||||
releaseLogBuffer();
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef USE_LORA
|
||||
// crc16_update used by both LoRa and filesystem
|
||||
|
||||
// CRC16 from https://github.com/4-20ma/ModbusMaster/blob/3a05ff87677a9bdd8e027d6906dc05ca15ca8ade/src/util/crc16.h#L71
|
||||
|
||||
/** @ingroup util_crc16
|
||||
Processor-independent CRC-16 calculation.
|
||||
Polynomial: x^16 + x^15 + x^2 + 1 (0xA001)<br>
|
||||
Initial value: 0xFFFF
|
||||
This CRC is normally used in disk-drive controllers.
|
||||
@param uint16_t crc (0x0000..0xFFFF)
|
||||
@param uint8_t a (0x00..0xFF)
|
||||
@return calculated CRC (0x0000..0xFFFF)
|
||||
*/
|
||||
|
||||
static uint16_t crc16_update(uint16_t crc, uint8_t a)
|
||||
{
|
||||
int i;
|
||||
|
||||
crc ^= a;
|
||||
for (i = 0; i < 8; ++i)
|
||||
{
|
||||
if (crc & 1)
|
||||
crc = (crc >> 1) ^ 0xA001;
|
||||
else
|
||||
crc = (crc >> 1);
|
||||
}
|
||||
|
||||
return crc;
|
||||
}
|
||||
#endif
|
||||
|
||||
uint16_t stringCrc(const char input[])
|
||||
{
|
||||
uint16_t calcCRC = 0x0000;
|
||||
|
||||
for (unsigned int i = 0; i < strlen(input); i++)
|
||||
{
|
||||
calcCRC = crc16_update(calcCRC, input[i]);
|
||||
}
|
||||
return calcCRC;
|
||||
}
|
||||
|
||||
void sendLog()
|
||||
{
|
||||
DBG("Logging to buffer");
|
||||
for (int i = 0; i < ln; i++)
|
||||
{
|
||||
JsonDocument doc;
|
||||
JsonObject doc_0 = doc.createNestedObject();
|
||||
doc_0["id"] = theData[i].id;
|
||||
doc_0["type"] = theData[i].t;
|
||||
doc_0["data"] = theData[i].d;
|
||||
doc_0["time"] = time(nullptr);
|
||||
String outgoingString;
|
||||
serializeJson(doc, outgoingString);
|
||||
outgoingString = outgoingString + " " + stringCrc(outgoingString.c_str()) + "\r\n";
|
||||
if (logBufferPos + outgoingString.length() >= (sizeof(logBuffer) / sizeof(char))) // if buffer would overflow, release first
|
||||
{
|
||||
releaseLogBuffer();
|
||||
}
|
||||
memcpy(&logBuffer[logBufferPos], outgoingString.c_str(), outgoingString.length()); // append line to buffer
|
||||
logBufferPos += outgoingString.length();
|
||||
}
|
||||
time(&last_log_write);
|
||||
}
|
||||
|
||||
// Send loged values to MQTT so we depend upon network and MQTT
|
||||
void resendLog()
|
||||
{
|
||||
#if defined(USE_SD_LOG) && defined(USE_WIFI)
|
||||
DBG("Resending logged values from SD card.");
|
||||
File logfile = SD.open(LOG_FILENAME, FILE_READ);
|
||||
while (1)
|
||||
{
|
||||
String line = logfile.readStringUntil('\n');
|
||||
if (line.length() > 0)
|
||||
{ // if line contains something
|
||||
if (!client.publish(TOPIC_DATA_BACKLOG, line.c_str()))
|
||||
{
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
time(&last_mqtt_success);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
logfile.close();
|
||||
SD.remove(LOG_FILENAME); // if all values are sent
|
||||
break;
|
||||
}
|
||||
}
|
||||
DBG(" Done");
|
||||
#endif
|
||||
#if defined(USE_FS_LOG) && defined(USE_WIFI)
|
||||
DBG("Resending logged values from internal flash.");
|
||||
File logfile = LittleFS.open(LOG_FILENAME, "r");
|
||||
while (1)
|
||||
{
|
||||
String line = logfile.readStringUntil('\n');
|
||||
if (line.length() > 0)
|
||||
{ // if line contains something
|
||||
uint16_t readCrc;
|
||||
char data[line.length()];
|
||||
sscanf(line.c_str(), "%s %hd", data, &readCrc);
|
||||
if (stringCrc(data) != readCrc)
|
||||
{
|
||||
continue;
|
||||
} // if CRCs don't match, skip the line
|
||||
if (!client.publish(TOPIC_DATA_BACKLOG, line.c_str()))
|
||||
{
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
time(&last_mqtt_success);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
logfile.close();
|
||||
LittleFS.remove(LOG_FILENAME); // if all values are sent
|
||||
break;
|
||||
}
|
||||
}
|
||||
DBG(" Done");
|
||||
#endif
|
||||
}
|
||||
|
||||
void begin_SD()
|
||||
{
|
||||
#ifdef USE_SD_LOG
|
||||
DBG("Initializing SD card...");
|
||||
#ifdef ESP32
|
||||
SPI.begin(SCK, MISO, MOSI);
|
||||
#endif
|
||||
if (!SD.begin(SD_SS))
|
||||
{
|
||||
DBG(" Initialization failed!");
|
||||
while (1)
|
||||
;
|
||||
}
|
||||
else
|
||||
{
|
||||
DBG(" SD initialized.");
|
||||
}
|
||||
#endif // USE_SD_LOG
|
||||
}
|
||||
|
||||
void begin_FS()
|
||||
{
|
||||
#ifdef USE_FS_LOG
|
||||
DBG("Initializing LittleFS...");
|
||||
|
||||
if (!LittleFS.begin())
|
||||
{
|
||||
DBG(" initialization failed");
|
||||
while (1)
|
||||
;
|
||||
}
|
||||
else
|
||||
{
|
||||
DBG(" LittleFS initialized");
|
||||
}
|
||||
#endif // USE_FS_LOG
|
||||
}
|
||||
Loading…
Reference in New Issue