sforkowany z mirror/meshtastic-firmware
Merge branch 'master' into StoreAndForward
commit
23e16bfb1a
|
@ -5,7 +5,7 @@ set -e
|
||||||
VERSION=`bin/buildinfo.py long`
|
VERSION=`bin/buildinfo.py long`
|
||||||
SHORT_VERSION=`bin/buildinfo.py short`
|
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
|
#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
|
# FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine
|
||||||
|
|
2
proto
2
proto
|
@ -1 +1 @@
|
||||||
Subproject commit 3ba36ec5db702ef0875128271ba20bf8558508a2
|
Subproject commit 5a556ee4a940d27761a41b43df5630d16ccaf728
|
|
@ -87,8 +87,8 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
|
||||||
* for a long time.
|
* for a long time.
|
||||||
*/
|
*/
|
||||||
const uint8_t syncWord = 0x2b;
|
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
|
LockingModule module; // The HW interface to the radio
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,8 @@ class SX126xInterface : public RadioLibInterface
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
float currentLimit = 140; // Higher OCP limit for SX126x PA
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Specific module instance
|
* Specific module instance
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[VERSION]
|
[VERSION]
|
||||||
major = 1
|
major = 1
|
||||||
minor = 2
|
minor = 2
|
||||||
build = 47
|
build = 48
|
||||||
|
|
Ładowanie…
Reference in New Issue