Thomas Göttgens
d0a8a3018d
Merge branch 'LocalConfig' of github.com:meshtastic/Meshtastic-device
2022-06-15 20:03:53 +02:00
Thomas Göttgens
7566ee1fea
C++ is a weird language...
2022-06-15 20:03:08 +02:00
Thomas Göttgens
43d48d4fb9
Merge branch 'master' into LocalConfig
2022-06-15 19:43:47 +02:00
Thomas Göttgens
2a6633a666
Merge pull request #1518 from meshtastic/create-pull-request/patch
...
TEST: Push out LocalConfig Object on app Handshake
2022-06-15 19:43:05 +02:00
Thomas Göttgens
0146761850
TEST - Push of LocalConfig
2022-06-15 19:42:16 +02:00
caveman99
0943e5f500
[create-pull-request] automated change
2022-06-15 17:40:08 +00:00
Ben Meadors
a1dc350231
Changed default baud to 115200 ( #1517 )
...
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
2022-06-15 11:44:37 -05:00
Thomas Göttgens
d5a258cebd
Merge pull request #1516 from meshtastic/LocalConfig
...
add file version to local savefiles
2022-06-15 18:05:52 +02:00
Thomas Göttgens
125f76d984
Don't use rmdir_r but roll our own version.
2022-06-15 17:52:37 +02:00
Thomas Göttgens
b127479961
- Refactored factory reset a bit to not installDefaultDeviceState twice on ESP32
...
- clear BLE bonds on settings version increase
2022-06-15 17:09:42 +02:00
Thomas Göttgens
d18aa2e7cb
add file version to local savefiles
2022-06-15 16:52:04 +02:00
Thomas Göttgens
d301144efe
Merge pull request #1515 from meshtastic/create-pull-request/patch
...
Changes by create-pull-request action
2022-06-15 16:45:11 +02:00
caveman99
058b5ceddd
[create-pull-request] automated change
2022-06-15 14:44:33 +00:00
Thomas Göttgens
e85baf00c4
Merge pull request #1511 from meshtastic/radiolib-fix
...
Set TX Power to some meaningful value
2022-06-13 23:24:37 +02:00
Thomas Göttgens
4a6cad6e46
Set TX Power to some meaningful value
2022-06-13 23:00:50 +02:00
Thomas Göttgens
bc05f98685
Merge pull request #1499 from meshtastic/radiolib-fix
...
new radiolib version (use upstream)
2022-06-13 21:33:51 +02:00
Thomas Göttgens
6e671d808a
Our mod was accepted by RadioLib
2022-06-13 21:25:27 +02:00
Thomas Göttgens
1df3dd5f78
Merge branch 'master' of github.com:meshtastic/Meshtastic-device
2022-06-13 21:21:46 +02:00
Jm Casler
c9822dee93
Update to 1.13.17
2022-06-13 09:38:33 -07:00
Thomas Göttgens
e1783df49f
Merge branch 'radiolib-fix' of github.com:meshtastic/Meshtastic-device
...
# Conflicts:
# src/mesh/RadioLibInterface.h
2022-06-13 16:13:13 +02:00
Thomas Göttgens
6b8afdadc2
New variant of Radiolib patch
2022-06-13 16:10:16 +02:00
Thomas Göttgens
f918548e44
Merge branch 'master' of github.com:meshtastic/Meshtastic-device
2022-06-13 16:08:50 +02:00
GUVWAF
a1b07ed6aa
Introduce contention window (CW) ( #1500 )
...
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2022-06-13 08:21:18 -05:00
Thomas Göttgens
b059fb9e8e
Merge branch 'master' of github.com:meshtastic/Meshtastic-device
2022-06-13 12:23:51 +02:00
Ben Meadors
553b35d0ad
Consolidate power saving prefs ( #1507 )
...
* Fixed conversion linter warning
* Power saving consolidation
* Whoops
2022-06-12 19:56:32 -05:00
Thomas Göttgens
04478081c6
Merge pull request #1508 from meshtastic/crpytfix
...
Remove nRF Crypt Debug
2022-06-12 23:52:16 +02:00
Thomas Göttgens
7bd07db2a8
Remove nRF Crypt Debug
2022-06-12 23:35:59 +02:00
Thomas Göttgens
5c44c4f772
Remove Debug Code for Encryption
2022-06-12 23:29:27 +02:00
Thomas Göttgens
7ff940409e
Merge branch 'master' of github.com:meshtastic/Meshtastic-device
2022-06-12 23:28:04 +02:00
Ben Meadors
cb5c32490c
Merge branch 'master' into radiolib-fix
2022-06-12 15:27:58 -05:00
Thomas Göttgens
e0b63c6692
Merge pull request #1506 from meshtastic/1504-proposal-default-short-name-to-mac-last-4
...
implement #1504
2022-06-12 22:05:04 +02:00
Thomas Göttgens
dc8d1d9a84
implement #1504
2022-06-12 21:52:46 +02:00
Thomas Göttgens
710e2694ef
Merge branch 'master' into radiolib-fix
2022-06-12 20:32:00 +02:00
Thomas Göttgens
7594140afc
actual change to our interface
2022-06-12 20:31:23 +02:00
Thomas Göttgens
e793d933c6
Merge branch 'master' of github.com:meshtastic/Meshtastic-device
2022-06-12 20:28:39 +02:00
Thomas Göttgens
61427528b6
Merge pull request #1505 from meshtastic/caveman99-patch-1
...
fix C++ warnings
2022-06-12 18:39:46 +02:00
Thomas Göttgens
47ad27f9f6
fix C++ warnings
...
The cast throws errors about ambiguous conversions. There's a prototype of requestFrom(uint8_t address, uint8_t length) so just use that one.
2022-06-12 17:59:16 +02:00
Thomas Göttgens
77f096e56c
Merge branch 'master' of github.com:meshtastic/Meshtastic-device
2022-06-12 17:37:43 +02:00
Ben Meadors
5106433572
Removed phone_timeout_secs pref references ( #1503 )
2022-06-12 09:44:23 -05:00
Ben Meadors
4458b470aa
Don't enable environmental telemetry by default ( #1502 )
...
* INA219 + INA260 support in telemetry
* Protobuf update
* Fixes + debug statement
* Fix size
* Fix conversion from mv
* Added getRegisterValue for i2cscan
* Accidentally left this in
* Removed line
2022-06-12 07:14:33 -05:00
Ben Meadors
90957e6994
INA260 + INA219 sensor support ( #1501 )
...
* INA219 + INA260 support in telemetry
* Protobuf update
* Fixes + debug statement
* Fix size
* Fix conversion from mv
* Added getRegisterValue for i2cscan
2022-06-11 16:44:56 -05:00
Thomas Göttgens
b73fd32f71
Merge branch 'master' into radiolib-fix
2022-06-10 20:39:50 +02:00
Thomas Göttgens
2a3272b7d0
patch radiolib on-the-fly while building.
2022-06-10 20:38:56 +02:00
Ben Meadors
3fd756900a
Refactoring some of the i2c boilerplate ( #1498 )
...
* Refactoring some of the i2c boilerplate
* Default value
* Debug statement
2022-06-10 12:04:04 -05:00
Thomas Göttgens
beb8bc9e72
Merge pull request #1496 from benner/fix/NodeDB_without_FSCom
...
Compile when FSCom is not defined (NodeDB.cpp)
2022-06-07 22:22:20 +02:00
Thomas Göttgens
1ad5cdc93c
Merge branch 'master' into fix/NodeDB_without_FSCom
2022-06-07 21:57:26 +02:00
Nerijus Bendžiūnas
e8e72d2e08
Compile when FSCom is not defined (NodeDB.cpp)
2022-06-07 20:55:05 +03:00
Thomas Göttgens
1d0badd468
Merge pull request #1495 from benner/fix/typo
...
Correctly print script name in platformio-custom.py
2022-06-07 11:39:47 +02:00
Nerijus Bendžiūnas
9e87be4f22
Correctly print script name in platformio-custom.py
2022-06-07 12:26:01 +03:00
Jm Casler
97899aed26
1.3.16
2022-06-06 22:10:18 -07:00