kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity
4,236 Commits 1 Branch 0 Tags
d726ed6e7cdafe2bb7a94aba5533bf3fc991d2a9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Göttgens d726ed6e7c Merge pull request #1425 from holdenk/sketch 
Configure bluetooth name based on owner's short name
 2022-06-16 21:26:39 +02:00
Thomas Göttgens 349f6bf502 Merge branch 'master' into sketch 2022-06-16 21:13:19 +02:00
Thomas Göttgens 192c10d6d7 Merge pull request #1521 from meshtastic/1510-enhancement-change-default-device-name-from-unknown-xxxx-to-meshtastic-xxxx-to-match-ble-name 
Fix #1510
 2022-06-16 21:13:09 +02:00
Thomas Göttgens be8fb73204 Merge branch 'master' into sketch 2022-06-16 20:59:11 +02:00
Thomas Göttgens bc9a4367d1 Fix #1510 2022-06-16 20:58:15 +02:00
Thomas Göttgens 3d3511ceeb Change to a different logic 2022-06-16 20:54:50 +02:00
Thomas Göttgens 1996a2a193 Merge pull request #1520 from meshtastic/radiolib-fix 
Tryfix Portduino Radiolib
 2022-06-16 12:30:23 +02:00
Thomas Göttgens b40abbf3ad Tryfix Portduino Radiolib 2022-06-16 12:22:01 +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 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
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
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
Thomas Göttgens b059fb9e8e Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-06-13 12:23:51 +02: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 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 9d8f9613d4 Merge branch 'master' into sketch 2022-06-12 18:48:08 +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
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
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
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
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
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
Thomas Göttgens 0b666b827d Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-06-03 15:38:50 +02:00
Thomas Göttgens 235cacf9b9 Merge pull request #1485 from markbirss/master 
Update EInkDisplay2.cpp
 2022-06-03 15:09:56 +02:00
Thomas Göttgens 77a2054254 Merge pull request #1480 from markbirss/master 
Add M5Stack CoreInk 1.54 inch e-Ink - HopeRF95 Support
 2022-06-01 20:56:05 +02:00
Thomas Göttgens e57dbdd26c Merge branch 'master' into master 2022-06-01 20:28:12 +02:00
Thomas Göttgens e8afd4fb4b If we get an unreadable buffer, don't try to process it. 2022-06-01 17:09:57 +02:00
Thomas Göttgens 32245a1a8d Merge pull request #1477 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2022-05-30 21:40:52 +02:00
Thomas Göttgens f6982ca726 fix building with new peotobuf structure. 2022-05-30 21:12:27 +02:00
Thomas Göttgens 0d574e35c6 Merge pull request #1473 from meshtastic/LocalConfig 
fixed typo in AdminModule
 2022-05-29 16:40:14 +02:00
Thomas Göttgens b88e75cf2a Fixed Typo in get Config 2022-05-29 16:31:30 +02:00
Thomas Göttgens 03affc9e73 Merge branch 'master' into create-pull-request/patch 2022-05-24 10:54:38 +02:00
Thomas Göttgens 25bf97316d Merge pull request #1468 from meshtastic/LocalConfig 
make sure all segments are enabled and saved
 2022-05-24 10:26:26 +02:00
Thomas Göttgens 800a4200ef make sure all segments are enabled and saved 2022-05-22 13:54:24 +02:00
Thomas Göttgens 9c50a76ea2 Merge pull request #1464 from meshtastic/LocalConfig 
Segemented config works for me (TM)
 2022-05-22 13:41:47 +02:00
Thomas Göttgens 4a41694ec5 Merge branch 'LocalConfig' of github.com:meshtastic/Meshtastic-device 2022-05-22 13:28:32 +02:00
Thomas Göttgens 6bb3861e95 Moduleconfig also changed to localConfig Model. 2022-05-22 13:27:56 +02:00
Thomas Göttgens e8262540d4 Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-05-22 13:06:08 +02:00
Thomas Göttgens 2b6f632a50 Merge branch 'master' into master 2022-05-22 13:03:13 +02:00
Thomas Göttgens bddab68110 Merge pull request #1467 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2022-05-22 13:01:45 +02:00
Thomas Göttgens 85f5c7a40b Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-05-22 12:17:09 +02:00
Thomas Göttgens 5e8d49d24b missed one 2022-05-21 22:51:34 +02:00
Thomas Göttgens 53e9f4df46 Segemented config works for me (TM) 
Small GPS Fix that cropped up while testing included.
 2022-05-21 22:38:33 +02:00
Thomas Göttgens db35b92b6f Merge pull request #1461 from meshtastic/UBXFIX 
remove duplicate GPS setting
 2022-05-21 21:05:14 +02:00
Thomas Göttgens 5d22efd8a8 remove duplicate GPS setting 2022-05-21 20:52:43 +02:00
Thomas Göttgens 49ccb77e43 Merge pull request #1457 from meshtastic/UBXFIX 
Streamline GPS Init
 2022-05-18 18:13:40 +01:00
Thomas Göttgens 3d0d45a695 More UBX stuff from 1.2 2022-05-18 18:29:26 +02:00
Thomas Göttgens 2e39900f78 Merge branch 'UBXFIX' of github.com:meshtastic/Meshtastic-device 2022-05-18 18:18:32 +02:00
Thomas Göttgens 5e82423331 More UBX fixes 2022-05-18 18:16:23 +02:00
Thomas Göttgens dd8111e737 Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-05-18 18:13:51 +02:00
Thomas Göttgens 9b02841506 Merge branch 'master' into UBXFIX 2022-05-18 15:19:27 +01:00
Thomas Göttgens 3c5a096873 Streamline GPS Init 2022-05-18 16:16:59 +02:00
Thomas Göttgens 93521f7b39 Merge pull request #1454 from meshtastic/t-echo 
fix GPS and Buttons on T-Echo and log UBX (1.3)
 2022-05-17 20:10:42 +01:00
Thomas Göttgens bdcdc1485c Merge branch 't-echo' of github.com:meshtastic/Meshtastic-device 2022-05-17 20:55:29 +02:00
Thomas Göttgens fdc10acfdd Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-05-17 20:54:17 +02:00
Thomas Göttgens ac93e3196e Don't try to be too smart 2022-05-17 20:53:57 +02:00
Thomas Göttgens e5439c21ab Merge branch 'master' into t-echo 2022-05-17 18:55:35 +01:00
Thomas Göttgens 7f9bb5748e log UBX Init 2022-05-17 19:54:29 +02:00
Thomas Göttgens 894b091553 Fix ubox gps too or at least log errors 2022-05-17 19:48:48 +02:00
Thomas Göttgens 7576270423 switch GPS back to 9600 baud, seems to work better now we only use the 2 sentences 2022-05-17 19:09:12 +02:00
Thomas Göttgens 6b8f83cd71 don't wake t-echo through the touch button 2022-05-17 13:01:15 +02:00
Thomas Göttgens fdc3a6e432 Merge pull request #1453 from meshtastic/PIO6-fix 
Make PIO6 happy again
 2022-05-17 10:42:46 +01:00
Thomas Göttgens 49d8c581bd missed one here as well... 2022-05-17 11:26:03 +02:00
Thomas Göttgens c15da3c104 Make PIO6 happy again 2022-05-17 11:14:21 +02:00
Thomas Göttgens e91dedaab5 Merge pull request #1447 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action
 2022-05-10 11:03:24 +01:00
Thomas Göttgens 54bf02352f Merge branch 'master' into create-pull-request/patch 2022-05-10 10:46:36 +01:00
Thomas Göttgens 3f415e3e8e Merge pull request #1448 from meshtastic/M5STACK 
Make M5Stack Canon Hardware
 2022-05-10 10:45:47 +01:00
Thomas Göttgens 7133e6e89b Use canon HW Identifier for M5 2022-05-10 11:10:32 +02:00