feat(cli): add --ota to update a v2 controller over Ethernet
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
d6331a105c
commit
892ccaec71
3 files changed
+111
-2
No files matched your search
@@ -16,6 +16,7 @@ from typing import Dict, Any, List, Optional
|
||||
|
||||
import tempfile
|
||||
import os
|
||||
from ota import ota_update
|
||||
from device import copy_file, DeviceConnection, firmware_default_device_name
|
||||
|
||||
|
||||
@@ -148,14 +149,14 @@ _FLAGS_WITH_VALUE = frozenset({
|
||||
'-p', '--port', '-n', '--name', '--pin', '-b', '--brightness',
|
||||
'-l', '--leds', '-d', '-debug', '--debug', '-o', '--order',
|
||||
'--preset', '--pattern', '--default', '--transport', '--ssid',
|
||||
'--wifi-password', '--wifi-channel', '--src', '--lib', '--patterns', '--paterns',
|
||||
'--wifi-password', '--wifi-channel', '--ota', '--src', '--lib', '--patterns', '--paterns',
|
||||
})
|
||||
|
||||
|
||||
def _get_ordered_actions(argv: List[str]) -> List[tuple]:
|
||||
"""
|
||||
Scan argv and return list of (action_name, value) in order of appearance.
|
||||
Actions: flash, pause, reset, upload, ls, erase_all, rm, follow.
|
||||
Actions: flash, ota, pause, reset, upload, ls, erase_all, rm, follow.
|
||||
"""
|
||||
actions = []
|
||||
i = 1
|
||||
@@ -179,6 +180,16 @@ def _get_ordered_actions(argv: List[str]) -> List[tuple]:
|
||||
else:
|
||||
raise ValueError("--flash requires an argument")
|
||||
continue
|
||||
if arg == '--ota':
|
||||
vals = []
|
||||
i += 1
|
||||
while i < len(argv) and not argv[i].startswith('-') and len(vals) < 2:
|
||||
vals.append(argv[i])
|
||||
i += 1
|
||||
if not vals:
|
||||
raise ValueError("--ota requires a host (and optionally an image path)")
|
||||
actions.append(('ota', vals))
|
||||
continue
|
||||
if arg in ('-r', '--reset'):
|
||||
actions.append(('reset', None))
|
||||
i += 1
|
||||
@@ -304,6 +315,10 @@ Examples:
|
||||
%(prog)s --flash firmware.bin
|
||||
%(prog)s -p /dev/ttyUSB0 --flash /path/to/firmware.bin
|
||||
|
||||
# Update a v2 controller over Ethernet (image defaults to led_controller_v2.bin under ./v2/build, ./build or ../v2/build)
|
||||
%(prog)s --ota 10.1.1.180
|
||||
%(prog)s --ota 10.1.1.180 /path/to/led_controller_v2.bin
|
||||
|
||||
# Reset, pause 2 seconds, then follow output
|
||||
%(prog)s --reset --pause 2 --follow
|
||||
|
||||
@@ -509,6 +524,13 @@ Examples:
|
||||
help="Delete a file or directory on the device (recursive for directories)"
|
||||
)
|
||||
|
||||
parser.add_argument(
|
||||
"--ota",
|
||||
nargs="+",
|
||||
metavar=("HOST", "IMAGE"),
|
||||
help="Update a v2 controller over Ethernet: HOST [IMAGE]. No serial port is used and the tool exits afterwards"
|
||||
)
|
||||
|
||||
parser.add_argument(
|
||||
"--flash",
|
||||
metavar="BINARY",
|
||||
@@ -550,6 +572,15 @@ Examples:
|
||||
print("Error: esptool not found. Install it with: pip install esptool", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
elif action_name == 'ota':
|
||||
try:
|
||||
ota_update(value[0], value[1] if len(value) > 1 else None)
|
||||
except Exception as e:
|
||||
print(f"Error: OTA failed: {e}", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
if all(a[0] in ('ota', 'pause') for a in ordered_actions):
|
||||
return # network-only: nothing to download over serial
|
||||
|
||||
elif action_name == 'reset':
|
||||
ran_reset = True
|
||||
try:
|
||||
|
||||
Reference in new issue
Block a user