mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
4 199 Commity
24 Gałęzie
269 Tagi
4,2 GiB
Wykres commitów

4199 Commity (f918548e443553ca6c4478f86001976b9ba492f3)

Autor SHA1 Wiadomość Data
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
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 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 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
Thomas Göttgens 0ee4ba4975
Merge pull request #1494 from meshtastic/fix-1493 
fixes power LED on T-Echo and T-Beam
 2022-06-06 19:23:23 +02:00
Thomas Göttgens bbcccde787 Merge branch 'fix-1493' of github.com:meshtastic/Meshtastic-device 2022-06-06 19:15:14 +02:00
Thomas Göttgens 42c285bc31 Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-06-06 19:14:43 +02:00
Thomas Göttgens c831242f25 fix nrf build 2022-06-06 19:14:30 +02:00
Thomas Göttgens 3c6f36c8f7
Merge branch 'master' into fix-1493 2022-06-06 18:57:51 +02:00
Thomas Göttgens dfde6cc9c1
Merge pull request #1490 from meshtastic/CryptFix 
Crypt fix. Please leave branch open
 2022-06-06 18:57:27 +02:00
Thomas Göttgens 7816800012
Merge branch 'master' into CryptFix 2022-06-06 18:49:38 +02:00
Thomas Göttgens ebf132ad21 Bug-1493 2022-06-06 18:48:22 +02:00
Thomas Göttgens 67cf3018b5 Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-06-06 18:27:28 +02:00
Ben Meadors eafbef0c2f
Scan for i2c sensors in environmental telemetry if enabled (#1492) 
* Scan for i2c sensors in environmental telemetry if enabled

* Update TelemetrySensor.h

* Added surpression.

* Remove suppression and fix real bug

* Interrogate BME sensor id registers
 2022-06-05 09:50:06 -05:00
Ben Meadors 4ab831c103
Fix nagging bool linter warnings (#1491) 2022-06-04 07:28:58 -05:00
Thomas Göttgens 3df5ec0b11
Merge pull request #1479 from meshtastic/ProtoFix 
If we get an unreadable buffer, don't try to process it.
 2022-06-04 11:07:00 +02:00
Thomas Göttgens c5c2765fb4
Merge branch 'master' into ProtoFix 2022-06-04 10:49:36 +02:00
Thomas Göttgens df9e9bc223 Bugfix for nRF Crypto 90% done, includes heavy debug code, do not merge for now. 2022-06-04 10:37:24 +02:00
Thomas Göttgens 1ff0032c20 Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-06-04 10:35:42 +02:00
Jm Casler 18024f1d25
Merge pull request #1489 from mc-hamster/master 
Disabled the unset welcome screen
 2022-06-04 01:19:44 -07:00
Jm Casler 313c50d6cf
Merge branch 'master' into master 2022-06-03 21:55:27 -07:00
Jm Casler 80e08f6de9 Disabled the unset welcome screen 2022-06-03 21:51:47 -07:00
Jm Casler 5a256323e2
Merge pull request #1488 from mc-hamster/master 
Change default screen on to 10 minutes
 2022-06-03 20:57:23 -07:00
Jm Casler 45495c51e6
Merge branch 'meshtastic:master' into master 2022-06-03 20:38:28 -07:00
Jm Casler 40ded630d0 Change default screen on to 10 minutes 2022-06-03 20:38:13 -07:00
Jm Casler 432d06741e
Update version.properties 2022-06-03 18:49:18 -07:00
Jm Casler 03b7f2f837
Merge pull request #1487 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2022-06-03 18:47:52 -07:00
mc-hamster 2e1b895791 [create-pull-request] automated change 2022-06-04 01:47:29 +00:00
Jm Casler 9821a0535b
Bump to 1.3.14 2022-06-03 14:32:32 -07:00