fix: OLED initialization and make typo

diff --git a/Config.h b/Config.h
index 326c6c86d2c3db349c7e077b59643225044665eb..48e35e4996dc0f2e8c52e7d60dc767c80a3c692a 100644 (file)
--- a/Config.h
+++ b/Config.h
@@ -160,7 +160,7 @@
             #define HAS_CONSOLE true
                #elif BOARD_MODEL == BOARD_LORA32_V1_0
                        const int pin_cs = 18;
-                       const int pin_reset = 12;
+                       const int pin_reset = 14;
                        const int pin_dio = 26;
                        #if defined(EXTERNAL_LEDS)
                                const int pin_led_rx = 25;
@@ -171,7 +171,7 @@
                        #endif
             #define HAS_DISPLAY true
             #define HAS_BLUETOOTH true
-            #define HAS_CONSOLE true
+            #define HAS_CONSOLE false
                #elif BOARD_MODEL == BOARD_LORA32_V2_0
                        const int pin_cs = 18;
                        const int pin_reset = 12;

diff --git a/Display.h b/Display.h
index 9dfaa03037905a1e1542ad648489d0efdc551274..c58c0059e7c8a262b1d5e2b9d225266b84128c30 100644 (file)
--- a/Display.h
+++ b/Display.h
@@ -95,7 +95,11 @@ bool display_init() {
     #elif BOARD_MODEL == BOARD_HELTEC32_V2
       Wire.begin(SDA_OLED, SCL_OLED);
     #endif
-
+    
+    #if BOARD_MODEL == BOARD_LORA32_V1_0
+      Wire.begin(SDA_OLED, SCL_OLED);
+    #endif
+    
     if(!display.begin(SSD1306_SWITCHCAPVCC, DISP_ADDR)) {
       return false;
     } else {
@@ -106,6 +110,9 @@ bool display_init() {
       #elif BOARD_MODEL == BOARD_RNODE_NG_21
         disp_mode = DISP_MODE_PORTRAIT;
         display.setRotation(3);
+      #elif BOARD_MODEL == BOARD_LORA32_V1_0
+        disp_mode = DISP_MODE_PORTRAIT;
+        display.setRotation(3);
       #elif BOARD_MODEL == BOARD_LORA32_V2_0
         disp_mode = DISP_MODE_PORTRAIT;
         display.setRotation(3);

diff --git a/Makefile b/Makefile
index 199e948705e6b14ea660a7b867cb1afe3319b707..17bebe8c2ac294f1518aae992d73b7815704bab6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ firmware-tbeam:
        arduino-cli compile --fqbn esp32:esp32:t-beam -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x33\""
 
 firmware-lora32_v10:
-       arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=\0x39""
+       arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x39\""
 
 firmware-lora32_v10_extled:
        arduino-cli compile --fqbn esp32:esp32:ttgo-lora32 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x38\" \"-DEXTERNAL_LEDS=true\""

diff --git a/README.md b/README.md
index 80f24535932d21144eb07c0a10ff7e106cd8b02a..23aebb0939b64a23c8fa97a6cf1601b40cf45894 100644 (file)
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ The RNode Firmware supports all transceiver modules based on **Semtech SX1276**
 Support for **SX1262**, **SX1268** and **SX1280** is being implemented. Please support the project with donations if you want this faster!
 
 ## Getting Started Fast
-You can download and flash the firmware to all the supported boards using the [RNode Config Utility](https://github.com/markqvist/rnodeconfigutil). All firmware releases are now handled and installed directly through the `rnodeconf` utility, which is inclueded in the `rns` package. It can be installed via `pip`:
+You can download and flash the firmware to all the supported boards using the [RNode Config Utility](https://github.com/markqvist/rnodeconfigutil). All firmware releases are now handled and installed directly through the `rnodeconf` utility, which is included in the `rns` package. It can be installed via `pip`:
 
 ```
 # Install rnodeconf via rns package