rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-27 12:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into StoreAndForward

Browse Source
This commit is contained in:
Jm Casler
2021-12-03 19:00:25 -08:00
committed by GitHub
parent 47e7b00000 9adbe28319
commit 23e16bfb1a
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build-all.sh
View File

@@ -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

Submodule proto updated: 3ba36ec5db...5a556ee4a9

4
src/mesh/RadioLibInterface.h
View File

@@ -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

2
src/mesh/SX126xInterface.h
View File

@@ -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
*/ */

2
version.properties
View File

@@ -1,4 +1,4 @@
[VERSION] [VERSION]
major = 1 major = 1
minor = 2 minor = 2
build = 47 build = 48