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

Add files via upload

Browse Source
This commit is contained in:
Timm Bogner 2022-03-08 11:00:09 -06:00 committed by GitHub
parent 47cfee40be
commit 8fe85ab1dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 69 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FDRS_Gateway2000/DataReading.h
View File

@ -6,6 +6,8 @@ typedef struct __attribute__((packed)) DataReading {
} DataReading;
//Type definitions in progress:
#define STATUS_T 0 // Status
#define TEMP_T 1 // Temperature
#define TEMP2_T 2 // Temperature #2

34
FDRS_Gateway2000/FDRS_Gateway2000.ino
View File

@ -15,33 +15,48 @@
#include <esp_wifi.h>
#endif
#include <ArduinoJson.h>
#ifdef USE_WIFI
#include <PubSubClient.h>
#endif
#ifdef USE_LORA
#include <LoRa.h>
#endif
#ifdef USE_LED
#include <FastLED.h>
#endif
#include "fdrs_functions.h"
void setup() {
#if defined(ESP8266)
Serial.begin(115200);
UART_IF.begin(115200);
#elif defined(ESP32)
#if defined(RXD2)
Serial.begin(115200, SERIAL_8N1, RXD2, TXD2);
#elif !defined(RXD2)
Serial.begin(115200);
Serial.println("main terminal");
UART_IF.begin(115200, SERIAL_8N1, RXD2, TXD2);
#endif
#ifdef USE_LED
FastLED.addLeds<WS2812B, LED_PIN, GRB>(leds, NUM_LEDS);
leds[0] = CRGB::Blue;
FastLED.show();
#endif
begin_espnow();
#ifdef USE_WIFI
delay(10);
WiFi.begin(ssid, password);
while (WiFi.status() != WL_CONNECTED) {
Serial.println("Connecting to Wifi...");
delay(500);
}
client.setServer(mqtt_server, 1883);
//client.setServer("192.168.137.249", 1883);
if (!client.connected()) {
Serial.println("Connecting mqtt...");
reconnect();
}
client.setCallback(mqtt_callback);
#else
begin_espnow();
#endif
#ifdef USE_LORA
SPI.begin(SCK, MISO, MOSI, SS);
@ -49,8 +64,8 @@ void setup() {
if (!LoRa.begin(BAND)) {
while (1);
}
#endif
Serial.println(sizeof(DataReading));
#endif
// UART_IF.println(sizeof(DataReading));
}
@ -88,12 +103,13 @@ void loop() {
if (lenLORA2 > 0) releaseLoRa(2);
}
while (Serial.available()) {
while (UART_IF.available()) {
getSerial();
}
getLoRa();
#ifdef USE_WIFI
if (!client.connected()) {
Serial.println("Connecting mqtt...");
reconnect();
}
client.loop();

11
FDRS_Gateway2000/defaults.h
View File

@ -9,9 +9,9 @@
#define ESPNOWG_DELAY 0
#define SERIAL_DELAY 0
#define MQTT_DELAY 0
#define LORAG_DELAY 250
#define LORA1_DELAY 250
#define LORA2_DELAY 250
#define LORAG_DELAY 1000
#define LORA1_DELAY 1000
#define LORA2_DELAY 1000
#define ESPNOW1_ACT
#define ESPNOW2_ACT
@ -41,4 +41,9 @@
//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
#define UART_IF Serial1

9
FDRS_Gateway2000/fdrs_config.h
View File

@ -10,16 +10,17 @@
//Current function options are: sendESPNOW(MAC), sendSerial(), sendMQTT(), bufferESPNOW(interface), bufferSerial(), and bufferLoRa(interface).
#define ESPNOWG_ACT sendSerial();
#define SERIAL_ACT
#define SERIAL_ACT //sendMQTT();
#define MQTT_ACT
#define LORAG_ACT
//ESP32 Only
//#define RXD2 21
//#define TXD2 22
#define RXD2 14
#define TXD2 15
#define UART_IF Serial1
//#define USE_WIFI // You should not use ESP-NOW while WiFi is in use.
#define USE_WIFI // You should not use ESP-NOW while WiFi is in use.
#define WIFI_NET "Your SSID"
#define WIFI_PASS "Password"
#define MQTT_ADDR "192.168.0.8"

46
FDRS_Gateway2000/fdrs_functions.h
View File

@ -1,3 +1,6 @@
#ifdef ESP8266
#define UART_IF Serial
#endif
const uint8_t espnow_size = 250 / sizeof(DataReading);
const uint8_t lora_size = 256 / sizeof(DataReading);
const uint8_t mac_prefix[] = {MAC_PREFIX};
@ -40,9 +43,11 @@ uint8_t lenLORA2 = 0;
uint32_t timeLORA2 = 0;
WiFiClient espClient;
PubSubClient client(espClient);
#ifdef USE_LED
CRGB leds[NUM_LEDS];
#endif
#ifdef USE_WIFI
PubSubClient client(espClient);
const char* ssid = WIFI_NET;
const char* password = WIFI_PASS;
const char* mqtt_server = MQTT_ADDR;
@ -65,19 +70,20 @@ void OnDataRecv(const uint8_t * mac, const uint8_t *incomingData, int len) {
else if (memcmp(&incMAC, &ESPNOW2, 6) == 0) newData = 2;
else newData = 3;
ln = len / sizeof(DataReading);
//Serial.println("RCV:" + String(ln));
//UART_IF.println("RCV:" + String(ln));
}
void getSerial() {
String incomingString = Serial.readStringUntil('\n');
String incomingString = UART_IF.readStringUntil('\n');
//Serial.println("getting serial");
DynamicJsonDocument doc(24576);
DeserializationError error = deserializeJson(doc, incomingString);
if (error) { // Test if parsing succeeds.
Serial.println("parse err");
Serial.print("parse err: ");
Serial.println(incomingString);
return;
} else {
int s = doc.size();
//Serial.println(s);
//UART_IF.println(s);
for (int i = 0; i < s; i++) {
theData[i].id = doc[i]["id"];
theData[i].t = doc[i]["type"];
@ -95,11 +101,11 @@ void mqtt_callback(char* topic, byte * message, unsigned int length) {
StaticJsonDocument<2048> doc;
DeserializationError error = deserializeJson(doc, incomingString);
if (error) { // Test if parsing succeeds.
//Serial.println("parse err");
//UART_IF.println("parse err");
return;
} else {
int s = doc.size();
//Serial.println(s);
//UART_IF.println(s);
for (int i = 0; i < s; i++) {
theData[i].id = doc[i]["id"];
theData[i].t = doc[i]["type"];
@ -118,7 +124,7 @@ void getLoRa() {
uint8_t incLORAMAC[2];
LoRa.readBytes((uint8_t *)&packet, packetSize);
// for (int i = 0; i < packetSize; i++) {
// Serial.println(packet[i], HEX);
// UART_IF.println(packet[i], HEX);
// }
if (memcmp(&packet, &selfAddress[3], 3) == 0) { //Check if addressed to this device
memcpy(&incLORAMAC, &packet[3], 2); //Split off address portion of packet
@ -142,7 +148,7 @@ void sendESPNOW(uint8_t address) {
peerInfo.encrypt = false;
memcpy(peerInfo.peer_addr, NEWPEER, 6);
if (esp_now_add_peer(&peerInfo) != ESP_OK) {
Serial.println("Failed to add peer");
UART_IF.println("Failed to add peer");
return;
}
#endif
@ -168,8 +174,12 @@ void sendSerial() {
doc[i]["type"] = theData[i].t;
doc[i]["data"] = theData[i].d;
}
serializeJson(doc, UART_IF);
serializeJson(doc, Serial);
UART_IF.println();
Serial.println();
}
void sendMQTT() {
#ifdef USE_WIFI
@ -212,7 +222,7 @@ void bufferSerial() {
SERIALbuffer[lenSERIAL + i] = theData[i];
}
lenSERIAL += ln;
//Serial.println("SENDSERIAL:" + String(lenSERIAL) + " ");
//UART_IF.println("SENDSERIAL:" + String(lenSERIAL) + " ");
}
void bufferMQTT() {
for (int i = 0; i < ln; i++) {
@ -376,8 +386,8 @@ void releaseSerial() {
doc[i]["type"] = SERIALbuffer[i].t;
doc[i]["data"] = SERIALbuffer[i].d;
}
serializeJson(doc, Serial);
Serial.println();
serializeJson(doc, UART_IF);
UART_IF.println();
lenSERIAL = 0;
}
void releaseMQTT() {
@ -395,6 +405,7 @@ void releaseMQTT() {
#endif
}
void reconnect() {
#ifdef USE_WIFI
// Loop until reconnected
while (!client.connected()) {
// Attempt to connect
@ -406,6 +417,7 @@ void reconnect() {
delay(5000);
}
}
#endif
}
void begin_espnow() {
WiFi.mode(WIFI_STA);
@ -425,7 +437,7 @@ void begin_espnow() {
#elif defined(ESP32)
esp_wifi_set_mac(WIFI_IF_STA, &selfAddress[0]);
if (esp_now_init() != ESP_OK) {
Serial.println("Error initializing ESP-NOW");
UART_IF.println("Error initializing ESP-NOW");
return;
}
esp_now_register_send_cb(OnDataSent);
@ -436,17 +448,17 @@ void begin_espnow() {
// Register first peer
memcpy(peerInfo.peer_addr, ESPNOW1, 6);
if (esp_now_add_peer(&peerInfo) != ESP_OK) {
Serial.println("Failed to add peer 1");
UART_IF.println("Failed to add peer 1");
return;
}
memcpy(peerInfo.peer_addr, ESPNOW2, 6);
if (esp_now_add_peer(&peerInfo) != ESP_OK) {
Serial.println("Failed to add peer 2");
UART_IF.println("Failed to add peer 2");
return;
}
memcpy(peerInfo.peer_addr, broadcast_mac, 6);
if (esp_now_add_peer(&peerInfo) != ESP_OK) {
Serial.println("Failed to add peer bcast");
UART_IF.println("Failed to add peer bcast");
return;
}
#endif