From 39bd741614ea435b502f0368b958fbfec2100e17 Mon Sep 17 00:00:00 2001 From: Timm Bogner <64260873+timmbogner@users.noreply.github.com> Date: Sun, 2 Oct 2022 18:34:54 -0500 Subject: [PATCH] switched terminology --- examples/0_MQTT_Gateway/fdrs_gateway_config.h | 4 ++-- examples/1_UART_Gateway/1_UART_Gateway.ino | 4 ++-- examples/1_UART_Gateway/fdrs_gateway_config.h | 4 ++-- examples/2_ESPNOW_Repeater/fdrs_gateway_config.h | 4 ++-- examples/3_LoRa_Repeater/fdrs_gateway_config.h | 4 ++-- examples/ESPNOW_Sensor/fdrs_sensor_config.h | 2 +- examples/ESPNOW_Stress_Test/fdrs_sensor_config.h | 2 +- examples/LoRa_Sensor/fdrs_sensor_config.h | 2 +- keywords.txt | 2 +- src/fdrs_checkConfig.h | 2 +- src/fdrs_functions.h | 2 +- src/fdrs_node.h | 8 ++++---- src/fdrs_sensor.h | 8 ++++---- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/examples/0_MQTT_Gateway/fdrs_gateway_config.h b/examples/0_MQTT_Gateway/fdrs_gateway_config.h index 4740e63..ea9c4d4 100644 --- a/examples/0_MQTT_Gateway/fdrs_gateway_config.h +++ b/examples/0_MQTT_Gateway/fdrs_gateway_config.h @@ -5,7 +5,7 @@ #include #define FDRS_DEBUG //Enable USB-Serial debugging -#define DEBUG_NODE_CONFIG // Displays full config info on startup +#define DEBUG_CONFIG // Displays full config info on startup #define UNIT_MAC 0x00 // The address of this gateway @@ -31,7 +31,7 @@ #define LORA_NEIGHBOR_1 0x0E // LoRa1 Address #define LORA_NEIGHBOR_2 0x0F // LoRa2 Address -// Peer Actions +// Neighbor Actions #define ESPNOW1_ACT #define ESPNOW2_ACT #define LORA1_ACT diff --git a/examples/1_UART_Gateway/1_UART_Gateway.ino b/examples/1_UART_Gateway/1_UART_Gateway.ino index a21ec60..f645f55 100644 --- a/examples/1_UART_Gateway/1_UART_Gateway.ino +++ b/examples/1_UART_Gateway/1_UART_Gateway.ino @@ -47,7 +47,7 @@ void setup() { DBG("Address:" + String (UNIT_MAC, HEX)); -#ifdef DEBUG_NODE_CONFIG +#ifdef DEBUG_CONFIG #ifdef ESP32 // find out the reset reason esp_reset_reason_t resetReason; @@ -56,7 +56,7 @@ void setup() { checkConfig(); } #endif //ESP32 -#endif //DEBUG_NODE_CONFIG +#endif //DEBUG_CONFIG #ifdef USE_LED FastLED.addLeds(leds, NUM_LEDS); diff --git a/examples/1_UART_Gateway/fdrs_gateway_config.h b/examples/1_UART_Gateway/fdrs_gateway_config.h index 318163c..3775fc8 100644 --- a/examples/1_UART_Gateway/fdrs_gateway_config.h +++ b/examples/1_UART_Gateway/fdrs_gateway_config.h @@ -4,7 +4,7 @@ #include #define FDRS_DEBUG //Enable USB-Serial debugging -#define DEBUG_NODE_CONFIG // Displays full config info on startup +#define DEBUG_CONFIG // Displays full config info on startup #define UNIT_MAC 0x01 // The address of this gateway @@ -30,7 +30,7 @@ #define LORA_NEIGHBOR_1 0x02 // LoRa1 Address #define LORA_NEIGHBOR_2 0x0F // LoRa2 Address -// Peer Actions +// Neighbor Actions #define ESPNOW1_ACT #define ESPNOW2_ACT #define LORA1_ACT sendSerial(); diff --git a/examples/2_ESPNOW_Repeater/fdrs_gateway_config.h b/examples/2_ESPNOW_Repeater/fdrs_gateway_config.h index 3bae1d1..b939c11 100644 --- a/examples/2_ESPNOW_Repeater/fdrs_gateway_config.h +++ b/examples/2_ESPNOW_Repeater/fdrs_gateway_config.h @@ -5,7 +5,7 @@ #include #define FDRS_DEBUG //Enable USB-Serial debugging -#define DEBUG_NODE_CONFIG // Displays full config info on startup +#define DEBUG_CONFIG // Displays full config info on startup #define UNIT_MAC 0x02 // The address of this gateway @@ -31,7 +31,7 @@ #define LORA_NEIGHBOR_1 0x0E // LoRa1 Address #define LORA_NEIGHBOR_2 0x0F // LoRa2 Address -// Peer Actions +// Neighbor Actions #define ESPNOW1_ACT sendSerial(); // This would display packets arriving *from* the front-end. #define ESPNOW2_ACT #define LORA1_ACT diff --git a/examples/3_LoRa_Repeater/fdrs_gateway_config.h b/examples/3_LoRa_Repeater/fdrs_gateway_config.h index 6729575..af74b10 100644 --- a/examples/3_LoRa_Repeater/fdrs_gateway_config.h +++ b/examples/3_LoRa_Repeater/fdrs_gateway_config.h @@ -4,7 +4,7 @@ #include #define FDRS_DEBUG //Enable USB-Serial debugging -#define DEBUG_NODE_CONFIG // Displays full config info on startup +#define DEBUG_CONFIG // Displays full config info on startup #define UNIT_MAC 0x03 // The address of this gateway @@ -30,7 +30,7 @@ #define LORA_NEIGHBOR_1 0x01 // LoRa1 Address #define LORA_NEIGHBOR_2 0x0F // LoRa2 Address -// Peer Actions +// Neighbor Actions #define ESPNOW1_ACT #define ESPNOW2_ACT #define LORA1_ACT sendSerial(); // This would display packets arriving *from* the front-end. diff --git a/examples/ESPNOW_Sensor/fdrs_sensor_config.h b/examples/ESPNOW_Sensor/fdrs_sensor_config.h index 793b586..c028c27 100644 --- a/examples/ESPNOW_Sensor/fdrs_sensor_config.h +++ b/examples/ESPNOW_Sensor/fdrs_sensor_config.h @@ -12,7 +12,7 @@ #define DEEP_SLEEP //#define POWER_CTRL 14 #define FDRS_DEBUG -#define DEBUG_NODE_CONFIG // Displays full config info on startup +#define DEBUG_CONFIG // Displays full config info on startup //SPI Configuration -- Needed only on chipsets with multiple SPI interfaces (ESP32) #define SPI_SCK 5 diff --git a/examples/ESPNOW_Stress_Test/fdrs_sensor_config.h b/examples/ESPNOW_Stress_Test/fdrs_sensor_config.h index 5c03460..5ccfc73 100644 --- a/examples/ESPNOW_Stress_Test/fdrs_sensor_config.h +++ b/examples/ESPNOW_Stress_Test/fdrs_sensor_config.h @@ -12,7 +12,7 @@ //#define DEEP_SLEEP //#define POWER_CTRL 14 //#define FDRS_DEBUG -//#define DEBUG_NODE_CONFIG // Displays full config info on startup +//#define DEBUG_CONFIG // Displays full config info on startup //SPI Configuration -- Needed only on chipsets with multiple SPI interfaces (ESP32) #define SPI_SCK 5 diff --git a/examples/LoRa_Sensor/fdrs_sensor_config.h b/examples/LoRa_Sensor/fdrs_sensor_config.h index 275e20e..122542b 100644 --- a/examples/LoRa_Sensor/fdrs_sensor_config.h +++ b/examples/LoRa_Sensor/fdrs_sensor_config.h @@ -12,7 +12,7 @@ #define DEEP_SLEEP //#define POWER_CTRL 14 #define FDRS_DEBUG -#define DEBUG_NODE_CONFIG // Displays full config info on startup +#define DEBUG_CONFIG // Displays full config info on startup //SPI Configuration -- Needed only on chipsets with multiple SPI interfaces (ESP32) #define SPI_SCK 5 diff --git a/keywords.txt b/keywords.txt index ddf4445..55f064f 100644 --- a/keywords.txt +++ b/keywords.txt @@ -62,7 +62,7 @@ transmitLoRa KEYWORD2 ####################################################################### # Literals (LITERAL1) ####################################################################### -DEBUG_NODE_CONFIG LITERAL1 +DEBUG_CONFIG LITERAL1 DEEP_SLEEP LITERAL1 FDRS_BAND LITERAL1 FDRS_DEBUG LITERAL1 diff --git a/src/fdrs_checkConfig.h b/src/fdrs_checkConfig.h index 6a7b34e..efb8b36 100644 --- a/src/fdrs_checkConfig.h +++ b/src/fdrs_checkConfig.h @@ -2,7 +2,7 @@ // // DETAILED NODES' CONFIGURATION CHECK // -// Make sure #define DEBUG_NODE_CONFIG is not uncommented in your node's config +// Make sure #define DEBUG_CONFIG is not uncommented in your node's config // (fdrs_sensor_config.h or fdrs_gateway_config.h). Otherwise check will be ignored. // When the node powers up, it's full config will be printed to the serial console once. // Be sure to add further checks as new configuration possibilities are added to FDRS. diff --git a/src/fdrs_functions.h b/src/fdrs_functions.h index 5cd74ce..9524157 100644 --- a/src/fdrs_functions.h +++ b/src/fdrs_functions.h @@ -141,7 +141,7 @@ enum { #define MAC_PREFIX 0xAA, 0xBB, 0xCC, 0xDD, 0xEE // Should only be changed if implementing multiple FDRS systems. -#ifdef DEBUG_NODE_CONFIG +#ifdef DEBUG_CONFIG #include "fdrs_checkConfig.h" #endif typedef struct FDRSPeer { diff --git a/src/fdrs_node.h b/src/fdrs_node.h index 10dc448..4ef0316 100644 --- a/src/fdrs_node.h +++ b/src/fdrs_node.h @@ -19,7 +19,7 @@ #endif // enable to get detailed info from where single configuration macros have been taken -#define DEBUG_NODE_CONFIG +#define DEBUG_CONFIG #define LORA_ACK_TIMEOUT 400 // LoRa ACK timeout in ms. (Minimum = 200) #define LORA_RETRIES 2 // LoRa ACK automatic retries [0 - 3] @@ -53,7 +53,7 @@ #define MAC_PREFIX 0xAA, 0xBB, 0xCC, 0xDD, 0xEE // Should only be changed if implementing multiple FDRS systems. -#ifdef DEBUG_NODE_CONFIG +#ifdef DEBUG_CONFIG //#include "fdrs_checkConfig.h" #endif @@ -229,11 +229,11 @@ void beginFDRS() { DBG("LoRa Band: " + String(FDRS_BAND)); DBG("LoRa SF : " + String(FDRS_SF)); #endif // USE_LORA -#ifdef DEBUG_NODE_CONFIG +#ifdef DEBUG_CONFIG // if (resetReason != ESP_RST_DEEPSLEEP) { //checkConfig(); // } -#endif //DEBUG_NODE_CONFIG +#endif //DEBUG_CONFIG } diff --git a/src/fdrs_sensor.h b/src/fdrs_sensor.h index 2ac857d..202377f 100644 --- a/src/fdrs_sensor.h +++ b/src/fdrs_sensor.h @@ -19,7 +19,7 @@ #endif // enable to get detailed info from where single configuration macros have been taken -#define DEBUG_NODE_CONFIG +#define DEBUG_CONFIG #ifdef USE_LORA @@ -51,7 +51,7 @@ #define MAC_PREFIX 0xAA, 0xBB, 0xCC, 0xDD, 0xEE // Should only be changed if implementing multiple FDRS systems. -#ifdef DEBUG_NODE_CONFIG +#ifdef DEBUG_CONFIG //#include "fdrs_checkConfig.h" #endif @@ -227,11 +227,11 @@ void beginFDRS() { DBG("LoRa Band: " + String(FDRS_BAND)); DBG("LoRa SF : " + String(FDRS_SF)); #endif // USE_LORA -#ifdef DEBUG_NODE_CONFIG +#ifdef DEBUG_CONFIG // if (resetReason != ESP_RST_DEEPSLEEP) { //checkConfig(); // } -#endif //DEBUG_NODE_CONFIG +#endif //DEBUG_CONFIG }