Fixup Heltec support

lib/loraboards/LiLyGo.h

@@ -1,6 +1,52 @@
 #ifndef __LILY_GO_H
 #define __LILY_GO_H
 
+#include "RadioLib.h"
+
+#ifdef HELTEC
+
+#ifdef HELTEC_NO_DISPLAY
+#define HELTEC_NO_DISPLAY_INSTANCE
+#else
+#define DISPLAY_WIDTH 128
+#define DISPLAY_HEIGHT 64
+#include "SSD1306Wire.h"
+#endif
+
+#define RADIO_TYPE SX1262
+
+#ifndef HELTEC_NO_RADIO_INSTANCE
+#ifndef ARDUINO_heltec_wifi_32_lora_V3
+// Assume MISO and MOSI being wrong when not using Heltec's board definition
+// and use hspi to make it work anyway. See heltec_setup() for the actual SPI setup.
+#include <SPI.h>
+extern SPIClass *hspi;
+#define RADIO_MODULE_INIT() new Module(SS, DIO1, RST_LoRa, BUSY_LoRa, *hspi);
+#else  // ARDUINO_heltec_wifi_32_lora_V3
+#endif // end ARDUINO_heltec_wifi_32_lora_V3
+#endif // end HELTEC_NO_RADIO_INSTANCE
+
+extern RADIO_TYPE radio;
+
+#ifndef HELTEC_NO_DISPLAY_INSTANCE
+#ifdef HELTEC_WIRELESS_STICK
+#define DISPLAY_GEOMETRY GEOMETRY_64_32
+#else
+#define DISPLAY_GEOMETRY GEOMETRY_128_64
+#endif
+#define SCREEN_ADDRESS 0x3C
+
+#define DISPLAY_TYPE SSD1306Wire
+#define DISPLAY_INIT() SSD1306Wire(SCREEN_ADDRESS, I2C_SDA, I2C_SCL, DISPLAY_GEOMETRY)
+// SH1106Wire display(0x3c, I2C_SDA, I2C_SCL, DISPLAY_GEOMETRY);
+#else
+#define DISPLAY_TYPE void *
+#endif
+
+// This file contains a binary patch for the SX1262
+#include "modules/SX126x/patches/SX126x_patch_scan.h"
+
+#else
 // Define for our code
 #define RST_OLED UNUSED_PIN
 #define LED BOARD_LED
@@ -10,9 +56,7 @@
 // (See RadioLib_convenience.h)
 #define RADIOLIB_DO_DURING_HALT heltec_delay(10)
 #include "RadioLib_convenience.h"
-#ifdef HELTEC_NO_DISPLAY
-#define HELTEC_NO_DISPLAY_INSTANCE
-#else
+
 #define DISPLAY_WIDTH 128
 #define DISPLAY_HEIGHT 64
 // #include "OLEDDisplayUi.h"
@@ -20,17 +64,6 @@
 // #include "SSD1306Brzo.h"
 #include "SSD1306Wire.h"
 
-#endif
-#define ARDUINO_heltec_wifi_32_lora_V3
-#ifndef HELTEC_NO_RADIO_INSTANCE
-#ifndef ARDUINO_heltec_wifi_32_lora_V3
-// Assume MISO and MOSI being wrong when not using Heltec's board definition
-// and use hspi to make it work anyway. See heltec_setup() for the actual SPI setup.
-#include <SPI.h>
-extern SPIClass *hspi;
-#define RADIO_TYPE SX1262
-#define RADIO_MODULE_INIT() new Module(SS, DIO1, RST_LoRa, BUSY_LoRa, *hspi);
-#else // ARDUINO_heltec_wifi_32_lora_V3
 #ifdef USING_SX1280PA
 #define RADIO_TYPE SX1280
 #define RADIO_MODULE_INIT()                                                              \
@@ -54,8 +87,6 @@ extern SPIClass *hspi;
 #define RADIO_MODULE_INIT()                                                              \
     new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
 #endif // end USING_SX1276
-#endif // end ARDUINO_heltec_wifi_32_lora_V3
-#endif // end HELTEC_NO_RADIO_INSTANCE
 
 extern RADIO_TYPE radio;
 
@@ -65,7 +96,6 @@ void heltec_deep_sleep(int sleep_seconds = 0);
 
 void heltec_delay(int millisec);
 
-#ifndef HELTEC_NO_DISPLAY_INSTANCE
 /**
  * @class PrintSplitter
  * @brief A class that splits the output of the Print class to two different
@@ -95,11 +125,7 @@ class PrintSplitter : public Print
     Print &b;
 };
 
-#ifdef HELTEC_WIRELESS_STICK
-#define DISPLAY_GEOMETRY GEOMETRY_64_32
-#else
 #define DISPLAY_GEOMETRY GEOMETRY_128_64
-#endif
 #define SCREEN_ADDRESS 0x3C
 
 #define DISPLAY_TYPE SSD1306Wire
@@ -108,28 +134,26 @@ class PrintSplitter : public Print
 
 #define BOTH_TYPE PrintSplitter
 #define BOTH_INIT() PrintSplitter(Serial, display)
-#else
-#define DISPLAY_TYPE void *
-#define BOTH_TYPE Print &
-#define BOTH_INIT() Serial
-#endif
 
 extern DISPLAY_TYPE display;
 extern BOTH_TYPE both;
+
 // some fake pin
 #ifdef T3_V1_6_SX1276
 #define BUTTON_PIN 22
 #endif
+
+// This file contains a binary patch for the SX1262
+#include "modules/SX126x/patches/SX126x_patch_scan.h"
+
 #define BUTTON BUTTON_PIN
 #include "HotButton.h"
 extern HotButton button;
 
 void heltec_loop();
 
-// This file contains a binary patch for the SX1262
-#include "modules/SX126x/patches/SX126x_patch_scan.h"
-
 void heltec_display_power(bool on);
 
 void heltec_setup();
 #endif
+#endif

lib/loraboards/LoRaBoards.cpp

@@ -75,9 +75,11 @@ void heltec_setup()
     SPI.begin();
 #endif
 
+#ifdef HELTEC
 #ifndef ARDUINO_heltec_wifi_32_lora_V3
     hspi->begin(SCK, MISO, MOSI, SS);
 #endif
+#endif
 #ifndef HELTEC_NO_DISPLAY_INSTANCE
     heltec_display_power(true);
     display.init();
@@ -86,9 +88,11 @@ void heltec_setup()
 #endif
 }
 
+#ifdef HELTEC
 #ifndef ARDUINO_heltec_wifi_32_lora_V3
 SPIClass hspi = new SPIClass(2);
 #endif
+#endif
 
 RADIO_TYPE radio = RADIO_MODULE_INIT();