Wykres commitów

4055 Commity (c15da3c104ae1e62b601fefe557fefd752f6a3e1)

Autor SHA1 Wiadomość Data
Jm Casler 9037a51f83
Merge pull request #1293 from mc-hamster/router
support for position_broadcast_smart_disabled
2022-03-14 18:22:49 -07:00
Jm Casler 1b1c3936a4 support for position_broadcast_smart_disabled 2022-03-14 18:09:11 -07:00
Jm Casler d1897f8e5a updating proto submodule to latest 2022-03-14 18:05:25 -07:00
Jm Casler abc0579e75
Merge pull request #1292 from mc-hamster/router
Add weighted tx delay for flooding router
2022-03-14 17:56:57 -07:00
Jm Casler 3816a2fbe0 Add weighted tx delay for flooding router 2022-03-14 17:47:01 -07:00
Jm Casler bb15a001f7
Merge branch 'meshtastic:master' into router 2022-03-14 16:59:09 -07:00
mkinney 6fa2d47f0c
Merge pull request #1291 from raldi/master
Get sleep side effect out of DEBUG_MSG()
2022-03-14 13:33:27 -07:00
Mike Schiraldi f1ed691fd3 Get sleep side effect out of DEBUG_MSG() 2022-03-14 13:05:25 -07:00
mkinney f7f783b48b
Merge pull request #1290 from raldi/master
Get side effects out of DEBUG_MSG
2022-03-14 12:58:44 -07:00
Mike Schiraldi fc0eb7de46 Add semicolon 2022-03-14 12:40:57 -07:00
Mike Schiraldi 88d6850c82 Get side effects out of DEBUG_MSG 2022-03-14 12:31:13 -07:00
Jm Casler 0a1e6517a1 updating proto submodule to latest 2022-03-14 07:42:01 -07:00
Jm Casler 82591b2a69 Remove more old router role work. 2022-03-13 14:50:27 -07:00
Jm Casler cb4ca87abe remove role from flooding router 2022-03-12 07:22:59 -08:00
Michael Kleinhenz d4e6dd32c5
JSON MQTT Integration (#1283)
* Added downstream JSON MQTT handling.

* Added uplink JSON messaging

* Fixed shadow variable.

* Added missing dependency.

* Fixes Environment -> Telemetry.

* Fixed native issue.

* Added json11 pio reg dependency.

* Fixed json11 library dependency.

Co-authored-by: Sacha Weatherstone <sachaw100@hotmail.com>
2022-03-12 08:08:57 -06:00
Sacha Weatherstone f33cd4081e
Implement getOwner 2022-03-10 09:14:56 +11:00
Sacha Weatherstone 8a7a6e9a5d
Use registry version of OneButton 2022-03-10 09:03:30 +11:00
Sacha Weatherstone 593dc67cfb
Remove unused lib dir 2022-03-10 08:40:39 +11:00
Sacha Weatherstone 400630199f
Use nanopb from PIO registry 2022-03-10 08:37:24 +11:00
Sacha Weatherstone 379fd9cdd0
Remove unused nrf52 tests 2022-03-10 08:13:39 +11:00
Sacha Weatherstone b31580a35c
Removed unused linker files 2022-03-10 08:04:45 +11:00
Sacha Weatherstone 5f47939543
Remove CMakeLists 2022-03-10 08:00:27 +11:00
Sacha Weatherstone 655d694552
Move README-docker.md to docs 2022-03-10 00:41:28 +11:00
Sacha Weatherstone 3292b2ff21
Delete .gitlab-ci.yml 2022-03-10 00:10:24 +11:00
Sacha Weatherstone c98a9441d6
Update CI 2022-03-10 00:04:49 +11:00
Sacha Weatherstone 6bee95d6b2 Rename MeshPlugin, SinglePortPlugin and ProtobufPlugin 2022-03-09 19:01:43 +11:00
Sacha Weatherstone 46b8b61b7f Fix Serial Plugin name 2022-03-09 18:37:41 +11:00
Jm Casler f5369c3f1b
Merge pull request #1280 from michaelkleinhenz/txt-mqtt
Plaintext publish to MQTT
2022-03-08 15:35:46 -08:00
Michael Kleinhenz 428d062b9a Added txt message publishing on MQTT. 2022-03-07 20:45:50 +01:00
Jm Casler 2b20bf3d0a Building new BLE stack for 1.3.4 2022-03-06 17:52:05 -08:00
Jm Casler 61c2e58479
Merge pull request #1273 from joshpirihi/master
NimBLE API Implementation
2022-03-06 17:48:14 -08:00
Jm Casler eddc202799
Merge branch 'master' into master 2022-03-06 16:12:11 -08:00
Jm Casler e22601b599
Merge pull request #1278 from mc-hamster/router
Update to flooding router -- add 'isPacketLocal' and change to sniffReceived
2022-03-06 16:11:58 -08:00
Jm Casler 2a2448e367 address tool-cppcheck error 2022-03-06 15:46:56 -08:00
Jm Casler c1c8fea21e
Merge branch 'meshtastic:master' into router 2022-03-06 14:40:11 -08:00
Ben Meadors ca21e8b2bf
New PR artifacts upload scheme 2022-03-06 08:50:42 -06:00
Ben Meadors 6151af0343
Merge branch 'master' into master 2022-03-06 02:39:54 +00:00
hb9tob bcac20490e
Update Screen.cpp (#1274) 2022-03-05 20:26:25 -06:00
Jm Casler ec86246da9 Update to flooding router 2022-03-05 12:38:26 -08:00
Joshua Pirihi d27efd0749 Merge branch 'master' of https://github.com/joshpirihi/Meshtastic-device into mymaster 2022-03-06 05:59:20 +13:00
Joshua Pirihi a48838153b NimBLE merge conflicts 2022-03-06 05:59:13 +13:00
Joshua Pirihi d59de171c5 NimBLE implementation 2022-03-06 05:57:38 +13:00
Joshua Pirihi facf7f56c2 Merge branch 'master' of https://github.com/meshtastic/Meshtastic-device 2022-03-06 05:56:34 +13:00
joshpirihi 0a14f5d168
Merge branch 'meshtastic:master' into master 2022-03-06 05:46:32 +13:00
Joshua Pirihi 3ab2ca57e9 NimBLE implementation 2022-03-06 05:43:26 +13:00
mkinney ea99f96014
Merge pull request #1270 from mkinney/bugfixes_from_1_2
merge the 1.2 hang bugfix to 1.3
2022-03-02 21:36:56 -08:00
mkinney 6001e96c82
Merge branch 'master' into bugfixes_from_1_2 2022-03-02 21:28:11 -08:00
Jm Casler 2fe124eb17 Bump to 1.3.3 2022-03-02 20:50:09 -08:00
mkinney d91a63a5ee
Merge branch 'master' into bugfixes_from_1_2 2022-03-02 20:43:12 -08:00
Jm Casler a450aac3b5 Merge branch 'master' of https://github.com/meshtastic/Meshtastic-device 2022-03-02 20:42:06 -08:00