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
Thomas Göttgens
a7138b7213
Merge pull request #1682 from meshtastic/create-pull-request/patch
...
Changes by create-pull-request action
2022-09-09 11:20:51 +02:00
caveman99
11590e33d3
[create-pull-request] automated change
2022-09-09 09:19:18 +00:00
lewishe
a3a92d2d13
Remove unnecessary edits
2022-09-08 10:54:33 +08:00
lewishe
2088036521
Differentiate t-beam-s3 GNSS from t-echo
2022-09-08 10:52:03 +08:00
lewishe
7d0e16d1b6
Add some explanations about PMU and prevent null pointer judgment
2022-09-08 10:45:12 +08:00
lewishe
35c77ef99c
Simplify HAS_PMU macro definition
2022-09-08 10:36:53 +08:00
lewishe
9244d03cf9
Rename axp192_found to pmu_found to avoid confusion
2022-09-08 10:32:12 +08:00
lewishe
a50a461675
Change mesh.pd.h t-beam-s3-core index to 12
2022-09-08 10:28:53 +08:00
Thomas Göttgens
f78911666e
Merge branch 'master' into master
2022-09-07 20:25:38 +02:00
github-actions[bot]
f1e6585726
[create-pull-request] automated change ( #1678 )
...
Co-authored-by: thebentern <thebentern@users.noreply.github.com>
2022-09-07 09:18:37 -05:00
lewishe
b8f862ac46
Merge remote-tracking branch 'origin/master'
2022-09-07 09:48:39 +08:00
Ben Meadors
94a572aee6
Merge branch 'master' into pref_defaults
2022-09-06 20:25:20 -05:00
Ben Meadors
e87ecc210a
Wifi enabled plumbed in ( #1677 )
...
* Wifi enabled
* Wifi requires reboot
* Increment DEVICESTATE_CUR_VER
2022-09-06 14:06:44 -05:00
lewis he
a9e7a33473
Merge branch 'master' into master
2022-09-06 18:53:22 +08:00
lewishe
5621719eef
Add tbeam esp32s3 version support, replace AXP202X_Library with XPowersLIb
2022-09-06 15:58:33 +08:00
Vladislav Osmanov
cb3010b58c
OLED Cyrillic Support for v1.3 ( #1640 )
...
* Extended ASCII codes and cyrillic support
(cherry picked from commit e977840805d3d14260f917b03a2db957d52ec657)
* Fixed `ё`, `Ё` letters
(cherry picked from commit 2f4a2ccb2f50cab879f4a1002215c176a435bae7)
* Fixed `customFontTableLookup` execution flow
(cherry picked from commit 377f909f36201ba6f7fe4511f631f54b8cb2ab3e)
* [OLED] Specifying the language by defining it in `platformio.ini`
(cherry picked from commit ddd8132b24095556e0b3cd17f1a3b3458bc15c4e)
* [OLED] localization guide
(cherry picked from commit a3267c886f36731c8f123636162a8c2a752a80c4)
* [OLED] Cyrillic support
Localization guide has been moved to https://github.com/meshtastic/Meshtastic/tree/master/docs/developers/Firmware
https://meshtastic.org/docs/developers/Firmware/oled-l10n-guide
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2022-09-04 15:00:10 -05:00
Ben Meadors
a27a07956f
Merge branch 'master' into pref_defaults
2022-09-03 22:10:37 -05:00
Ben Meadors
285ba9639e
Fix screen on secs ( #1673 )
...
* Fix screen on secs
* getIntervalOrDefaultMs
* Display correction
* Paren
2022-09-03 22:10:11 -05:00
Ben Meadors
f54f60c31c
Merge branch 'master' into pref_defaults
2022-09-03 14:06:27 -05:00
Ben Meadors
84e438f72f
Mqtt json_enabled ( #1672 )
...
* Payload variants
* Waypoints and fixes
* Remove json send to mesh. I think protobuf messages already do that
* whoops
* Added json_enabled mqtt config
2022-09-03 14:06:10 -05:00
lewis
f767fd5075
Modified to be compatible with the new version of sdk, compatible with esp32s3
2022-09-03 23:38:40 +08:00
lewis he
8fb8212434
i2cScan probe adds another ssd1306 subclass new to output logs correctly ( #1671 )
2022-09-03 07:26:49 -05:00
lewis
8d5ffb7262
i2cScan probe adds another ssd1306 subclass new to output logs correctly
2022-09-03 16:44:32 +08:00
Neil Hao
70e1a208d5
'snow_screen_hotfix' ( #1670 )
2022-09-02 19:43:33 -05:00
Ben Meadors
9d3cac7cdb
MQTT Json Payload variants ( #1667 )
...
* Payload variants
* Waypoints and fixes
* Remove json send to mesh. I think protobuf messages already do that
* whoops
2022-09-01 17:54:24 -05:00
Ben Meadors
84f1edab18
Merge branch 'master' into pref_defaults
2022-08-30 13:28:53 -05:00
Thomas Göttgens
221843e176
Merge pull request #1663 from lewisxhe/master
2022-08-30 20:27:41 +02:00
Ben Meadors
0063ae6512
Merge branch 'master' into pref_defaults
2022-08-30 08:24:34 -05:00
lewishe
1922034c44
Add t-beam sx1268 support
2022-08-30 11:59:57 +08:00
Ben Meadors
7f586f7099
Better logging and cleanup ( #1662 )
2022-08-29 07:31:02 -05:00
lewis he
0efa1b25c5
Add t-echo sx1268 support ( #1657 )
2022-08-29 07:26:17 -05:00
Sacha Weatherstone
1b25ea714d
Set `config.lora.hop_limit` to `HOP_RELIABLE`
2022-08-27 19:03:26 +10:00
Tom
fd27a40edb
Reboot after factory reset ( #1653 )
...
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
2022-08-25 12:07:20 -05:00
Ben Meadors
1013aff9b6
Screen changes and fixes ( #1651 )
...
* Fixed bluetooth reinit bug
* Remove screen transition ms
* Whoops
* hasScreen is smarter now
* Oops
2022-08-25 11:25:05 -05:00
Ben Meadors
d7e5eb4d22
Upgrade unishox-2 to 1.0.3 ( #1650 )
2022-08-25 07:12:38 -05:00
Ben Meadors
9a03b2e49d
Same as NodeDB position_broadcast_secs bug but different ( #1645 )
...
* intervalMs
2022-08-24 17:29:09 -05:00