Merge pull request #325 from npetrangelo/patch-3

Update __init__.py
Merge pull request #330 from Erethon/rnodeconf-device-selection
2024-11-22 21:50:18 +00:00 · 2023-06-22 20:05:37 +02:00 · 2023-06-22 20:00:42 +02:00 · 2023-06-21 00:02:11 +03:00 · 2023-06-05 17:31:52 -04:00
2 changed files with 3 additions and 3 deletions
--- a/RNS/Utilities/rnodeconf.py
+++ b/RNS/Utilities/rnodeconf.py
@ -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
--- a/RNS/init.py
+++ b/RNS/init.py
@ -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)
Author	SHA1	Message	Date
markqvist	6d551578c3	Merge pull request #325 from npetrangelo/patch-3 Update __init__.py	2023-06-22 20:05:37 +02:00
markqvist	40c85fb607	Merge pull request #330 from Erethon/rnodeconf-device-selection Fix bug in device selection of rnodeconf	2023-06-22 20:00:42 +02:00
Dionysis Grigoropoulos	743736b376	Fix bug in device selection of rnodeconf	2023-06-21 00:02:11 +03:00
Nathan Petrangelo	6ce979a7de	Update __init__.py Auto convert log messages to strings on the way in	2023-06-05 17:31:52 -04:00