mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
3 832 Commity
15 Gałęzie
254 Tagi
209 MiB
Wykres commitów

3832 Commity (e905f15a0f1a95b363d8a286e710f7d40e2b8674)

Autor SHA1 Wiadomość Data
Jm Casler e905f15a0f Added new roles 2022-03-29 22:02:21 -07:00
Jm Casler 3d42da7968 updating proto submodule to latest 2022-03-29 21:44:49 -07:00
Jm Casler e21fdb5d82
Merge pull request #1336 from mc-hamster/location 
bump node_db max_count to 80
 2022-03-29 20:20:22 -07:00
Jm Casler c1ec842454 bump node_db max_count to 80 2022-03-29 20:06:32 -07:00
Jm Casler 9480f591e3 updating proto submodule to latest 2022-03-29 20:04:40 -07:00
Thomas Göttgens 3b8455ff6e
Merge pull request #1335 from meshtastic/patch-1176 
Fix #1126
 2022-03-29 14:01:27 +02:00
Thomas Göttgens e10e781ff9
Removed unused functions for touch button 
that causes logspam through TX
 2022-03-29 13:52:07 +02:00
Sacha Weatherstone 2ed8ea10c0 Remove eink0.1 and Air530 files 2022-03-29 22:28:34 +11:00
Ben Meadors eafd205169
Update telemetry for local node (#1332) 2022-03-28 12:13:22 -05:00
Thomas Göttgens 5366eba535
Merge pull request #1333 from meshtastic/inputbroker-v2 
Add CardKB, FACES and RAK14004 support to inputbroker/cannedmessages
 2022-03-28 17:57:16 +02:00
Thomas Göttgens 049481f952 Merge branch 'inputbroker-v2' of github.com:meshtastic/Meshtastic-device into inputbroker-v2 2022-03-28 17:40:27 +02:00
Thomas Göttgens 50edeb5281 remove leftover stumps 2022-03-28 17:40:17 +02:00
Thomas Göttgens cd86d33f6f
Merge branch 'master' into inputbroker-v2 2022-03-28 17:00:05 +02:00
Thomas Göttgens f119e294af Add CardKB, FACES and RAK14004 support to inputbroker/cannedmessages 2022-03-28 16:55:58 +02:00
Ben Meadors ba2fa84ebd
Reworked metrics structure and split telemetry into device or environ… (#1331) 
* Reworked metrics structure and split telemetry into device or environment

* Comment cleanup
 2022-03-27 09:55:35 -05:00
Jm Casler 7b8096f5b2
Merge pull request #1329 from mc-hamster/location 
Regen protos for serial baud & mode. Update serial_module to support …
 2022-03-26 11:27:11 -07:00
Thomas Göttgens 450ab95ab5
Merge branch 'master' into location 2022-03-26 18:14:41 +01:00
Thomas Göttgens 93ab20a8af
Merge pull request #1330 from meshtastic/inputbroker-v2 
RAK Rotary and simple up/down/press button support for Canned Messages
 2022-03-26 18:14:27 +01:00
Thomas Göttgens a48cc202a7
Merge branch 'master' into inputbroker-v2 2022-03-26 17:46:30 +01:00
Thomas Göttgens 0058382e85 RAK Rotary and simple up/down/press button support for Canned Messages 2022-03-26 17:45:42 +01:00
Jm Casler 8bca0d94cd Regen protos for serial baud & mode. Update serial_module to support new enums. 
Regen protos for serial baud & mode. Update serial_module to support new enums.
 2022-03-26 09:35:06 -07:00
Jm Casler 266cdfed57 updating proto submodule to latest 2022-03-26 09:32:13 -07:00
Jm Casler e9fcc2ac42
Merge pull request #1328 from mc-hamster/location 
Regen protos with support for messaged waypoints
 2022-03-26 09:29:16 -07:00
Jm Casler 48fa2b6b9b Regen protos with support for messaged waypoints 2022-03-26 07:48:35 -07:00
Thomas Göttgens 9bece843c3
Merge pull request #1327 from meshtastic/serialconsole 
SerialDebug NRF
 2022-03-26 11:29:46 +01:00
Thomas Göttgens c8254f9ec8 SerialDebug NRF 
On slow systems, it takes up to 5 seconds to init serial
 2022-03-26 11:15:57 +01:00
Thomas Göttgens 62337aa4b6
Merge pull request #1326 from meshtastic/modem_config 
Resync modem_config display with 1.3 protobufs
 2022-03-26 11:15:31 +01:00
Thomas Göttgens 42ee4e8416
Resync modem_config display with 1.3 protobufs 
current as of 20220326
 2022-03-26 10:59:36 +01:00
Thomas Göttgens 596a889a1e
Merge pull request #1322 from meshtastic/inputbroker-v2 
Fixes forward ported from 1.2 and renaming of pin names for more generic use.
 2022-03-26 10:22:34 +01:00
Thomas Göttgens 74d987b24c
Merge branch 'master' into inputbroker-v2 2022-03-26 08:55:40 +01:00
Thomas Göttgens cd79542e52 Merge branch 'inputbroker-v2' of github.com:meshtastic/Meshtastic-device into inputbroker-v2 2022-03-26 08:54:50 +01:00
Thomas Göttgens aec626f5e0 Update proto to HEAD 2022-03-26 08:54:37 +01:00
Jm Casler 31d7724ef1
Merge pull request #1325 from mc-hamster/location 
Update protos regen scripts
 2022-03-25 23:08:00 -07:00
Jm Casler 34dc5b92a5 Update protos regen scripts 2022-03-25 23:06:54 -07:00
Jm Casler 15db9f056f updating proto submodule to latest 2022-03-25 22:30:41 -07:00
Jm Casler bea1611e5f updating proto submodule to latest 2022-03-25 22:22:20 -07:00
Ben Meadors 92482199ed
Merge branch 'master' into inputbroker-v2 2022-03-26 01:00:07 +00:00
Thomas Göttgens 7aeca185f1
Merge pull request #1324 from meshtastic/nRF-serialinit 
Wait up to 2 seconds for port being connected.
 2022-03-25 23:16:19 +01:00
Thomas Göttgens 54d802f15d
Wait up to 2 seconds for port being connected. 
This will send serial debug log from the beginning and not somewhere in between.
 2022-03-25 23:06:31 +01:00
Ben Meadors e0142a9363
Merge branch 'master' into inputbroker-v2 2022-03-25 12:25:27 +00:00
amerinoj 501067cd36
Added the last mac address bytes in bluetooth device and default notification pinout to tlora_v2_1_16 (#1320) 
* Added the last mac address bytes in bluetooth device name ESP32Bluetooth.cpp
Add default notification pinout to tlora_v2_1_16/variant.h

* updated ADC_MULTIPLIER  value for more accuracy
 2022-03-25 07:24:56 -05:00
Thomas Göttgens 98792f0c05 fix option name 2022-03-25 12:52:11 +01:00
Thomas Göttgens e320850707 Resolve Conflicts between PIN_BUtton and the Rotary Select and keep screen powered during plugin operation. Forward Port from 1.2 firmware fix. 2022-03-25 12:27:14 +01:00
Thomas Göttgens 8bfe277269
Merge branch 'master' into inputbroker-v2 2022-03-25 11:45:13 +01:00
Thomas Göttgens 1022b8216b
Merge pull request #1321 from meshtastic/create-pull-request/patch 
Changes by create-pull-request action - this will break CI builds till the next merge request
 2022-03-25 11:44:50 +01:00
caveman99 3e8ca1f381 [create-pull-request] automated change 2022-03-25 10:40:54 +00:00
Thomas Göttgens ad2cec2579 Update Protobuf Submodule to Master 2022-03-25 11:38:01 +01:00
Ben Meadors 362795a7c8
Meshtastic-diy battery and adc multiplier 2022-03-24 19:20:15 -05:00
Thomas Göttgens fe5b5ebf15 Adjust rotary defines to new universal names 2022-03-24 22:17:06 +01:00
Thomas Göttgens 188306d429
Merge pull request #1318 from meshtastic/gps-disabled 
free serial pins if gps_disabled is set
 2022-03-24 18:52:03 +01:00