dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Tools/HIL: color output (ERROR, WARN, etc)

This commit is contained in:
Daniel Agar 2021-07-16 10:46:44 -04:00
parent 7f4ffcef93
commit 8c6ade0fc8
4 changed files with 120 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Tools/HIL/monitor_firmware_upload.py
View File

@ -7,6 +7,30 @@ from argparse import ArgumentParser
import re
import sys
COLOR_YELLOW = "\x1b[31m"
COLOR_GREEN = "\x1b[32m"
COLOR_RED = "\x1b[33m"
COLOR_WHITE = "\x1b[37m"
COLOR_RESET = "\x1b[0m"
def print_line(line):
if "WARNING" in line:
line = line.replace("WARNING", f"{COLOR_YELLOW}WARNING{COLOR_RESET}", 1)
elif "WARN" in line:
line = line.replace("WARN", f"{COLOR_YELLOW}WARN{COLOR_RESET}", 1)
elif "ERROR" in line:
line = line.replace("ERROR", f"{COLOR_RED}ERROR{COLOR_RESET}", 1)
elif "INFO" in line:
line = line.replace("INFO", f"{COLOR_WHITE}INFO{COLOR_RESET}", 1)
if "PASSED" in line:
line = line.replace("PASSED", f"{COLOR_GREEN}PASSED{COLOR_RESET}", 1)
if "FAILED" in line:
line = line.replace("FAILED", f"{COLOR_RED}FAILED{COLOR_RESET}", 1)
print(line, end='')
def monitor_firmware_upload(port, baudrate):
ser = serial.Serial(port, baudrate, bytesize=serial.EIGHTBITS, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, timeout=1, xonxoff=True, rtscts=False, dsrdtr=False)
@ -23,7 +47,7 @@ def monitor_firmware_upload(port, baudrate):
sys.exit(0)
else:
if len(serial_line) > 0:
print(serial_line, end='')
print_line(serial_line)
if time.time() > timeout_start + timeout:
print("Error, timeout")

38
Tools/HIL/nsh_param_set.py
View File

@ -7,6 +7,30 @@ from argparse import ArgumentParser
import re
import sys
COLOR_YELLOW = "\x1b[31m"
COLOR_GREEN = "\x1b[32m"
COLOR_RED = "\x1b[33m"
COLOR_WHITE = "\x1b[37m"
COLOR_RESET = "\x1b[0m"
def print_line(line):
if "WARNING" in line:
line = line.replace("WARNING", f"{COLOR_YELLOW}WARNING{COLOR_RESET}", 1)
elif "WARN" in line:
line = line.replace("WARN", f"{COLOR_YELLOW}WARN{COLOR_RESET}", 1)
elif "ERROR" in line:
line = line.replace("ERROR", f"{COLOR_RED}ERROR{COLOR_RESET}", 1)
elif "INFO" in line:
line = line.replace("INFO", f"{COLOR_WHITE}INFO{COLOR_RESET}", 1)
if "PASSED" in line:
line = line.replace("PASSED", f"{COLOR_GREEN}PASSED{COLOR_RESET}", 1)
if "FAILED" in line:
line = line.replace("FAILED", f"{COLOR_RED}FAILED{COLOR_RESET}", 1)
print(line, end='')
def do_param_set_cmd(port, baudrate, param_name, param_value):
ser = serial.Serial(port, baudrate, bytesize=serial.EIGHTBITS, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, timeout=0.1, xonxoff=True, rtscts=False, dsrdtr=False)
@ -24,12 +48,15 @@ def do_param_set_cmd(port, baudrate, param_name, param_value):
break
else:
if len(serial_line) > 0:
print(serial_line, end='')
print_line(serial_line)
if time.time() > timeout_start + timeout:
print("Error, timeout waiting for prompt")
sys.exit(1)
# clear
ser.readlines()
# run command
timeout_start = time.time()
timeout = 10 # 10 seconds
@ -44,11 +71,11 @@ def do_param_set_cmd(port, baudrate, param_name, param_value):
serial_line = ser.readline().decode("ascii", errors='ignore')
if cmd in serial_line:
print(serial_line, end='')
print_line(serial_line)
break
else:
if len(serial_line) > 0:
print(serial_line, end='')
print_line(serial_line)
if time.time() > timeout_start + timeout:
print("Error, timeout waiting for command echo")
@ -69,9 +96,8 @@ def do_param_set_cmd(port, baudrate, param_name, param_value):
serial_line = ser.readline().decode("ascii", errors='ignore')
if param_show_response in serial_line:
print(serial_line, end='')
print_line(serial_line)
current_param_value = serial_line.split(":")[-1].strip()
#print("param value", current_param_value, current_param_value == param_value)
if (current_param_value == param_value):
sys.exit(0)
@ -79,7 +105,7 @@ def do_param_set_cmd(port, baudrate, param_name, param_value):
sys.exit(1)
else:
if len(serial_line) > 0:
print(serial_line, end='')
print_line(serial_line)
if time.time() > timeout_start + timeout:
if "nsh>" in serial_line:

33
Tools/HIL/run_nsh_cmd.py
View File

@ -7,6 +7,30 @@ from argparse import ArgumentParser
import re
import sys
COLOR_YELLOW = "\x1b[31m"
COLOR_GREEN = "\x1b[32m"
COLOR_RED = "\x1b[33m"
COLOR_WHITE = "\x1b[37m"
COLOR_RESET = "\x1b[0m"
def print_line(line):
if "WARNING" in line:
line = line.replace("WARNING", f"{COLOR_YELLOW}WARNING{COLOR_RESET}", 1)
elif "WARN" in line:
line = line.replace("WARN", f"{COLOR_YELLOW}WARN{COLOR_RESET}", 1)
elif "ERROR" in line:
line = line.replace("ERROR", f"{COLOR_RED}ERROR{COLOR_RESET}", 1)
elif "INFO" in line:
line = line.replace("INFO", f"{COLOR_WHITE}INFO{COLOR_RESET}", 1)
if "PASSED" in line:
line = line.replace("PASSED", f"{COLOR_GREEN}PASSED{COLOR_RESET}", 1)
if "FAILED" in line:
line = line.replace("FAILED", f"{COLOR_RED}FAILED{COLOR_RESET}", 1)
print(line, end='')
def do_nsh_cmd(port, baudrate, cmd):
ser = serial.Serial(port, baudrate, bytesize=serial.EIGHTBITS, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, timeout=0.1, xonxoff=True, rtscts=False, dsrdtr=False)
@ -24,12 +48,15 @@ def do_nsh_cmd(port, baudrate, cmd):
break
else:
if len(serial_line) > 0:
print(serial_line, end='')
print_line(serial_line)
if time.time() > timeout_start + timeout:
print("Error, timeout waiting for prompt")
sys.exit(1)
# clear
ser.readlines()
# run command
timeout_start = time.time()
timeout = 10 # 10 seconds
@ -47,7 +74,7 @@ def do_nsh_cmd(port, baudrate, cmd):
break
else:
if len(serial_line) > 0:
print(serial_line, end='')
print_line(serial_line)
if time.time() > timeout_start + timeout:
print("Error, timeout waiting for command echo")
@ -64,7 +91,7 @@ def do_nsh_cmd(port, baudrate, cmd):
break
else:
if len(serial_line) > 0:
print(serial_line, end='')
print_line(serial_line)
if "nsh>" in serial_line:
sys.exit(1) # error, command didn't complete successfully

38
Tools/HIL/run_tests.py
View File

@ -9,8 +9,32 @@ import unittest
import os
import sys
COLOR_YELLOW = "\x1b[31m"
COLOR_GREEN = "\x1b[32m"
COLOR_RED = "\x1b[33m"
COLOR_WHITE = "\x1b[37m"
COLOR_RESET = "\x1b[0m"
def print_line(line):
if "WARNING" in line:
line = line.replace("WARNING", f"{COLOR_YELLOW}WARNING{COLOR_RESET}", 1)
elif "WARN" in line:
line = line.replace("WARN", f"{COLOR_YELLOW}WARN{COLOR_RESET}", 1)
elif "ERROR" in line:
line = line.replace("ERROR", f"{COLOR_RED}ERROR{COLOR_RESET}", 1)
elif "INFO" in line:
line = line.replace("INFO", f"{COLOR_WHITE}INFO{COLOR_RESET}", 1)
if "PASSED" in line:
line = line.replace("PASSED", f"{COLOR_GREEN}PASSED{COLOR_RESET}", 1)
if "FAILED" in line:
line = line.replace("FAILED", f"{COLOR_RED}FAILED{COLOR_RESET}", 1)
print(line, end='')
def do_test(port, baudrate, test_name):
ser = serial.Serial(port, baudrate, bytesize=serial.EIGHTBITS, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, timeout=1, xonxoff=True, rtscts=False, dsrdtr=False)
ser = serial.Serial(port, baudrate, bytesize=serial.EIGHTBITS, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, timeout=0.1, xonxoff=True, rtscts=False, dsrdtr=False)
timeout_start = time.time()
timeout = 10 # 10 seconds
@ -32,6 +56,9 @@ def do_test(port, baudrate, test_name):
print("Error, timeout waiting for prompt")
return False
# clear
ser.readlines()
success = False
# run test cmd
@ -54,7 +81,7 @@ def do_test(port, baudrate, test_name):
break
else:
if len(serial_line) > 0:
print(serial_line, end='')
print_line(serial_line)
if time.time() > timeout_start + timeout:
print("Error, timeout waiting for command echo")
@ -68,8 +95,9 @@ def do_test(port, baudrate, test_name):
while True:
serial_line = ser.readline().decode("ascii", errors='ignore')
if (len(serial_line) > 0):
print(serial_line, end='')
if len(serial_line) > 0:
print_line(serial_line)
if test_name + " PASSED" in serial_line:
success = True
@ -80,7 +108,7 @@ def do_test(port, baudrate, test_name):
if time.time() > timeout_start + timeout:
print("Error, timeout")
print(test_name + " FAILED")
print(test_name + f" {COLOR_RED}FAILED{COLOR_RESET}")
success = False
break