Merge pull request #156 from geeksville/master

minor

README.md

@@ -4,7 +4,7 @@ This is the device side code for the [meshtastic.org](https://www.meshtastic.org
 
 ![Continuous Integration](https://github.com/meshtastic/Meshtastic-esp32/workflows/Continuous%20Integration/badge.svg)
 
-Meshtastic is a project that lets you use
+Meshtastic™ is a project that lets you use
 inexpensive GPS mesh radios as an extensible, super long battery life mesh GPS communicator. These radios are great for hiking, skiing, paragliding -
 essentially any hobby where you don't have reliable internet access. Each member of your private mesh can always see the location and distance of all other
 members and any text messages sent to your group chat.

docs/README.md

@@ -1,6 +1,6 @@
 # What is Meshtastic?
 
-Meshtastic is a project that lets you use
+Meshtastic™ is a project that lets you use
 inexpensive (\$30 ish) GPS radios as an extensible, long battery life, secure, mesh GPS communicator. These radios are great for hiking, skiing, paragliding - essentially any hobby where you don't have reliable internet access. Each member of your private mesh can always see the location and distance of all other members and any text messages sent to your group chat.
 
 The radios automatically create a mesh to forward packets as needed, so everyone in the group can receive messages from even the furthest member. The radios will optionally work with your phone, but no phone is required.

gdbinit

@@ -6,8 +6,8 @@
 # mon exec SetMonModeDebug=1
 # mon exec SetMonModeVTableAddr=0x26000
 
-echo setting RTTAddr
-eval "monitor exec SetRTTAddr %p", &_SEGGER_RTT
+# echo setting RTTAddr
+# eval "monitor exec SetRTTAddr %p", &_SEGGER_RTT
 
 # the jlink debugger seems to want a pause after reset before we tell it to start running
 define restart

src/nrf52/UC1701Spi.cpp

@@ -34,3 +34,17 @@ class UC1701Spi : public OLEDDisplay
 
   private:
 };
+
+#include "variant.h"
+#include <UC1701.h>
+static UC1701 lcd(PIN_SPI_SCK, PIN_SPI_MOSI, ERC12864_CS, ERC12864_CD);
+
+
+void testLCD() {
+  // PCD8544-compatible displays may have a different resolution...
+  lcd.begin();
+
+  // Write a piece of text on the first line...
+  lcd.setCursor(0, 0);
+  lcd.print("Hello, World!");
+}

variants/ppr/variant.h

@@ -132,7 +132,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define SX1262_CS (10)
 #define SX1262_DIO1 (20)
 #define SX1262_DIO2 (26)
-#define SX1262_BUSY (18)
+#define SX1262_BUSY (31) // Supposed to be P0.18 but because of reworks, now on P0.31 (18)
 #define SX1262_RESET (17)
 // #define SX1262_ANT_SW (32 + 10)
 #define SX1262_RXEN (22)