Log tags changed

This commit is contained in:
Klaus K Wilting 2019-02-27 00:49:32 +01:00
parent 5c191a269f
commit 55e0c73c77
9 changed files with 19 additions and 9 deletions

View File

@ -1,7 +1,7 @@
#include "globals.h" #include "globals.h"
// Local logging tag // Local logging tag
static const char TAG[] = "main"; static const char TAG[] = __FILE__;
#ifdef HAS_BATTERY_PROBE #ifdef HAS_BATTERY_PROBE
esp_adc_cal_characteristics_t *adc_characs = esp_adc_cal_characteristics_t *adc_characs =

View File

@ -3,7 +3,7 @@
#include "bme680mems.h" #include "bme680mems.h"
// Local logging tag // Local logging tag
static const char TAG[] = "main"; static const char TAG[] = __FILE__;
bmeStatus_t bme_status; bmeStatus_t bme_status;
TaskHandle_t BmeTask; TaskHandle_t BmeTask;

View File

@ -4,7 +4,7 @@
#include "button.h" #include "button.h"
// Local logging tag // Local logging tag
static const char TAG[] = "main"; static const char TAG[] = __FILE__;
void readButton() { void readButton() {
ESP_LOGI(TAG, "Button pressed"); ESP_LOGI(TAG, "Button pressed");

View File

@ -7,7 +7,7 @@
#endif #endif
// Local logging tag // Local logging tag
static const char TAG[] = "main"; static const char TAG[] = __FILE__;
uint16_t salt; uint16_t salt;

View File

@ -31,7 +31,7 @@ int volatile contentLength = 0;
bool volatile isValidContentType = false; bool volatile isValidContentType = false;
// Local logging tag // Local logging tag
static const char TAG[] = "main"; static const char TAG[] = __FILE__;
// helper function to extract header value from header // helper function to extract header value from header
inline String getHeaderValue(String header, String headerName) { inline String getHeaderValue(String header, String headerName) {

View File

@ -290,7 +290,9 @@ void PayloadConvert::writeBitmap(bool a, bool b, bool c, bool d, bool e, bool f,
} }
/* ---------------- Cayenne LPP 2.0 format ---------- */ /* ---------------- Cayenne LPP 2.0 format ---------- */
// see specs http://community.mydevices.com/t/cayenne-lpp-2-0/7510 // see specs
// http://community.mydevices.com/t/cayenne-lpp-2-0/7510 (LPP 2.0)
// https://github.com/myDevicesIoT/cayenne-docs/blob/master/docs/LORA.md (LPP 1.0)
// PAYLOAD_ENCODER == 3 -> Dynamic Sensor Payload, using channels -> FPort 1 // PAYLOAD_ENCODER == 3 -> Dynamic Sensor Payload, using channels -> FPort 1
// PAYLOAD_ENCODER == 4 -> Packed Sensor Payload, not using channels -> FPort 2 // PAYLOAD_ENCODER == 4 -> Packed Sensor Payload, not using channels -> FPort 2

View File

@ -3,7 +3,7 @@
#include "rcommand.h" #include "rcommand.h"
// Local logging tag // Local logging tag
static const char TAG[] = "main"; static const char TAG[] = __FILE__;
// helper function // helper function
void do_reset() { void do_reset() {

View File

@ -34,9 +34,13 @@ void SendPayload(uint8_t port, sendprio_t prio) {
} }
memcpy(SendBuffer.Message, payload.getBuffer(), payload.getSize()); memcpy(SendBuffer.Message, payload.getBuffer(), payload.getSize());
// enqueue message in device's send queues // enqueue message in device's send queues
#ifdef HAS_LORA
lora_enqueuedata(&SendBuffer, prio); lora_enqueuedata(&SendBuffer, prio);
#endif
#ifdef HAS_SPI
spi_enqueuedata(&SendBuffer, prio); spi_enqueuedata(&SendBuffer, prio);
#endif
} // SendPayload } // SendPayload
@ -130,6 +134,10 @@ void sendCounter() {
} // sendCounter() } // sendCounter()
void flushQueues() { void flushQueues() {
#ifdef HAS_LORA
lora_queuereset(); lora_queuereset();
#endif
#ifdef HAS_SPI
spi_queuereset(); spi_queuereset();
#endif
} }

View File

@ -2,7 +2,7 @@
#include "globals.h" #include "globals.h"
// Local logging tag // Local logging tag
static const char TAG[] = "main"; static const char TAG[] = __FILE__;
#define SENSORBUFFER \ #define SENSORBUFFER \
10 // max. size of user sensor data buffer in bytes [default=20] 10 // max. size of user sensor data buffer in bytes [default=20]