Skip to content

Commit fd4282b

Browse files
authored
Merge pull request #636 from geeksville/pr-powermon2
final powermon / power analysis reporting changes
2 parents e84a3cb + 8096d10 commit fd4282b

20 files changed

Lines changed: 1710 additions & 624 deletions

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
pip3 install poetry
3131
- name: Install meshtastic from local
3232
run: |
33-
poetry install
33+
poetry install --all-extras --with dev
3434
poetry run meshtastic --version
3535
- name: Run pylint
3636
run: poetry run pylint meshtastic examples/ --ignore-patterns ".*_pb2.pyi?$"

.vscode/launch.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@
3636
"justMyCode": true,
3737
"args": ["--tunnel", "--debug"]
3838
},
39+
{
40+
"name": "meshtastic analysis",
41+
"type": "debugpy",
42+
"request": "launch",
43+
"module": "meshtastic.analysis",
44+
"justMyCode": false,
45+
"args": []
46+
},
3947
{
4048
"name": "meshtastic set chan",
4149
"type": "debugpy",
@@ -204,7 +212,7 @@
204212
"request": "launch",
205213
"module": "meshtastic",
206214
"justMyCode": false,
207-
"args": ["--slog-out", "default", "--power-ppk2-meter", "--power-stress", "--power-voltage", "3.3", "--seriallog"]
215+
"args": ["--slog", "--power-ppk2-supply", "--power-stress", "--power-voltage", "3.3", "--ble"]
208216
},
209217
{
210218
"name": "meshtastic test",

.vscode/settings.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"cSpell.words": [
33
"bitmask",
44
"boardid",
5+
"DEEPSLEEP",
56
"Meshtastic",
67
"milliwatt",
78
"portnums",
@@ -12,5 +13,10 @@
1213
"Vids"
1314
],
1415
"python.pythonPath": "/usr/bin/python3",
15-
"flake8.enabled" : false // we are using trunk for formatting/linting rules, don't yell at us about line length
16+
"flake8.enabled": false,
17+
"python.testing.pytestArgs": [
18+
"meshtastic/tests"
19+
],
20+
"python.testing.unittestEnabled": false,
21+
"python.testing.pytestEnabled": true // we are using trunk for formatting/linting rules, don't yell at us about line length
1622
}

0 commit comments

Comments
 (0)