Commit Graph

3969 Commits

Author SHA1 Message Date
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
Thomas Göttgens
72f443c519
free serial pins if gps_disabled is set 2022-03-24 18:22:31 +01:00
Thomas Göttgens
cef1614770
Autodetect OLED Controller 1306/1106 (#1317)
* Autodetect OLED Controller 1306/1106 and make #define NO_SCREEN work again

* fix epaper with autodetect

* Try kicking CI - NFC
2022-03-24 11:36:56 -05:00
Ben Meadors
47524d58d7
Telemetry tweaks (#1315)
* Update protos

* Removed battery level from position packets

* Send internal metrics

* Handle telemetry on node info for now

* Fixes

* Default telemetry to enabled and same interval as position

* Fixes for lots of interval issues

* Fixed interval

* Regen

* Cleanup

* Newline

* Update proto ref

* Fixed missing metric and updated power level to uint

* Regen
2022-03-23 15:46:39 -05:00
Ben Meadors
e97bd4f9f9
Battery level / telemetry rework (first pass) (#1306)
* Update protos

* Removed battery level from position packets

* Send internal metrics

* Handle telemetry on node info for now

* Fixes

* Default telemetry to enabled and same interval as position

* Fixes for lots of interval issues

* Fixed interval

* Regen

* Cleanup

* Newline

* Update proto ref
2022-03-20 09:55:38 -05:00
Thomas Göttgens
bbf044795a
weed out old versioning macros (#1312)
weed out old versioning macros
2022-03-20 11:53:37 +01:00
Sacha Weatherstone
8adacba3a1
Respect loc_share_disabled 2022-03-20 16:12:55 +11:00
Sacha Weatherstone
e5e25c2f31
Use gps_disabled 2022-03-20 15:57:49 +11:00
Sacha Weatherstone
a530249503
Fix typo "Fahrenheit" 2022-03-20 14:15:32 +11:00
Sacha Weatherstone
285413c68c
Rename packetNum to packetId 2022-03-20 11:40:13 +11:00
Sacha Weatherstone
4cd1570543
make location_share a boolean 2022-03-20 11:01:49 +11:00
mkinney
535919dfff
Merge pull request #1302 from mkinney/nrf_factory_reset_for_13
remove /prefs for nrf factory reset
2022-03-17 12:47:10 -07:00
Mike Kinney
94c1286010 changed on 1.3 2022-03-17 19:32:34 +00:00
Mike Kinney
f2a4308497 remove /prefs for nrf factory reset 2022-03-17 19:10:58 +00:00