From 5595fb38c1464804c2efbf164755c9172190b1ea Mon Sep 17 00:00:00 2001 From: oztug <76663743+oztug@users.noreply.github.com> Date: Tue, 29 Dec 2020 18:08:11 +0300 Subject: [PATCH 1/3] Genieblocks Lora support --- platformio.ini | 7 +++++++ src/configuration.h | 29 +++++++++++++++++++++++++++++ src/main.cpp | 13 +++++++++++++ 3 files changed, 49 insertions(+) diff --git a/platformio.ini b/platformio.ini index 50d381c8..d5fbc07f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -314,3 +314,10 @@ src_filter = ${env.src_filter} - - - - build_flags = ${arduino_base.build_flags} -O0 framework = arduino board = linux_x86_64 + +; The GenieBlocks LORA prototype board +[env:genieblocks_lora] +extends = esp32_base +board = genieblocks_lora +build_flags = + ${esp32_base.build_flags} -D GENIEBLOCKS diff --git a/src/configuration.h b/src/configuration.h index 6fa07ce6..fdc74871 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -336,6 +336,35 @@ along with this program. If not, see . #define LORA_DIO1 35 // Not really used #define LORA_DIO2 34 // Not really used +#elif defined(GENIEBLOCKS) +// This string must exactly match the case used in release file names or the android updater won't work +#define HW_VENDOR "genieblocks" +#undef GPS_RX_PIN +#undef GPS_TX_PIN +#define GPS_RX_PIN 5 +#define GPS_TX_PIN 18 +#define GPS_RESET_N 10 +#define GPS_EXTINT 23 // On MAX-M8 module pin name is EXTINT. On L70 module pin name is STANDBY. + +#define BATTERY_PIN 39 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage +#define BATTERY_EN_PIN 14 // Voltage voltage divider enable pin connected to mosfet + +#define I2C_SDA 4 // I2C pins for this board +#define I2C_SCL 2 + +#define LED_PIN 12 // If defined we will blink this LED +//#define BUTTON_PIN 36 // If defined, this will be used for user button presses (ToDo problem on that line on debug screen --> Long press start!) +//#define BUTTON_NEED_PULLUP //GPIOs 34 to 39 are GPIs – input only pins. These pins don’t have internal pull-ups or pull-down resistors. + +#define USE_RF95 +#define LORA_DIO0 38 // a No connect on the SX1262 module +#define LORA_RESET 9 + +#define RF95_SCK 22 +#define RF95_MISO 19 +#define RF95_MOSI 13 +#define RF95_NSS 21 + #endif #ifdef ARDUINO_NRF52840_PCA10056 diff --git a/src/main.cpp b/src/main.cpp index 64851022..0f4910aa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -388,6 +388,19 @@ void setup() readFromRTC(); // read the main CPU RTC at first (in case we can't get GPS time) +#ifdef GENIEBLOCKS + //gps setup + pinMode (GPS_RESET_N, OUTPUT); + pinMode(GPS_EXTINT, OUTPUT); + digitalWrite(GPS_RESET_N, HIGH); + digitalWrite(GPS_EXTINT, LOW); + //battery setup + // If we want to read battery level, we need to set BATTERY_EN_PIN pin to low. + // ToDo: For low power consumption after read battery level, set that pin to high. + pinMode (BATTERY_EN_PIN, OUTPUT); + digitalWrite(BATTERY_EN_PIN, LOW); +#endif + // If we don't have bidirectional comms, we can't even try talking to UBLOX UBloxGPS *ublox = NULL; #ifdef GPS_TX_PIN From 85ddf3be1bf57fca0539fed38fe1529ac88aee33 Mon Sep 17 00:00:00 2001 From: oztug <76663743+oztug@users.noreply.github.com> Date: Wed, 30 Dec 2020 01:26:12 +0300 Subject: [PATCH 2/3] Update proto --- proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto b/proto index ce422b7c..323b814f 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit ce422b7c448906c6fee3eef64bbd41adfbc990f0 +Subproject commit 323b814f4392ae0f9c42a0f14557c6b9333efce3 From 9a3d558f61ac79e102564d186f6a1c157e476655 Mon Sep 17 00:00:00 2001 From: oztug <76663743+oztug@users.noreply.github.com> Date: Wed, 30 Dec 2020 01:27:20 +0300 Subject: [PATCH 3/3] Revert "Update proto" This reverts commit 85ddf3be1bf57fca0539fed38fe1529ac88aee33. --- proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto b/proto index 323b814f..ce422b7c 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 323b814f4392ae0f9c42a0f14557c6b9333efce3 +Subproject commit ce422b7c448906c6fee3eef64bbd41adfbc990f0