Kevin Hester
|
e4eb7ab589
|
Merge branch 'dev' into dev1.2
# Conflicts:
# proto
# src/mesh/generated/deviceonly.pb.h
# src/mesh/generated/mesh.pb.h
# src/plugins/esp32/EnvironmentalMeasurementPlugin.cpp
|
2021-02-25 19:44:08 +08:00 |
|
Kevin Hester
|
b052928af2
|
Merge remote-tracking branch 'root/master' into dev
|
2021-02-25 19:33:06 +08:00 |
|
Kevin Hester
|
66638655a5
|
Merge branch 'dev' into dev1.2
# Conflicts:
# src/mesh/NodeDB.cpp
|
2021-02-25 08:56:36 +08:00 |
|
Kevin Hester
|
2d214df76f
|
Merge remote-tracking branch 'root/master' into dev
|
2021-02-25 08:52:26 +08:00 |
|
Kevin Hester
|
b2c47a7dea
|
fix #710. nodes disappearing from map. thanks @DylanHoen for noticing!
|
2021-02-25 08:50:46 +08:00 |
|
Kevin Hester
|
f8d8dc25c0
|
properly route messages to phone again
|
2021-02-23 14:35:34 +08:00 |
|
Kevin Hester
|
aa8b86c6b2
|
multichannel send/rx kinda works
|
2021-02-23 11:43:30 +08:00 |
|
Kevin Hester
|
ae6b7e7259
|
multichannel code is done! (only basic testing completed though)
|
2021-02-23 10:45:03 +08:00 |
|
Kevin Hester
|
2761c85564
|
clean up the crypto api
|
2021-02-23 10:10:35 +08:00 |
|
Charles Crossan
|
3f1ada29ac
|
support independently enabling/disabling the on-device screen and actual measurement
|
2021-02-22 20:47:35 -05:00 |
|
Charles Crossan
|
efaf669479
|
update Environmental Measurement plugin to use radio config prefs
|
2021-02-22 19:50:51 -05:00 |
|
Kevin Hester
|
94cd96cfde
|
begin multichannel hash impl
|
2021-02-22 12:57:26 +08:00 |
|
Kevin Hester
|
d6c2e9063a
|
1.2 channel cleanup
|
2021-02-22 11:16:38 +08:00 |
|
Kevin Hester
|
3088fe3f91
|
Stay up-to-date wrt master (cc @mc-hamster)
# Conflicts:
# src/plugins/Plugins.cpp
# src/plugins/RangeTestPlugin.cpp
# src/plugins/StoreForwardPlugin.cpp
|
2021-02-22 10:39:46 +08:00 |
|
Kevin Hester
|
008187caa4
|
1.2 wip - psk work
|
2021-02-22 10:26:11 +08:00 |
|
Charles Crossan
|
ae76ce4024
|
Implement interface for plugins to have custom UI Frames
|
2021-02-21 16:46:46 -05:00 |
|
Charles Crossan
|
087945d7cb
|
udpate protobufs
|
2021-02-21 12:05:23 -05:00 |
|
Charles Crossan
|
5817afd4ac
|
fix port number for ENVIRONMENTAL_MEASUREMENT_APP
|
2021-02-21 11:42:03 -05:00 |
|
Charles Crossan
|
3c564796e0
|
|
2021-02-21 10:55:33 -05:00 |
|
Kevin Hester
|
c6091338ab
|
admin ops
|
2021-02-21 14:03:44 +08:00 |
|
Kevin Hester
|
99467cd874
|
1.2 WIP at least doesn't crash
|
2021-02-21 12:59:47 +08:00 |
|
Kevin Hester
|
69a11e7375
|
WIP phone api changes for dev1.2
|
2021-02-17 19:04:41 +08:00 |
|
Kevin Hester
|
42ae27973e
|
WIP 1.2 move routing into plugin
|
2021-02-17 13:06:23 +08:00 |
|
Kevin Hester
|
45caf394f0
|
WIP multichannel support
|
2021-02-16 15:41:52 +08:00 |
|
Charles Crossan
|
05d237ee84
|
add handleSetChannel
|
2021-02-15 21:02:30 -05:00 |
|
Kevin Hester
|
e35f137986
|
clean up nodeinfo broadcasts and move into plugin
|
2021-02-14 12:27:10 +08:00 |
|
Kevin Hester
|
c1733a4ac6
|
Merge remote-tracking branch 'root/master' into dev
|
2021-02-14 12:07:11 +08:00 |
|
Kevin Hester
|
66a7e8eab9
|
oops - we were never sending 'fixed' gps positions to other nodes
|
2021-02-14 12:02:24 +08:00 |
|
Kevin Hester
|
a872231f8a
|
clean up position broadcasts, send them even if we don't have gps lock
|
2021-02-14 11:57:48 +08:00 |
|
Kevin Hester
|
52ec4d511c
|
oops - we weren't properly stripping timestamps from new style positions
|
2021-02-14 11:37:32 +08:00 |
|
Sacha Weatherstone
|
875eeb699c
|
Fix report formatting
|
2021-02-13 19:51:31 +11:00 |
|
Jm Casler
|
eecf89a9c0
|
Merge pull request #68 from meshtastic/master
from main to my fork
|
2021-02-12 18:49:39 -08:00 |
|
Jm
|
c9b1ee532d
|
Update deviceonly.pb.h
|
2021-02-12 18:49:24 -08:00 |
|
Kevin Hester
|
8c225a3c65
|
disable lora while updating, show "Updating" on oled screen
|
2021-02-12 13:48:12 +08:00 |
|
Kevin Hester
|
bbc8fc0269
|
fix build for nrf52
|
2021-02-12 09:56:42 +08:00 |
|
Kevin Hester
|
9d81511153
|
fix warning
|
2021-02-12 09:56:35 +08:00 |
|
Kevin Hester
|
f2b7ff2b79
|
an optimization for #681 - make want_ack packets higher priority
|
2021-02-12 09:40:20 +08:00 |
|
Kevin Hester
|
2ff5046dcd
|
for #681, add MeshPacketQueue (a priority queue) to ensure acks get sent quickly
|
2021-02-12 09:08:49 +08:00 |
|
Kevin Hester
|
917090856f
|
partial for #681: Never let stale nodeinfos/positions stay in xmit queue
|
2021-02-11 18:19:43 +08:00 |
|
Kevin Hester
|
fdfe62edf0
|
updates to work with new protobuf names
|
2021-02-10 16:18:41 +08:00 |
|
Jm
|
b29bcbbd41
|
#682 Exposing the actual radio center frequency to /static/report
|
2021-02-09 21:59:00 -08:00 |
|
Kevin Hester
|
2fa38c7dc4
|
update protos
|
2021-02-08 17:57:45 +08:00 |
|
Kevin Hester
|
58bb7169a0
|
use nodenum as the default nodeid
|
2021-02-08 10:15:02 +08:00 |
|
Jm
|
d678c48884
|
work on rangetestplugin and storeforwardplugin
done for the night.
|
2021-02-06 23:29:18 -08:00 |
|
Kevin Hester
|
486b03e985
|
bug 677. Don't assert fail for missing interfaces, instead return
nak packet to clients.
|
2021-02-07 10:26:11 +08:00 |
|
Kevin Hester
|
ccb232b6ac
|
make route errors a more general 'message delivery failure' reason
in support of https://github.com/meshtastic/Meshtastic-device/issues/677
|
2021-02-07 09:46:35 +08:00 |
|
Kevin Hester
|
7f07725840
|
make improperly sized AES128/256 keys non fatal, instead pad with zeros
Fixes rebooting the board if someone specifies an invalid key
|
2021-01-29 10:15:48 +08:00 |
|
Kevin Hester
|
c81d090464
|
someone added storerequest app?
|
2021-01-29 10:14:46 +08:00 |
|
Kevin Hester
|
63c650c33e
|
Merge branch 'master' into log-tx-failure
|
2021-01-27 17:54:06 +08:00 |
|
Sacha Weatherstone
|
31b89e2932
|
Another header required
|
2021-01-24 10:48:48 +11:00 |
|