start experimenting with lora

compile_commands.json

@@ -1 +1 @@
-.pio/build/cyd/compile_commands.json
+.pio/build/lora/compile_commands.json

include/lora.h

@@ -0,0 +1,24 @@
+/*
+ * lora.h
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifndef __ESP_ENV_LORA__
+#define __ESP_ENV_LORA__
+
+#ifdef FEATURE_LORA
+
+void lora_init(void);
+void lora_run(void);
+
+#endif // FEATURE_LORA
+
+#endif // __ESP_ENV_LORA__

platformio.ini

@@ -13,8 +13,8 @@ platform = platformio/espressif32@6.4.0
 board = esp32dev
 framework = arduino
 upload_protocol = esptool
-upload_port = /dev/ttyUSB1
-monitor_port = /dev/ttyUSB1
+upload_port = /dev/ttyUSB2
+monitor_port = /dev/ttyUSB2
 monitor_speed = 115200
 extra_scripts = pre:extra_script.py
 build_flags =
@@ -36,6 +36,29 @@ lib_deps =
     https://github.com/Bodmer/TFT_eSPI.git#01483a1043a4915c4e34c928fb48a87d3b38a248
     https://github.com/PaulStoffregen/XPT2046_Touchscreen.git#5d5120e93ab5d28b3f1db6d754819c354c2da019
 
+[env:lora]
+platform = espressif32
+board = heltec_wifi_lora_32_V3
+framework = arduino
+upload_protocol = esptool
+upload_port = /dev/ttyUSB2
+monitor_port = /dev/ttyUSB2
+monitor_speed = 115200
+extra_scripts = pre:extra_script.py
+build_flags =
+  -DSENSOR_HOSTNAME_PREFIX=\"lora-\"
+  "-DNAME_OF_FEATURE=\"Lora Gatway\""
+  -DENABLE_WEBSOCKETS
+  -DENABLE_DEBUGLOG
+  -DENABLE_MQTT
+  -DNEW_ESP32_LIB
+  -DFEATURE_LORA
+lib_deps =
+    https://github.com/knolleary/pubsubclient.git#2d228f2f862a95846c65a8518c79f48dfc8f188c
+    https://github.com/rlogiacco/CircularBuffer.git#f29cf01b6e8603422f3668d51036ac124f803404
+    https://github.com/Links2004/arduinoWebSockets.git#30d5e136665a52880f641ddd7245b3ba05ecd32b
+    https://github.com/beegee-tokyo/SX126x-Arduino.git#98ef65b5a2e9c35eabfd80a466327a9fdbb8e38e
+
 [env:esp8266env]
 platform = espressif8266
 board = esp01_1m
@@ -205,3 +228,4 @@ lib_deps =
     Adafruit BME280 Library
     https://github.com/jandrassy/UnoWiFiDevEdSerial1
     https://github.com/jandrassy/arduino-library-wifilink
+

src/lora.cpp

@@ -0,0 +1,104 @@
+/*
+ * lora.cpp
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * https://github.com/beegee-tokyo/SX126x-Arduino/blob/master/examples/PingPongPio/src/main.cpp
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifdef FEATURE_LORA
+
+#include <Arduino.h>
+#include <SX126x-Arduino.h>
+
+#include "config.h"
+#include "DebugLog.h"
+#include "lora.h"
+
+// Define LoRa parameters
+#define RF_FREQUENCY               868000000 // Hz
+#define TX_OUTPUT_POWER            22 // dBm
+#define LORA_BANDWIDTH             0 // [0: 125 kHz, 1: 250 kHz, 2: 500 kHz, 3: Reserved]
+#define LORA_SPREADING_FACTOR      7 // [SF7..SF12]
+#define LORA_CODINGRATE            1 // [1: 4/5, 2: 4/6,  3: 4/7,  4: 4/8]
+#define LORA_PREAMBLE_LENGTH       8 // Same for Tx and Rx
+#define LORA_SYMBOL_TIMEOUT        0 // Symbols
+#define LORA_FIX_LENGTH_PAYLOAD_ON false
+#define LORA_IQ_INVERSION_ON       false
+#define RX_TIMEOUT_VALUE           3000
+#define TX_TIMEOUT_VALUE           3000
+
+#define BUFFER_SIZE 64 // Define the payload size here
+
+static hw_config hwConfig;
+static RadioEvents_t RadioEvents;
+
+void lora_init(void) {
+    // Define the HW configuration between MCU and SX126x
+    hwConfig.CHIP_TYPE = SX1262_CHIP;
+
+    // TODO pin config!
+    hwConfig.PIN_LORA_RESET = 4;
+    hwConfig.PIN_LORA_NSS = 5;
+    hwConfig.PIN_LORA_SCLK = 18;
+    hwConfig.PIN_LORA_MISO = 19;
+    hwConfig.PIN_LORA_DIO_1 = 21;
+    hwConfig.PIN_LORA_BUSY = 22;
+    hwConfig.PIN_LORA_MOSI = 23;
+    hwConfig.RADIO_TXEN = 26;
+    hwConfig.RADIO_RXEN = 27;
+
+    hwConfig.USE_DIO2_ANT_SWITCH = true;
+    hwConfig.USE_DIO3_TCXO = true;
+    hwConfig.USE_DIO3_ANT_SWITCH = false;
+
+    // Initialize the LoRa chip
+    debug.println("Starting lora_hardware_init");
+    lora_hardware_init(hwConfig);
+
+    // Initialize the Radio callbacks
+    RadioEvents.TxDone = OnTxDone;
+    RadioEvents.RxDone = OnRxDone;
+    RadioEvents.TxTimeout = OnTxTimeout;
+    RadioEvents.RxTimeout = OnRxTimeout;
+    RadioEvents.RxError = OnRxError;
+    RadioEvents.CadDone = OnCadDone;
+
+    // Initialize the Radio
+    Radio.Init(&RadioEvents);
+
+    // Set Radio channel
+    Radio.SetChannel(RF_FREQUENCY);
+
+    // Set Radio TX configuration
+    Radio.SetTxConfig(MODEM_LORA, TX_OUTPUT_POWER, 0, LORA_BANDWIDTH,
+                      LORA_SPREADING_FACTOR, LORA_CODINGRATE,
+                      LORA_PREAMBLE_LENGTH, LORA_FIX_LENGTH_PAYLOAD_ON,
+                      true, 0, 0, LORA_IQ_INVERSION_ON, TX_TIMEOUT_VALUE);
+
+    // Set Radio RX configuration
+    Radio.SetRxConfig(MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR,
+                      LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH,
+                      LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
+                      0, true, 0, 0, LORA_IQ_INVERSION_ON, true);
+
+    // Start LoRa
+    debug.println("Starting Radio.Rx");
+    Radio.Rx(RX_TIMEOUT_VALUE);
+}
+
+void lora_run(void) {
+#ifdef ARDUINO_ARCH_ESP8266
+    // Handle Radio events
+    Radio.IrqProcess();
+#endif // ARDUINO_ARCH_ESP8266
+}
+
+#endif // FEATURE_LORA

src/main.cpp

@@ -33,6 +33,7 @@
 #include "html.h"
 #include "servers.h"
 #include "ui.h"
+#include "lora.h"
 
 unsigned long last_led_blink_time = 0;
 
@@ -91,6 +92,13 @@ void setup() {
     debug.println(F("Sensors"));
     initSensors();
 
+#ifdef FEATURE_LORA
+    debug.println(F("Lora"));
+    lora_init();
+#endif // FEATURE_LORA
+
+#ifndef FEATURE_DISABLE_WIFI
+
     // Build hostname string
     String hostname = SENSOR_HOSTNAME_PREFIX;
     hostname += SENSOR_ID;
@@ -196,7 +204,7 @@ void setup() {
     ui_progress(UI_WIFI_CONNECTED);
 #endif // FEATURE_UI
 
-#endif
+#endif // ARCH
 
     debug.println(F("Seeding"));
     randomSeed(micros());
@@ -210,6 +218,8 @@ void setup() {
     debug.println(F("Servers"));
     initServers(hostname);
 
+#endif // FEATURE_DISABLE_WIFI
+
     debug.println(F("Ready! Starting..."));
 
 #ifdef FEATURE_UI
@@ -219,15 +229,22 @@ void setup() {
 }
 
 void loop() {
-    runServers();
     runSensors();
+
+#ifndef FEATURE_DISABLE_WIFI
+    runServers();
     runMQTT();
     runInflux();
+#endif // FEATURE_DISABLE_WIFI
 
 #ifdef FEATURE_UI
     ui_run();
 #endif
 
+#ifdef FEATURE_LORA
+    lora_run();
+#endif // FEATURE_LORA
+
     // blink heartbeat LED
     unsigned long time = millis();
     if ((time - last_led_blink_time) >= LED_BLINK_INTERVAL) {