From 4b5cfaf9baf6b0f4bd2a0740b9590268841e3d14 Mon Sep 17 00:00:00 2001 From: geeksville Date: Fri, 5 Jun 2020 11:00:18 -0700 Subject: [PATCH 1/2] changes from bringing up PPR --- bin/nrf52-gdbserver.sh | 0 gdbinit | 4 ++-- src/nrf52/UC1701Spi.cpp | 16 +++++++++++++++- variants/ppr/variant.h | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) mode change 100644 => 100755 bin/nrf52-gdbserver.sh diff --git a/bin/nrf52-gdbserver.sh b/bin/nrf52-gdbserver.sh old mode 100644 new mode 100755 diff --git a/gdbinit b/gdbinit index bb345813..9950fac4 100644 --- a/gdbinit +++ b/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 diff --git a/src/nrf52/UC1701Spi.cpp b/src/nrf52/UC1701Spi.cpp index d6f236cf..d653b645 100644 --- a/src/nrf52/UC1701Spi.cpp +++ b/src/nrf52/UC1701Spi.cpp @@ -33,4 +33,18 @@ class UC1701Spi : public OLEDDisplay void display(void) {} private: -}; \ No newline at end of file +}; + +#include "variant.h" +#include +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!"); +} \ No newline at end of file diff --git a/variants/ppr/variant.h b/variants/ppr/variant.h index d59e1750..95b2803b 100644 --- a/variants/ppr/variant.h +++ b/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) From 9f61c78c0ed6a6d7285f3e1766db10c084bdd9ed Mon Sep 17 00:00:00 2001 From: geeksville Date: Fri, 5 Jun 2020 11:05:36 -0700 Subject: [PATCH 2/2] doc merge --- README.md | 2 +- docs/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index df4b8d27..e5259012 100644 --- a/README.md +++ b/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. diff --git a/docs/README.md b/docs/README.md index db48dda5..3f4bfa49 100644 --- a/docs/README.md +++ b/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.