Mirrors/disaster-radio
2
0
Fork 0
mirror of https://github.com/sudomesh/disaster-radio.git synced 2026-02-20 02:01:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Uncommenting Arduino-LoRa lines, ifndefs added in Layer2 to fix preprocessor problems

Browse Source
This commit is contained in:
code8buster
2021-11-23 21:16:15 -05:00
parent 412575a210
commit 839072f75f
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
firmware/main.ino
View File

@@ -1,5 +1,5 @@
#include <Arduino.h>
#define RL_SX1262
// required for LoRa and/or AsyncSDServer libraries?
#include <FS.h>
#include <SPI.h>
@@ -15,17 +15,16 @@
#include <SSD1306Wire.h>
#endif
#include "config.h"
/*
#ifdef ARDUINO_LORA
#include <Layer1_LoRa.h>
#endif
*/
#ifdef RL_SX1276
#include <Layer1_SX1276.h>
#endif
#ifdef RL_SX1262
#include <Layer1_SX126x.h>
#undef ARDUINO_LORA
#endif
#include <LoRaLayer2.h>
@@ -72,11 +71,11 @@ AsyncWebServer http_server(80);
AsyncWebSocket ws_server("/ws");
BleUartClient ble_client;
/*
#ifdef ARDUINO_LORA
Layer1Class *Layer1 = new Layer1Class();
#endif
*/
#ifdef RL_SX1276
SX1276 lora = new Module(LORA_CS, LORA_IRQ, LORA_RST, RADIOLIB_NC);
#ifdef DUAL_LORA
@@ -360,15 +359,15 @@ void setupLoRa()
#ifdef LOPY4
SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI); //LORA_CS);
#endif
/*
#ifdef ARDUINO_LORA
#if defined (ARDUINO_LORA)
Layer1Class *Layer1_1 = new Layer1Class();
Layer1_1->setPins(LORA_CS, LORA_RST, LORA_IRQ);
Layer1_1->setLoRaFrequency(loraFrq*1E6);
Layer1_1->setTxPower(txPower);
Layer1_1->setSpreadingFactor(spreadingFactor);
#endif
*/
#if defined ( RL_SX1276 ) || defined ( RL_SX1262 )
pinMode(LORA_CS, OUTPUT);
digitalWrite(LORA_CS, LOW);