From 027a75df6001456ccf263895dc3744d2cfac4e7b Mon Sep 17 00:00:00 2001 From: sensorsiot Date: Sun, 22 May 2022 09:37:13 +0200 Subject: [PATCH] Added a default.h file to the sensors files and took the else out (no more needed because now defined in default.h Added band in default.h Band should be renamed to FREQUENCY (because it defines the frequency) --- Examples/1_LoRa_Sensor/defaults.h | 45 +++++++++++++++++++++++++ Examples/1_LoRa_Sensor/fdrs_sensor.h | 13 ++----- Examples/2_ESPNOW_Sensor/defaults.h | 45 +++++++++++++++++++++++++ Examples/2_ESPNOW_Sensor/fdrs_sensor.h | 10 +----- Examples/3_ESPNOW_Gateway/defaults.h | 5 +++ Examples/3_ESPNOW_Gateway/fdrs_config.h | 10 +----- Examples/4_UART_Gateway/defaults.h | 5 +++ Examples/4_UART_Gateway/fdrs_config.h | 15 ++------- Examples/5_MQTT_Gateway/fdrs_config.h | 10 +----- 9 files changed, 107 insertions(+), 51 deletions(-) create mode 100644 Examples/1_LoRa_Sensor/defaults.h create mode 100644 Examples/2_ESPNOW_Sensor/defaults.h diff --git a/Examples/1_LoRa_Sensor/defaults.h b/Examples/1_LoRa_Sensor/defaults.h new file mode 100644 index 0000000..db56db4 --- /dev/null +++ b/Examples/1_LoRa_Sensor/defaults.h @@ -0,0 +1,45 @@ +#define UNIT_MAC 0xFC // THIS UNIT +#define ESPNOW1_PEER 0xFD // ESPNOW1 Address +#define ESPNOW2_PEER 0xFE // ESPNOW2 Address +#define LORA1_PEER 0xFD // LoRa1 Address +#define LORA2_PEER 0xFE // LoRa2 Address + +#define ESPNOW1_DELAY 0 +#define ESPNOW2_DELAY 0 +#define ESPNOWG_DELAY 0 +#define SERIAL_DELAY 0 +#define MQTT_DELAY 0 +#define LORAG_DELAY 1000 +#define LORA1_DELAY 1000 +#define LORA2_DELAY 1000 + +#define ESPNOW1_ACT +#define ESPNOW2_ACT +#define ESPNOWG_ACT +#define SERIAL_ACT +#define MQTT_ACT +#define LORAG_ACT +#define LORA1_ACT +#define LORA2_ACT + +//#define RXD2 21 +//#define TXD2 22 + +//#define USE_LORA +#define SCK 5 +#define MISO 19 +#define MOSI 27 +#define SS 18 +#define RST 14 +#define DIO0 26 + +//433E6 for Asia +//866E6 for Europe +//915E6 for North America +#define BAND 915E6 + +//#define USE_LED +#define LED_PIN 32 +#define NUM_LEDS 4 + +#define MAC_PREFIX 0xAA, 0xBB, 0xCC, 0xDD, 0xEE diff --git a/Examples/1_LoRa_Sensor/fdrs_sensor.h b/Examples/1_LoRa_Sensor/fdrs_sensor.h index 876e436..59484c8 100644 --- a/Examples/1_LoRa_Sensor/fdrs_sensor.h +++ b/Examples/1_LoRa_Sensor/fdrs_sensor.h @@ -23,23 +23,14 @@ #define RST 14 #define DIO0 26 - +#include "defaults.h" #ifdef CREDENTIALS #include #define WIFI_NET mySSID #define WIFI_PASS myPASSWORD #define MQTT_ADDR MQTT_BROKER #define BAND myBAND -#define SF mySF -#else -#define WIFI_NET "Your SSID" -#define WIFI_PASS "Password" -#define MQTT_ADDR "192.168.0.8" - -//433E6 for Asia -//866E6 for Europe -//915E6 for North America -#define BAND 915E6 +#define SF mySF #endif typedef struct __attribute__((packed)) DataReading { diff --git a/Examples/2_ESPNOW_Sensor/defaults.h b/Examples/2_ESPNOW_Sensor/defaults.h new file mode 100644 index 0000000..db56db4 --- /dev/null +++ b/Examples/2_ESPNOW_Sensor/defaults.h @@ -0,0 +1,45 @@ +#define UNIT_MAC 0xFC // THIS UNIT +#define ESPNOW1_PEER 0xFD // ESPNOW1 Address +#define ESPNOW2_PEER 0xFE // ESPNOW2 Address +#define LORA1_PEER 0xFD // LoRa1 Address +#define LORA2_PEER 0xFE // LoRa2 Address + +#define ESPNOW1_DELAY 0 +#define ESPNOW2_DELAY 0 +#define ESPNOWG_DELAY 0 +#define SERIAL_DELAY 0 +#define MQTT_DELAY 0 +#define LORAG_DELAY 1000 +#define LORA1_DELAY 1000 +#define LORA2_DELAY 1000 + +#define ESPNOW1_ACT +#define ESPNOW2_ACT +#define ESPNOWG_ACT +#define SERIAL_ACT +#define MQTT_ACT +#define LORAG_ACT +#define LORA1_ACT +#define LORA2_ACT + +//#define RXD2 21 +//#define TXD2 22 + +//#define USE_LORA +#define SCK 5 +#define MISO 19 +#define MOSI 27 +#define SS 18 +#define RST 14 +#define DIO0 26 + +//433E6 for Asia +//866E6 for Europe +//915E6 for North America +#define BAND 915E6 + +//#define USE_LED +#define LED_PIN 32 +#define NUM_LEDS 4 + +#define MAC_PREFIX 0xAA, 0xBB, 0xCC, 0xDD, 0xEE diff --git a/Examples/2_ESPNOW_Sensor/fdrs_sensor.h b/Examples/2_ESPNOW_Sensor/fdrs_sensor.h index b3bb7fe..35ce276 100644 --- a/Examples/2_ESPNOW_Sensor/fdrs_sensor.h +++ b/Examples/2_ESPNOW_Sensor/fdrs_sensor.h @@ -22,21 +22,13 @@ #define RST 14 #define DIO0 26 +#include "defaults.h" #ifdef CREDENTIALS #include #define WIFI_NET mySSID #define WIFI_PASS myPASSWORD #define MQTT_ADDR MQTT_BROKER #define BAND myBAND -#else -#define WIFI_NET "Your SSID" -#define WIFI_PASS "Password" -#define MQTT_ADDR "192.168.0.8" - -//433E6 for Asia -//866E6 for Europe -//915E6 for North America -#define BAND 915E6 #endif typedef struct __attribute__((packed)) DataReading { diff --git a/Examples/3_ESPNOW_Gateway/defaults.h b/Examples/3_ESPNOW_Gateway/defaults.h index 1e788c6..3f3f180 100644 --- a/Examples/3_ESPNOW_Gateway/defaults.h +++ b/Examples/3_ESPNOW_Gateway/defaults.h @@ -29,6 +29,11 @@ #define WIFI_PASS "Password" #define MQTT_ADDR "192.168.0.8" +//433E6 for Asia +//866E6 for Europe +//915E6 for North America +#define BAND 915E6 + //#define USE_LORA #define SCK 5 #define MISO 19 diff --git a/Examples/3_ESPNOW_Gateway/fdrs_config.h b/Examples/3_ESPNOW_Gateway/fdrs_config.h index f4c9d28..5766ca2 100644 --- a/Examples/3_ESPNOW_Gateway/fdrs_config.h +++ b/Examples/3_ESPNOW_Gateway/fdrs_config.h @@ -35,19 +35,11 @@ #define RST 14 #define DIO0 26 +// default.h values are overwritten by the #defines of credentials.h files in the library folder #ifdef CREDENTIALS #include #define WIFI_NET mySSID #define WIFI_PASS myPASSWORD #define MQTT_ADDR MQTT_BROKER #define BAND myBAND -#else -#define WIFI_NET "Your SSID" -#define WIFI_PASS "Password" -#define MQTT_ADDR "192.168.0.8" - -//433E6 for Asia -//866E6 for Europe -//915E6 for North America -#define BAND 915E6 #endif diff --git a/Examples/4_UART_Gateway/defaults.h b/Examples/4_UART_Gateway/defaults.h index d0b22a1..e91d8ea 100644 --- a/Examples/4_UART_Gateway/defaults.h +++ b/Examples/4_UART_Gateway/defaults.h @@ -33,6 +33,11 @@ #define RST 14 #define DIO0 26 +//433E6 for Asia +//866E6 for Europe +//915E6 for North America +#define BAND 915E6 + //#define USE_LED #define LED_PIN 32 #define NUM_LEDS 4 diff --git a/Examples/4_UART_Gateway/fdrs_config.h b/Examples/4_UART_Gateway/fdrs_config.h index 189c88d..27221aa 100644 --- a/Examples/4_UART_Gateway/fdrs_config.h +++ b/Examples/4_UART_Gateway/fdrs_config.h @@ -35,23 +35,12 @@ #define RST 14 #define DIO0 26 -//WiFi Configuration -- Needed only if is using MQTT - - +// default.h values are overwritten by the #defines of credentials.h files in the library folder #ifdef CREDENTIALS #include #define WIFI_NET mySSID #define WIFI_PASS myPASSWORD #define MQTT_ADDR MQTT_BROKER #define BAND myBAND -#define SF mySF -#else -#define WIFI_NET "Your SSID" -#define WIFI_PASS "Password" -#define MQTT_ADDR "192.168.0.8" - -//433E6 for Asia -//866E6 for Europe -//915E6 for North America -#define BAND 915E6 +#define SF mySF #endif diff --git a/Examples/5_MQTT_Gateway/fdrs_config.h b/Examples/5_MQTT_Gateway/fdrs_config.h index 6e4cafa..52895ae 100644 --- a/Examples/5_MQTT_Gateway/fdrs_config.h +++ b/Examples/5_MQTT_Gateway/fdrs_config.h @@ -36,19 +36,11 @@ #define DIO0 26 +// default.h values are overwritten by the #defines of credentials.h files in the library folder #ifdef CREDENTIALS #include #define WIFI_NET mySSID #define WIFI_PASS myPASSWORD #define MQTT_ADDR MQTT_BROKER #define BAND myBAND -#else -#define WIFI_NET "Your SSID" -#define WIFI_PASS "Password" -#define MQTT_ADDR "192.168.0.8" - -//433E6 for Asia -//866E6 for Europe -//915E6 for North America -#define BAND 915E6 #endif