Archives/Farm-Data-Relay-System
2
0
Fork 0
mirror of https://github.com/timmbogner/Farm-Data-Relay-System synced 2024-10-30 09:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

switched terminology

Browse Source
This commit is contained in:
Timm Bogner 2022-10-02 18:34:54 -05:00
parent 7529379408
commit 39bd741614
13 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/0_MQTT_Gateway/fdrs_gateway_config.h
View File

@ -5,7 +5,7 @@
#include <fdrs_globals.h>
#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

4
examples/1_UART_Gateway/1_UART_Gateway.ino
View File

@ -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<WS2812B, LED_PIN, GRB>(leds, NUM_LEDS);

4
examples/1_UART_Gateway/fdrs_gateway_config.h
View File

@ -4,7 +4,7 @@
#include <fdrs_globals.h>
#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();

4
examples/2_ESPNOW_Repeater/fdrs_gateway_config.h
View File

@ -5,7 +5,7 @@
#include <fdrs_globals.h>
#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

4
examples/3_LoRa_Repeater/fdrs_gateway_config.h
View File

@ -4,7 +4,7 @@
#include <fdrs_globals.h>
#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.

2
examples/ESPNOW_Sensor/fdrs_sensor_config.h
View File

@ -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

2
examples/ESPNOW_Stress_Test/fdrs_sensor_config.h
View File

@ -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

2
examples/LoRa_Sensor/fdrs_sensor_config.h
View File

@ -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

2
keywords.txt
View File

@ -62,7 +62,7 @@ transmitLoRa KEYWORD2
#######################################################################
# Literals (LITERAL1)
#######################################################################
DEBUG_NODE_CONFIG LITERAL1
DEBUG_CONFIG LITERAL1
DEEP_SLEEP LITERAL1
FDRS_BAND LITERAL1
FDRS_DEBUG LITERAL1

2
src/fdrs_checkConfig.h
View File

@ -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.

2
src/fdrs_functions.h
View File

@ -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 {

8
src/fdrs_node.h
View File

@ -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
}

8
src/fdrs_sensor.h
View File

@ -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
}