mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
4 055 Commity
24 Gałęzie
269 Tagi
4,2 GiB
Wykres commitów

4055 Commity (c15da3c104ae1e62b601fefe557fefd752f6a3e1)

Autor SHA1 Wiadomość Data
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
Jm Casler 5b8ff56731
Merge pull request #1296 from caveman99/littlefs-fix 
LittleFS recursive display and erase.
 2022-03-16 10:11:30 -07:00
Thomas Göttgens 3e14f76a94
Merge branch 'master' into littlefs-fix 2022-03-16 08:44:23 +01:00
Thomas Göttgens cb6846ebc6 fix PortduinoFS integration for Firmware. 2022-03-16 08:30:38 +01:00
Jm Casler 44681c90f5
Merge pull request #1298 from mc-hamster/router 
comment out DSRRouter
 2022-03-15 18:02:47 -07:00
Jm Casler 5eccfb6f2b
Merge branch 'meshtastic:master' into router 2022-03-15 17:52:43 -07:00
Jm Casler b4f9008b2b comment out DSRRouter 2022-03-15 17:52:18 -07:00
Jm Casler 5eb761c397
Merge pull request #1297 from mc-hamster/router 
remove is_router in favor of role == Role_Router
 2022-03-15 17:12:06 -07:00
Jm Casler 11130496c4 remove is_router in favor of role == Role_Router 2022-03-15 15:49:25 -07:00
Jm Casler e893ff447f updating proto submodule to latest 2022-03-15 15:45:59 -07:00
Thomas Göttgens e435453363 fix building for nRF52 2022-03-15 22:49:06 +01:00
Thomas Göttgens 697c749a8d LittleFS recursive display and erase. Cause we got directories now, baby! 2022-03-15 22:22:05 +01:00
Sacha Weatherstone b9058ce7c5
fix build 2022-03-15 18:28:39 +11:00
Sacha Weatherstone ceacbe0b94
Cleanup pio config (less intimidating) 2022-03-15 17:35:29 +11:00
Sacha Weatherstone 5b8ce7fe07
Remove unused scripts 2022-03-15 17:30:55 +11:00