Lora out of Lite

Author: bmorcelli

include/VectorDisplay.h

@@ -859,7 +859,7 @@ class VectorDisplayClass : public Print {
 
     int16_t getCursorY(void) { return cursor_y; }
 
-    void setTextWrap(bool w) { wrap = w; }
+    void setTextWrap(bool x, bool wrapY = false) { wrap = x; }
 
     int16_t drawRightString(const char *string, int32_t x, int32_t y, uint8_t font) {
         // TODO: add spaces
@@ -1184,7 +1184,8 @@ class VectorDisplayClass : public Print {
             }
         }
         if (corners & 1) {
-            arc(cx, cy, r, TO_FP32(270), TO_FP32(180), false
+            arc(
+                cx, cy, r, TO_FP32(270), TO_FP32(180), false
             ); // drawing edges separately makes things fit better
             arc(cx, cy, r, TO_FP32(270), TO_FP32(180), true);
             arc(cx, cy + delta, r, TO_FP32(270), TO_FP32(180), false);

src/core/main_menu.cpp

@@ -19,10 +19,12 @@ MainMenu::MainMenu() {
         &fileMenu,
         &gpsMenu,
         &nrf24Menu,
-#if !defined(LITE_VERSION) && !defined(DISABLE_INTERPRETER)
+#if !defined(LITE_VERSION)
+#if !defined(DISABLE_INTERPRETER)
         &scriptsMenu,
 #endif
         &loraMenu,
+#endif
         &othersMenu,
         &clockMenu,
 #if !defined(LITE_VERSION)

src/core/main_menu.h

@@ -35,8 +35,8 @@ class MainMenu {
     RFMenu rfMenu;
     ScriptsMenu scriptsMenu;
     WifiMenu wifiMenu;
-    LoRaMenu loraMenu;
 #if !defined(LITE_VERSION)
+    LoRaMenu loraMenu;
     EthernetMenu ethernetMenu;
 #endif
 

src/core/menu_items/LoRaMenu.cpp

@@ -1,3 +1,4 @@
+#if !defined(LITE_VERSION)
 #include "LoRaMenu.h"
 #include "core/display.h"
 #include "core/utils.h"
@@ -90,3 +91,4 @@ void LoRaMenu::drawIcon(float scale) {
     tft.drawArc(cx, ballY, r1 + lineWidth, r1, 240, 300, bruceConfig.priColor, bruceConfig.bgColor);
     tft.drawArc(cx, ballY, r2 + lineWidth, r2, 240, 300, bruceConfig.priColor, bruceConfig.bgColor);
 }
+#endif

src/core/menu_items/LoRaMenu.h

@@ -1,24 +1,24 @@
 #ifndef __LORA_MENU_H__
 #define __LORA_MENU_H__
-
+#if !defined(LITE_VERSION)
 #include <MenuItemInterface.h>
 
-    void lorachat();
-    void changeusername();
-    void chfreq();
+void lorachat();
+void changeusername();
+void chfreq();
 
-    class LoRaMenu : public MenuItemInterface {
-    private:
-        void configMenu(void);
+class LoRaMenu : public MenuItemInterface {
+private:
+    void configMenu(void);
 
-    public:
-        LoRaMenu() : MenuItemInterface("LoRa") {}
+public:
+    LoRaMenu() : MenuItemInterface("LoRa") {}
 
-        void optionsMenu(void);
-        void drawIcon(float scale);
-        void drawIconImg();
-        bool getTheme() { return bruceConfig.theme.lora; }
-    };
+    void optionsMenu(void);
+    void drawIcon(float scale);
+    void drawIconImg();
+    bool getTheme() { return bruceConfig.theme.lora; }
+};
 
 #endif
-
+#endif

src/modules/lora/LoRaRF.cpp

@@ -1,3 +1,4 @@
+#if !defined(LITE_VERSION)
 #include "LoRaRF.h"
 #include "WString.h"
 #include "core/config.h"
@@ -300,3 +301,4 @@ void chfreq() {
     serializeJson(doc, file);
     file.close();
 }
+#endif

src/modules/lora/LoRaRF.h

@@ -1,9 +1,11 @@
 
-//#ifndef __LORA_MENU_H__
-//#define __LORA_MENU_H__
+// #ifndef __LORA_MENU_H__
+// #define __LORA_MENU_H__
 #ifndef __LORA_RF_H__
 #define __LORA_RF_H__
+#if !defined(LITE_VERSION)
 #include "HWCDC.h"
 void lorachat();
 void loraconf();
 #endif
+#endif