Commit Graph
2377 Commits
Author SHA1 Message Date
Ian McEwen 2c8fd8b606 Merge pull request #632 from ianmcorvidae/remote-config-wrongtype-again
Correctly detect LocalConfig vs. LocalModuleConfig, again. fixes #630
2024-07-03 20:36:21 -07:00
Ian McEwen 15b03b704c Correctly detect LocalConfig vs. LocalModuleConfig, again. fixes #630 2024-07-03 20:35:58 -07:00
Kevin Hester 63327986b4 fix incorrect Vid - thanks @ianmcorvidae for notixing.
0x04b4 is cypress semi but commonly used in Chinese oscopes (like mine).
So it was supposed to be a blacklist not a whitelist!
2024-07-03 20:11:59 -07:00
Kevin Hester 5695ec7102 change --slog to use nargs 2024-07-03 11:00:42 -07:00
Kevin Hester ae2ef78560 fix linter warnings
(note: the linter test for min/max is buggy so disabled)
2024-07-03 09:57:24 -07:00
Kevin Hester 2f5a736e1f Merge remote-tracking branch 'root/master' into pr-powermon
# Conflicts:
#	meshtastic/ble_interface.py
#	meshtastic/protobuf/mesh_pb2.py
#	meshtastic/protobuf/powermon_pb2.py
#	meshtastic/protobuf/powermon_pb2.pyi
2024-07-03 09:22:45 -07:00
Paul Picazo 775108b47b Hop limit param on sendTraceRoute fix 2024-07-02 10:09:58 -07:00
Ian McEwen ae904f6dbe Merge pull request #628 from meshtastic/update-heartbeat
Update heartbeat interval to a fixed 300 seconds
2024-07-02 10:01:32 -07:00
Ian McEwen a14cc4f573 Update heartbeat interval to a fixed 300 seconds 2024-07-02 09:58:45 -07:00
Ian McEwen dc5f59260f protobufs: v2.3.14 2024-07-02 09:52:47 -07:00
github-actions 91c42d598e bump version 2024-07-02 16:46:09 +00:00
Ian McEwen 22bf34ee35 Merge pull request #627 from meshtastic/protobuf-ble-logging
New LogRecord protobuf BLE logging
2.3.13
2024-07-02 09:44:49 -07:00
Ian McEwen 32b4575262 Reorganize imports for pylint 2024-07-02 09:43:49 -07:00
Ben Meadors 5eafc2c866 Remove newline handling 2024-07-02 07:30:27 -05:00
Ben Meadors 19363967f3 Shut up linter 2024-07-01 21:11:35 -05:00
Ben Meadors ce6c096c3e Fix 2024-07-01 21:05:27 -05:00
Ben Meadors bef9b480f0 Log Recod logging with new characterstic 2024-07-01 18:05:15 -05:00
Ben Meadors d5a4d86c21 Merge remote-tracking branch 'origin/master' into protobuf-ble-logging 2024-07-01 06:18:32 -05:00
Ben Meadors 188f9d593c Add handler for new log-record BLE characteristic 2024-07-01 06:16:49 -05:00
Ben Meadors 0e6a0eb1d0 Merge pull request #626 from ianmcorvidae/ble-older-firmware
Support --ble on older firmwares that don't have the log-radio characteristic yet
2024-07-01 06:16:04 -05:00
Ian McEwen 3b4690e932 appease the linter 2024-07-01 00:00:59 -07:00
Ian McEwen 49bd9cb515 Support --ble on older firmwares that don't have the log-radio characteristic yet. 2024-06-30 23:40:11 -07:00
Ian McEwen 33c5be5219 Update doc string for --pos-fields to use valid values 2024-06-30 23:25:57 -07:00
Ian McEwen 9ffdc30c1f Make remote hardware args live in their own little box 2024-06-30 23:25:07 -07:00
Ian McEwen 98b7a7d0df Merge pull request #625 from ianmcorvidae/nargs2
Allow connection args without an argument, add argument aliases
2024-06-30 16:54:52 -07:00
Ian McEwen abdfbc673e Allow connection args without an argument, add argument aliases 2024-06-30 16:52:31 -07:00
Ian McEwen 42ea29be8f Merge pull request #624 from geeksville/pr-bletweak
bleak reads can hang if a device walks out of range, cope with that.
2024-06-30 15:59:24 -07:00
Kevin Hester 6da04f7a15 Merge branch 'pr-bletweak' into pr-powermon
# Conflicts:
#	.vscode/launch.json
2024-06-30 13:03:33 -07:00
Kevin Hester 111d61ea0a bleak reads can hang if a device walks out of range, cope with that. 2024-06-30 13:00:12 -07:00
Ian McEwen 9e71e85c9f Merge pull request #621 from ianmcorvidae/str-concat-trace
Properly handle missing nodes in traceroute response
2024-06-30 10:05:50 -07:00
Ian McEwen 93fbc78492 Properly handle missing nodes in traceroute response (fixes #612) 2024-06-30 10:04:54 -07:00
Ian McEwen e331bea4ea make typing a little more 3.8-approved 2024-06-30 09:58:32 -07:00
Ian McEwen 7788271278 Merge pull request #582 from FedericoCeratto/clarify-licensing
Clarify licensing
2024-06-30 09:45:41 -07:00
Ian McEwen 01674b9803 Merge pull request #619 from geeksville/pr-poelock
Add bin/git-resolve-poetry-lock.sh to resolve merge conficts
2024-06-30 09:33:51 -07:00
Ian McEwen 4f1ea5b7da Merge pull request #616 from meshtastic/ble-logging
Adds support for ble logging characteristic
2024-06-30 09:33:05 -07:00
Ian McEwen 18883b977b Merge pull request #618 from geeksville/pr-fixstdout
make specifying an argument to --seriallog optional
2024-06-30 09:31:41 -07:00
Kevin Hester a68a9f8517 Add bin/git-resolve-poetry-lock.sh to resolve merge conficts
Previously I was just doing poetry update to resolve such conflicts,
but that's not really ideal because it updates all libs.
poetry lock --no-update is better, but even better to base the changes
from their version of poetry-lock and then add only my changes as required
by pyproject.yaml.

You can use this script if you get a merge conflict with poetry.lock
and it will just do the right thing.

btw: in my powermon/structuredlogging branch I have a commit to add
support for the "poe" tool which will provide a shortcut for this script.
2024-06-30 07:25:11 -07:00
Kevin Hester 8f98878cac Merge branch 'ble-logging' into pr-powermon
# Conflicts:
#	.vscode/launch.json
#	meshtastic/protobuf/config_pb2.py
#	meshtastic/protobuf/mesh_pb2.py
#	meshtastic/protobuf/mesh_pb2.pyi
2024-06-30 07:06:32 -07:00
Kevin Hester a04b3498b3 make specifying an argument to --seriallog optional
thanks @ianmcorvidae for telling me about the cool nargs='?' option!
2024-06-30 06:54:29 -07:00
Kevin Hester 5c2851db85 nargs='?' is awesome! get rid of ble_dest. 2024-06-30 06:46:39 -07:00
Kevin Hester 7e440693a3 Merge remote-tracking branch 'root/master' into ble-logging
# Conflicts:
#	poetry.lock
2024-06-30 06:36:11 -07:00
Kevin Hester 13ca8fd681 debug launch configs 2024-06-30 06:31:09 -07:00
Ian McEwen 18c2d08bf0 protobufs: v2.3.13 2024-06-29 17:36:22 -07:00
Ian McEwen a3afc2ae0a Ensure regen-protobufs works if there's no pre-existing directory to remove 2024-06-29 17:34:02 -07:00
Ian McEwen f6d1b4bc39 Merge pull request #613 from geeksville/pr-moveproto
Move protobuf python glue from meshtastic to meshtastic.protobuf
2024-06-29 17:12:32 -07:00
Kevin Hester 1da687cf2d move @thebentern spiffy logging so it is shared with !ble log sources 2024-06-29 16:15:32 -07:00
Kevin Hester 42236f2de8 Merge branch 'ble-logging' into pr-powermon
# Conflicts:
#	poetry.lock
#	pyproject.toml
2024-06-29 15:59:03 -07:00
Kevin Hester 9004f1ed57 fixes for type checker 2024-06-29 15:18:22 -07:00
Kevin Hester bd767af485 A better way to ensure BLE disconnects:
It turns out that Bleak is kinda racey.  If we call disconnect()
and then immediately close() the disconnect may or may not actually happen
(probably because it was merely queued for dbus).
So instead: When we want to close the BLEInterface we call disconnect()
and then in a preregistered 'on disconnect' handler we actually close
down our interface/datastructures.
2024-06-29 15:08:50 -07:00
Kevin Hester 6194e41baf fix linter warnings 2024-06-29 14:37:50 -07:00