Merge branch 'master' of github.com:markqvist/Reticulum

This commit is contained in:
Mark Qvist 2023-06-29 22:12:30 +02:00
commit 8c936af963
2 changed files with 3 additions and 3 deletions

View File

@ -1494,7 +1494,7 @@ def main():
selected_product = None
try:
c_dev = int(input())
if c_dev < 1 or c_dev > 6:
if c_dev < 1 or c_dev > 7:
raise ValueError()
elif c_dev == 1:
selected_product = ROM.PRODUCT_RNODE

View File

@ -105,7 +105,7 @@ def timestamp_str(time_s):
def log(msg, level=3, _override_destination = False):
global _always_override_destination, compact_log_fmt
msg = str(msg)
if loglevel >= level:
if not compact_log_fmt:
logstring = "["+timestamp_str(time.time())+"] ["+loglevelname(level)+"] "+msg
@ -238,4 +238,4 @@ def panic():
def exit():
print("")
sys.exit(0)
sys.exit(0)