Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bootloader] Fix display of baudrate used #185

Merged
merged 2 commits into from
Mar 31, 2023
Merged

[Bootloader] Fix display of baudrate used #185

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5311420
[Bootloader] Fix display of baudrate used
fleborne Jan 11, 2023
c5786b7
[Bootloader] Fix display of baudrate for luos_reset
fleborne Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions pyluos/tools/bootloader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,13 +622,6 @@ def reboot_network(device, topic, nodes_to_reboot):
# @return None
# *******************************************************************************
def luos_flash(args):
print('Luos flash subcommand with parameters :')
print('\t--baudrate : ', args.baudrate)
print('\t--gate : ', args.gate)
print('\t--target : ', args.target)
print('\t--binary : ', args.binary)
print('\t--port : ', args.port)

topic = 1

if not (args.port):
Expand All @@ -638,6 +631,15 @@ def luos_flash(args):
sys.exit()
return

baudrate = os.getenv('LUOS_BAUDRATE', args.baudrate)

print('Luos flash subcommand with parameters :')
print('\t--baudrate : ', baudrate)
print('\t--gate : ', args.gate)
print('\t--target : ', args.target)
print('\t--binary : ', args.binary)
print('\t--port : ', args.port)

# state used to check each step
machine_state = True
# list of all the nodes that may fail in each step
Expand All @@ -654,7 +656,7 @@ def luos_flash(args):
f.close()

# init device
device = Device(args.port, baudrate=os.getenv('LUOS_BAUDRATE', args.baudrate), background_task=False)
device = Device(args.port, baudrate=baudrate, background_task=False)

# find routing table
state = find_network(device)
Expand Down Expand Up @@ -759,18 +761,20 @@ def luos_flash(args):
# @return None
# *******************************************************************************
def luos_detect(args):
print('Luos detect subcommand on port : ', args.port)
print('\tLuos detect subcommand at baudrate : ', args.baudrate)

if not (args.port):
try:
args.port= serial_discover(os.getenv('LUOS_BAUDRATE', args.baudrate))[0]
except:
sys.exit()
return

baudrate = os.getenv('LUOS_BAUDRATE', args.baudrate)

print('Luos detect subcommand on port : ', args.port)
print('\tLuos detect subcommand at baudrate : ', baudrate)

# detect network
device = Device(args.port, baudrate=os.getenv('LUOS_BAUDRATE', args.baudrate))
device = Device(args.port, baudrate=baudrate)
# print network to user
print(device.nodes)
device.close()
Expand All @@ -783,20 +787,21 @@ def luos_detect(args):
# @return None
# *******************************************************************************
def luos_reset(args):
print('Luos discover subcommand on port : ', args.port)
print('\tLuos discover subcommand at baudrate : ', args.baudrate)

if not (args.port):
try:
args.port= serial_discover(os.getenv('LUOS_BAUDRATE', args.baudrate))[0]
except:
sys.exit()
return

baudrate = os.getenv('LUOS_BAUDRATE', args.baudrate)

print('Luos discover subcommand on port : ', args.port)
print('\tLuos discover subcommand at baudrate : ', args.baudrate)

# send rescue command
print('Send reset command.')
port = serial.Serial(args.port, os.getenv('LUOS_BAUDRATE', args.baudrate), timeout=0.05)
port = serial.Serial(args.port, baudrate, timeout=0.05)
rst_cmd = {
'bootloader': {
'command': {
Expand All @@ -811,7 +816,7 @@ def luos_reset(args):
port.close()

# detect network
device = Device(args.port, baudrate=os.getenv('LUOS_BAUDRATE', args.baudrate), background_task=False)
device = Device(args.port, baudrate=baudrate, background_task=False)

print(device.nodes)
device.close()
Expand Down