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

Introduced topics for data, command, and status

Browse Source
This commit is contained in:
sensorsiot 2022-05-22 23:35:31 +02:00
parent b5082b3f33
commit 56fa9c9bf2
6 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Examples/2_ESPNOW_Sensor/2_ESPNOW_Sensor.ino
View File

@ -9,8 +9,6 @@
#define DEBUG
#define CREDENTIALS
#define ESPNOW_SENSOR
#include <FDRSdefaults.h>
#include "fdrs_sensor.h"

2
Examples/4_UART_Gateway/fdrs_config.h
View File

@ -2,7 +2,7 @@
//
// GATEWAY 2.000 Configuration
#define UNIT_MAC 0x04 // The address of this gateway
#define UNIT_MAC 0x04 // The address of this gateway
#define ESPNOW1_PEER 0xFD // ESPNOW1 Address
#define ESPNOW2_PEER 0xFE // ESPNOW2 Address
#define LORA1_PEER 0xFD // LoRa1 Address

2
Examples/5_MQTT_Gateway/5_MQTT_Gateway.ino
View File

@ -73,7 +73,7 @@ void setup() {
#endif
// UART_IF.println(sizeof(DataReading));
client.publish("esp/fdrs/status", "FDRS initialized");
client.publish(TOPIC_STATUS, "FDRS initialized");
}

4
Examples/5_MQTT_Gateway/fdrs_config.h
View File

@ -2,9 +2,7 @@
//
// GATEWAY 2.000 Configuration
#define UNIT_MAC 0x00 // The address of this gateway
#define UNIT_MAC 0x01 // The address of this gateway
#define UNIT_MAC 0x05 // The address of this gateway
#define ESPNOW1_PEER 0xFD // ESPNOW1 Address
#define ESPNOW2_PEER 0xFE // ESPNOW2 Address
#define LORA1_PEER 0xFD // LoRa1 Address

6
Examples/5_MQTT_Gateway/fdrs_functions.h
View File

@ -214,7 +214,7 @@ void sendMQTT() {
}
String outgoingString;
serializeJson(doc, outgoingString);
client.publish("esp/fdrs", (char*) outgoingString.c_str());
client.publish(TOPIC_DATA, (char*) outgoingString.c_str());
#endif
}
@ -435,7 +435,7 @@ void releaseMQTT() {
}
String outgoingString;
serializeJson(doc, outgoingString);
client.publish("esp/fdrs", (char*) outgoingString.c_str());
client.publish(TOPIC_DATA, (char*) outgoingString.c_str());
lenMQTT = 0;
#endif
}
@ -446,7 +446,7 @@ void reconnect() {
// Attempt to connect
if (client.connect("FDRS_GATEWAY")) {
// Subscribe
client.subscribe("esp/fdrs");
client.subscribe(TOPIC_COMMAND);
} else {
DBG("Connecting MQTT.");
delay(5000);

48
Examples/FDRS_common_files/FDRSdefaults.h
View File

@ -4,12 +4,6 @@
#define DBG(a)
#endif
#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
@ -18,15 +12,7 @@
#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 USE_LORA
#define SCK 5
@ -35,12 +21,13 @@
#define SS 18
#define RST 14
#define DIO0 26
uint8_t LoRaAddress[] = {0x42, 0x00}; //Do not touch!!!
//#define USE_LED
#define LED_PIN 32
#define NUM_LEDS 4
#define MAC_PREFIX 0xAA, 0xBB, 0xCC, 0xDD, 0xEE
#define MAC_PREFIX 0xAA, 0xBB, 0xCC, 0xDD, 0xEE // do not touch!
#ifdef CREDENTIALS
#include <FDRScredentials.h>
@ -56,3 +43,32 @@
#define BAND 915E6
#define SF 7
#endif
#define STATUS_T 0 // Status
#define TEMP_T 1 // Temperature
#define TEMP2_T 2 // Temperature #2
#define HUMIDITY_T 3 // Relative Humidity
#define PRESSURE_T 4 // Atmospheric Pressure
#define LIGHT_T 5 // Light (lux)
#define SOIL_T 6 // Soil Moisture
#define SOIL2_T 7 // Soil Moisture #2
#define SOILR_T 8 // Soil Resistance
#define SOILR2_T 9 // Soil Resistance #2
#define OXYGEN_T 10 // Oxygen
#define CO2_T 11 // Carbon Dioxide
#define WINDSPD_T 12 // Wind Speed
#define WINDHDG_T 13 // Wind Direction
#define RAINFALL_T 14 // Rainfall
#define MOTION_T 15 // Motion
#define VOLTAGE_T 16 // Voltage
#define VOLTAGE2_T 17 // Voltage #2
#define CURRENT_T 18 // Current
#define CURRENT2_T 19 // Current #2
#define IT_T 20 // Iterations
#define TOPIC_DATA "FDRS/DATA"
#define TOPIC_STATUS "FDRS/STATUS"
#define TOPIC_COMMAND "FDRS/COMMAND"