From ab0a06e536d877afbe4df04f56e2955b6871c573 Mon Sep 17 00:00:00 2001 From: Solanaceae <93513823+Solarvortx@users.noreply.github.com> Date: Tue, 30 Nov 2021 17:56:19 -0700 Subject: [PATCH 1/5] Raising currentLimit for SX1262 --- src/mesh/RadioLibInterface.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mesh/RadioLibInterface.h b/src/mesh/RadioLibInterface.h index cd46968c..25931f5b 100644 --- a/src/mesh/RadioLibInterface.h +++ b/src/mesh/RadioLibInterface.h @@ -87,8 +87,12 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified * for a long time. */ const uint8_t syncWord = 0x2b; - - float currentLimit = 100; // FIXME + + #ifdef USE_SX1262 + float currentLimit = 140; //SX1262 higher limit - this should allow for extra current used by the PA at +22dBm. + #else + float currentLimit = 100; // 100mA OCP - Should be acceptable for RFM95/SX127x chipset. + #endif LockingModule module; // The HW interface to the radio From 6bd495a49124bb85b8ff3ea82103f9fcbf2a11a7 Mon Sep 17 00:00:00 2001 From: Solanaceae <93513823+Solarvortx@users.noreply.github.com> Date: Thu, 2 Dec 2021 20:46:36 -0700 Subject: [PATCH 2/5] OCP limit into SX126x class where it belongs. --- src/mesh/RadioLibInterface.h | 6 +----- src/mesh/SX126xInterface.h | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mesh/RadioLibInterface.h b/src/mesh/RadioLibInterface.h index 25931f5b..54d9e674 100644 --- a/src/mesh/RadioLibInterface.h +++ b/src/mesh/RadioLibInterface.h @@ -88,11 +88,7 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified */ const uint8_t syncWord = 0x2b; - #ifdef USE_SX1262 - float currentLimit = 140; //SX1262 higher limit - this should allow for extra current used by the PA at +22dBm. - #else - float currentLimit = 100; // 100mA OCP - Should be acceptable for RFM95/SX127x chipset. - #endif + float currentLimit = 100; // 100mA OCP - Should be acceptable for RFM95/SX127x chipset. LockingModule module; // The HW interface to the radio diff --git a/src/mesh/SX126xInterface.h b/src/mesh/SX126xInterface.h index 1b4a1004..953f8907 100644 --- a/src/mesh/SX126xInterface.h +++ b/src/mesh/SX126xInterface.h @@ -29,6 +29,8 @@ class SX126xInterface : public RadioLibInterface protected: + float currentLimit = 140; // Higher OCP limit for SX126x PA + /** * Specific module instance */ From 2311653ca88b65126d54f895278c914a13de9175 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Thu, 2 Dec 2021 22:53:46 -0800 Subject: [PATCH 3/5] updating proto submodule to latest --- proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto b/proto index 3ba36ec5..5a556ee4 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 3ba36ec5db702ef0875128271ba20bf8558508a2 +Subproject commit 5a556ee4a940d27761a41b43df5630d16ccaf728 From 371335e6ab7971c6e066d114ebf099b0fbbf890d Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Thu, 2 Dec 2021 22:55:07 -0800 Subject: [PATCH 4/5] Update version to 1.2.48 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index cfd29c3c..5eae0b8b 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 1 minor = 2 -build = 47 +build = 48 From d1eb31404739355e0c2f967bc1cceb7c83b7cb12 Mon Sep 17 00:00:00 2001 From: Vladislav Osmanov Date: Fri, 3 Dec 2021 14:10:41 +0300 Subject: [PATCH 5/5] building `meshtastic-diy-v1` in `build-all.sh` --- bin/build-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build-all.sh b/bin/build-all.sh index b176df5f..9e0fcee7 100755 --- a/bin/build-all.sh +++ b/bin/build-all.sh @@ -5,7 +5,7 @@ set -e VERSION=`bin/buildinfo.py long` SHORT_VERSION=`bin/buildinfo.py short` -BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v2.0 heltec-v2.1 tbeam0.7" +BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1" #BOARDS_ESP32=tbeam # FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine