Commit Graph

4554 Commits

Author SHA1 Message Date
Thomas Göttgens
7c202b6069
Merge branch 'master' into ESPIDF-Rollup 2022-09-13 19:18:20 +02:00
Thomas Göttgens
e93b98ff98
Merge pull request #1694 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2022-09-13 14:32:29 +02:00
caveman99
b1ac2cf821 [create-pull-request] automated change 2022-09-13 12:31:51 +00:00
Ben Meadors
bfd1fecc2a
Merge branch 'master' into ESPIDF-Rollup 2022-09-13 06:36:56 -05:00
Ben Meadors
c622a9b4be
Update python temp hack 2022-09-12 20:21:19 -05:00
Ben Meadors
ade66cd8f4
Merge branch 'master' into ESPIDF-Rollup 2022-09-12 18:07:42 -05:00
Ben Meadors
397030b5a6
GPS intervals (#1693)
* GPS intervals

* Backwards logic

* Oops
2022-09-12 18:07:21 -05:00
Ben Meadors
adc50f40b1
Merge branch 'master' into ESPIDF-Rollup 2022-09-12 14:56:09 -05:00
Ben Meadors
32d92d9b75
Qualify tbeam filesystem bins 2022-09-12 14:30:54 -05:00
Ben Meadors
18f37981bb Spelling and fixing defaults 2022-09-12 07:55:17 -05:00
Ben Meadors
a8711bc54a Add tbeam-s3-core 2022-09-12 07:39:41 -05:00
Thomas Göttgens
eac2613743 make platformio.ini even more modular 2022-09-12 14:02:21 +02:00
Thomas Göttgens
4a0c18c4cd Merge branch 'ESPIDF-Rollup' of github.com:meshtastic/Meshtastic-device 2022-09-12 13:40:52 +02:00
Thomas Göttgens
e376a3a28e just use the general toolkit 2022-09-12 13:40:20 +02:00
Thomas Göttgens
a6bdff53c9 Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-09-12 13:25:54 +02:00
Thomas Göttgens
b5c5483ced
Merge branch 'master' into ESPIDF-Rollup 2022-09-12 12:50:38 +02:00
Thomas Göttgens
601422e92b
Merge pull request #1692 from meshtastic/caveman99-1542
implement #1542
2022-09-12 11:05:07 +02:00
Thomas Göttgens
dbbe5e59ae Merge branch 'caveman99-1542' of github.com:meshtastic/Meshtastic-device 2022-09-12 10:54:09 +02:00
Thomas Göttgens
b96dd6d36d T-Echo does not have Serial2 2022-09-12 10:53:11 +02:00
Thomas Göttgens
e6b6e175b8
Merge branch 'master' into caveman99-1542 2022-09-12 10:10:08 +02:00
Thomas Göttgens
2ff549d458 Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-09-12 10:09:24 +02:00
Thomas Göttgens
a1230500fd
Merge pull request #1691 from meshtastic/proto-fix
Reinstate GPS Flag
2022-09-12 10:09:07 +02:00
Thomas Göttgens
17db87e042 implement #1542 2022-09-12 10:08:32 +02:00
Thomas Göttgens
42d2986cb8 Reinstate GPS Flag 2022-09-12 09:37:21 +02:00
Thomas Göttgens
cc054a13e2 Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-09-12 09:25:04 +02:00
Sacha Weatherstone
60b4dbfdcd
More default inits. (#1689)
* More default inits.

* update protobufs

* Try checking has_device first

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2022-09-11 08:36:47 -05:00
Sacha Weatherstone
c446a0f222
Merge branch 'master' into ESPIDF-Rollup 2022-09-11 10:45:27 +10:00
Ben Meadors
f98e96cf1b Slots for upcoming telemetry sensor support 2022-09-10 17:28:01 -05:00
Thomas Göttgens
3102777a71
Update platformio.ini 2022-09-10 20:53:23 +02:00
Thomas Göttgens
ed95f382cf
Merge branch 'master' into ESPIDF-Rollup 2022-09-10 20:39:54 +02:00
Ben Meadors
7f18c0fb77
Init default intervals (#1688)
* Init default intervals

* Spacing

* move isrouter check

* Line break

* Oops
2022-09-10 12:35:36 -05:00
Sacha Weatherstone
52e4f93760
Merge branch 'master' into ESPIDF-Rollup 2022-09-10 22:13:56 +10:00
Sacha Weatherstone
0167304300
Merge pull request #1656 from meshtastic/pref_defaults
Set `config.lora.hop_limit` to `HOP_RELIABLE`
2022-09-10 18:24:27 +10:00
Sacha Weatherstone
7aaca3d486
Merge branch 'master' into pref_defaults 2022-09-10 18:11:16 +10:00
Thomas Göttgens
bf3306fbc8 use the new ESP Framework for our older boards too 2022-09-09 22:31:30 +02:00
Thomas Göttgens
e375a8460b
Merge pull request #1676 from lewisxhe/master
Add tbeam esp32s3 version support, replace AXP202X_Library with XPowersLib.
2022-09-09 22:01:20 +02:00
Thomas Göttgens
ff88900982
wrong name for constant in merge 2022-09-09 21:49:54 +02:00
Thomas Göttgens
7f293bfda3
Merge branch 'master' into master 2022-09-09 21:39:29 +02:00
Ben Meadors
99de0a76a5
Temporary hack (undo after 1.3.41 release) 2022-09-09 13:54:03 -05:00
Ben Meadors
47ffb9c70d
Make a change to trigger CI (#1686) 2022-09-09 13:41:01 -05:00
Thomas Göttgens
1231f926ea
Merge pull request #1684 from meshtastic/proto-shakeup
Adapt to new protobufs - TODO: factory_reset rewire
2022-09-09 13:26:59 +02:00
Thomas Göttgens
e05e888fca Update admin config field 2022-09-09 13:14:15 +02:00
Thomas Göttgens
03580f5be8 Merge branch 'master' of github.com:meshtastic/Meshtastic-device 2022-09-09 13:11:23 +02:00
Thomas Göttgens
90dabfea30
Merge pull request #1685 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2022-09-09 13:11:01 +02:00
caveman99
c8d7b1aba0 [create-pull-request] automated change 2022-09-09 11:10:31 +00:00
Thomas Göttgens
6065ef3a54 catch renamed targets 2022-09-09 13:04:37 +02:00
Thomas Göttgens
86c7eefc91 add missing files 2022-09-09 12:55:31 +02:00
Thomas Göttgens
f7b12f0695 Adapt to new protobufs - TODO: factory_reset rewire 2022-09-09 12:51:41 +02:00
Thomas Göttgens
0c46ad91ef
Merge pull request #1683 from meshtastic/create-pull-request/patch
Changes by create-pull-request action
2022-09-09 12:04:43 +02:00
caveman99
96cab75ccd [create-pull-request] automated change 2022-09-09 10:04:11 +00:00