From fb15115c6252e969acf3fef13893321a1c08d134 Mon Sep 17 00:00:00 2001 From: Timm Bogner <64260873+timmbogner@users.noreply.github.com> Date: Mon, 21 Nov 2022 23:04:39 -0600 Subject: [PATCH] getting started --- examples/1_UART_Gateway/fdrs_gateway_config.h | 14 ++-- src/fdrs_functions.h | 2 +- src/fdrs_lora.h | 78 +++++++++++++++---- 3 files changed, 71 insertions(+), 23 deletions(-) diff --git a/examples/1_UART_Gateway/fdrs_gateway_config.h b/examples/1_UART_Gateway/fdrs_gateway_config.h index 3775fc8..7a78d4c 100644 --- a/examples/1_UART_Gateway/fdrs_gateway_config.h +++ b/examples/1_UART_Gateway/fdrs_gateway_config.h @@ -16,6 +16,11 @@ #define SERIAL_ACT sendESPNOW(0x02); bufferLoRa(1); sendESPNOWpeers(); #define MQTT_ACT #define LORAG_ACT sendSerial(); +// Neighbor Actions +#define ESPNOW1_ACT +#define ESPNOW2_ACT +#define LORA1_ACT sendSerial(); +#define LORA2_ACT // Protocols -- Define which protocols the gateway will use. // Warning: ESP-NOW and WiFi should not be used simultaneously. @@ -24,17 +29,15 @@ //#define USE_LORA //#define USE_WIFI //Used only for MQTT gateway +#define RADIOLIB_MODULE SX1276 + // Neighboring gateway addresses #define ESPNOW_NEIGHBOR_1 0x0E // ESPNOW1 Address #define ESPNOW_NEIGHBOR_2 0x0F // ESPNOW2 Address #define LORA_NEIGHBOR_1 0x02 // LoRa1 Address #define LORA_NEIGHBOR_2 0x0F // LoRa2 Address -// Neighbor Actions -#define ESPNOW1_ACT -#define ESPNOW2_ACT -#define LORA1_ACT sendSerial(); -#define LORA2_ACT + //Pins for UART data interface (ESP32 only) #define RXD2 14 @@ -58,6 +61,7 @@ #define LORA_SS 18 #define LORA_RST 14 #define LORA_DIO0 26 +#define LORA_DIO1 33 //433E6 for Asia //866E6 for Europe diff --git a/src/fdrs_functions.h b/src/fdrs_functions.h index 108c570..35f8fb6 100644 --- a/src/fdrs_functions.h +++ b/src/fdrs_functions.h @@ -854,7 +854,7 @@ void loopFDRS(){ while (UART_IF.available() || Serial.available()) { getSerial(); } - getLoRa(); + if (receivedFlag) getLoRa(); #ifdef USE_WIFI if (!client.connected()) { reconnect(1, true); diff --git a/src/fdrs_lora.h b/src/fdrs_lora.h index 6c0b500..1a5ea29 100644 --- a/src/fdrs_lora.h +++ b/src/fdrs_lora.h @@ -1,3 +1,6 @@ +RADIOLIB_MODULE radio = new Module(LORA_SS, LORA_DIO0, LORA_RST, LORA_DIO1); +volatile bool receivedFlag = false; +volatile bool enableInterrupt = true; #ifdef USE_LORA void transmitLoRa(uint16_t* destMac, DataReading * packet, uint8_t len) { @@ -57,27 +60,68 @@ void printLoraPacket(uint8_t* p,int size) { } void begin_lora() { -#ifdef USE_LORA - DBG("Initializing LoRa!"); -#ifdef ESP32 - SPI.begin(SPI_SCK, SPI_MISO, SPI_MOSI); -#endif - LoRa.setPins(LORA_SS, LORA_RST, LORA_DIO0); - if (!LoRa.begin(FDRS_BAND)) { - DBG(" Initialization failed!"); - while (1); + DBG("RadioLib [RADIOLIB_MODULE] Initializing ... "); + int state = radio.begin(); + if (state == RADIOLIB_ERR_NONE) { + DBG(" success!"); + } else { + DBG(" failed, code " + String(state)); + while (true); + } + radio.setDio0Action(setFlag); + + // start listening for LoRa packets + Serial.print(F("[RADIOLIB_MODULE] Starting to listen ... ")); + state = radio.startReceive(); + if (state == RADIOLIB_ERR_NONE) { + DBG(" success!"); + } else { + DBG(" failed, code " + String(state)); + while (true); } - LoRa.setSpreadingFactor(FDRS_SF); - LoRa.setTxPower(FDRS_TXPWR); - DBG("LoRa Initialized. Band: " + String(FDRS_BAND) + " SF: " + String(FDRS_SF) + " Tx Power: " + String(LORA_TXPWR) + " dBm"); +// #ifdef USE_LORA +// DBG("Initializing LoRa!"); +// #ifdef ESP32 +// SPI.begin(SPI_SCK, SPI_MISO, SPI_MOSI); +// #endif +// LoRa.setPins(LORA_SS, LORA_RST, LORA_DIO0); +// if (!LoRa.begin(FDRS_BAND)) { +// DBG(" Initialization failed!"); +// while (1); +// } -#endif // USE_LORA +// LoRa.setSpreadingFactor(FDRS_SF); +// LoRa.setTxPower(FDRS_TXPWR); +// DBG("LoRa Initialized. Band: " + String(FDRS_BAND) + " SF: " + String(FDRS_SF) + " Tx Power: " + String(LORA_TXPWR) + " dBm"); + +// #endif // USE_LORA +} + +#if defined(ESP8266) || defined(ESP32) + ICACHE_RAM_ATTR +#endif +void setFlag(void) { + // check if the interrupt is enabled + if(!enableInterrupt) { + return; + } + // we got a packet, set the flag + receivedFlag = true; +} + +void parsePacket(){ + + RADIOLIB_MODULE.getPacketLength(); + int state = radio.readData(str); } crcResult getLoRa() { #ifdef USE_LORA - int packetSize = LoRa.parsePacket(); + enableInterrupt = false; + receivedFlag = false; + + int packetSize = RADIOLIB_MODULE.getPacketLength(); if((((packetSize - 6) % sizeof(DataReading) == 0) || ((packetSize - 6) % sizeof(SystemPacket) == 0)) && packetSize > 0) { // packet size should be 6 bytes plus multiple of size of DataReading uint8_t packet[packetSize]; uint16_t packetCRC = 0x0000; // CRC Extracted from received LoRa packet @@ -85,7 +129,7 @@ crcResult getLoRa() { uint16_t sourceMAC = 0x0000; uint16_t destMAC = 0x0000; - LoRa.readBytes((uint8_t *)&packet, packetSize); + RADIOLIB_MODULE.readBytes((uint8_t *)&packet, packetSize); destMAC = (packet[0] << 8) | packet[1]; sourceMAC = (packet[2] << 8) | packet[3]; @@ -94,10 +138,10 @@ crcResult getLoRa() { if (destMAC == (selfAddress[4] << 8 | selfAddress[5])) { //Check if addressed to this device (2 bytes, bytes 1 and 2) //printLoraPacket(packet,sizeof(packet)); if(receivedLoRaMsg != 0){ // Avoid divide by 0 - DBG("Incoming LoRa. Size: " + String(packetSize) + " Bytes, RSSI: " + String(LoRa.packetRssi()) + "dBm, SNR: " + String(LoRa.packetSnr()) + "dB, PacketCRC: 0x" + String(packetCRC, HEX) + ", Total LoRa received: " + String(receivedLoRaMsg) + ", CRC Ok Pct " + String((float)ackOkLoRaMsg/receivedLoRaMsg*100) + "%"); + DBG("Incoming LoRa. Size: " + String(packetSize) + " Bytes, RSSI: " + String(radio.getRSSI()) + "dBm, SNR: " + String(radio.getSNR()) + "dB, PacketCRC: 0x" + String(packetCRC, HEX) + ", Total LoRa received: " + String(receivedLoRaMsg) + ", CRC Ok Pct " + String((float)ackOkLoRaMsg/receivedLoRaMsg*100) + "%"); } else { - DBG("Incoming LoRa. Size: " + String(packetSize) + " Bytes, RSSI: " + String(LoRa.packetRssi()) + "dBm, SNR: " + String(LoRa.packetSnr()) + "dB, PacketCRC: 0x" + String(packetCRC, HEX) + ", Total LoRa received: " + String(receivedLoRaMsg)); + DBG("Incoming LoRa. Size: " + String(packetSize) + " Bytes, RSSI: " + String(radio.getRSSI()) + "dBm, SNR: " + String(radio.getSNR()) + "dB, PacketCRC: 0x" + String(packetCRC, HEX) + ", Total LoRa received: " + String(receivedLoRaMsg)); } receivedLoRaMsg++; // Evaluate CRC