diff --git a/bin/build-all.sh b/bin/build-all.sh index b176df5fc..9e0fcee71 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 diff --git a/proto b/proto index 3ba36ec5d..5a556ee4a 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 3ba36ec5db702ef0875128271ba20bf8558508a2 +Subproject commit 5a556ee4a940d27761a41b43df5630d16ccaf728 diff --git a/src/mesh/RadioLibInterface.h b/src/mesh/RadioLibInterface.h index cd46968ce..54d9e6744 100644 --- a/src/mesh/RadioLibInterface.h +++ b/src/mesh/RadioLibInterface.h @@ -87,8 +87,8 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified * for a long time. */ const uint8_t syncWord = 0x2b; - - float currentLimit = 100; // FIXME + + 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 1b4a10048..953f89070 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 */ diff --git a/version.properties b/version.properties index cfd29c3c3..5eae0b8b4 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 1 minor = 2 -build = 47 +build = 48