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

refactored GLOBALS to FDRS_GLOBALS

Browse Source 
Globals is just too... global :)
Could also conflict with other libraries.
This commit is contained in:
Sascha 2022-07-07 11:40:12 +02:00
parent 86f0a1c4ef
commit 25fb6b4d26
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FDRS_Gateway/fdrs_functions.h
View File

@ -16,7 +16,7 @@
#define UART_IF Serial #define UART_IF Serial
#endif #endif
#ifdef GLOBALS #ifdef FDRS_GLOBALS
#define FDRS_WIFI_SSID GLOBAL_SSID #define FDRS_WIFI_SSID GLOBAL_SSID
#define FDRS_WIFI_PASS GLOBAL_PASS #define FDRS_WIFI_PASS GLOBAL_PASS
#define FDRS_MQTT_ADDR GLOBAL_MQTT_ADDR #define FDRS_MQTT_ADDR GLOBAL_MQTT_ADDR

2
examples/Universal_Sensor_beta/fdrs_sensor.h
View File

@ -36,7 +36,7 @@
#include "LoRa.h" #include "LoRa.h"
#endif #endif
#ifdef GLOBALS #ifdef FDRS_GLOBALS
#define FDRS_BAND GLOBAL_BAND #define FDRS_BAND GLOBAL_BAND
#define FDRS_SF GLOBAL_SF #define FDRS_SF GLOBAL_SF
#else #else

2
fdrs_functions.h
View File

@ -16,7 +16,7 @@
#define UART_IF Serial #define UART_IF Serial
#endif #endif
#ifdef GLOBALS #ifdef FDRS_GLOBALS
#define FDRS_WIFI_SSID GLOBAL_SSID #define FDRS_WIFI_SSID GLOBAL_SSID
#define FDRS_WIFI_PASS GLOBAL_PASS #define FDRS_WIFI_PASS GLOBAL_PASS
#define FDRS_MQTT_ADDR GLOBAL_MQTT_ADDR #define FDRS_MQTT_ADDR GLOBAL_MQTT_ADDR

7
fdrs_globals.h
View File

@ -1,6 +1,5 @@
// ToDo: refactor the global GLOBALS to FDRS_GLOBALS as GLOBALS is ... well, too global ;) #ifndef FDRS_GLOBALS
#ifndef GLOBALS #define FDRS_GLOBALS
#define GLOBALS
#define GLOBAL_SSID "Your SSID" #define GLOBAL_SSID "Your SSID"
#define GLOBAL_PASS "Password" #define GLOBAL_PASS "Password"
#define GLOBAL_MQTT_ADDR "192.168.0.8" #define GLOBAL_MQTT_ADDR "192.168.0.8"
@ -12,4 +11,4 @@
#define GLOBAL_BAND 915E6 //LoRa Frequency Band #define GLOBAL_BAND 915E6 //LoRa Frequency Band
#define GLOBAL_SF 7 //LoRa Spreading Factor #define GLOBAL_SF 7 //LoRa Spreading Factor
#endif GLOBALS #endif FDRS_GLOBALS

2
fdrs_sensor.h
View File

@ -17,7 +17,7 @@
#include <LoRa.h> #include <LoRa.h>
#endif #endif
#ifdef GLOBALS #ifdef FDRS_GLOBALS
#define FDRS_BAND GLOBAL_BAND #define FDRS_BAND GLOBAL_BAND
#define FDRS_SF GLOBAL_SF #define FDRS_SF GLOBAL_SF
#else #else