kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
Use -d to enable console debugging
Use -D filename.txt to save the logpull/17/head
rodzic
c2ef978b71
commit
7f48d7642e
|
@ -528,7 +528,7 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
file.close()
|
||||
logger.debug("File written")
|
||||
except Exception as e:
|
||||
logger.exception("Error during file export!", e)
|
||||
logger.exception("Error during file export: %s", e)
|
||||
return
|
||||
|
||||
def exportFileS2P(self):
|
||||
|
@ -552,7 +552,7 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
file.close()
|
||||
logger.debug("File written")
|
||||
except Exception as e:
|
||||
logger.exception("Error during file export!", e)
|
||||
logger.exception("Error during file export: %s", e)
|
||||
return
|
||||
|
||||
def serialButtonClick(self):
|
||||
|
@ -617,7 +617,7 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
self.serial.write(str(command + "\r").encode('ascii'))
|
||||
self.serial.readline()
|
||||
except serial.SerialException as exc:
|
||||
logger.exception("Exception while writing to serial port (%s)", command, exc)
|
||||
logger.exception("Exception while writing to serial port (%s): %s", command, exc)
|
||||
self.serialLock.release()
|
||||
return
|
||||
|
||||
|
@ -662,7 +662,7 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
data = self.serial.readline().decode('ascii')
|
||||
result += data
|
||||
except serial.SerialException as exc:
|
||||
logger.exception("Exception while reading firmware data.", exc)
|
||||
logger.exception("Exception while reading firmware data: %s", exc)
|
||||
self.serialLock.release()
|
||||
return result
|
||||
else:
|
||||
|
@ -686,7 +686,7 @@ class NanoVNASaver(QtWidgets.QWidget):
|
|||
result += data
|
||||
values = result.split("\r\n")
|
||||
except serial.SerialException as exc:
|
||||
logger.exception("Exception while reading %s", value, exc)
|
||||
logger.exception("Exception while reading %s: %s", value, exc)
|
||||
|
||||
self.serialLock.release()
|
||||
return values[1:102]
|
||||
|
|
|
@ -95,9 +95,11 @@ class SweepWorker(QtCore.QRunnable):
|
|||
sleep(0.3)
|
||||
# Let's check the frequencies first:
|
||||
frequencies += self.readFreq()
|
||||
if start != frequencies[0]:
|
||||
# We got the wrong frequencies? Let's just log it for now.
|
||||
logger.warning("Wrong frequency received - %d is not %d", frequencies[0], start)
|
||||
# TODO: Set up checks for getting the right frequencies. Challenge: We don't set frequency to single-Hz
|
||||
# accuracy, but rather "quite close". Ex: 106213728 vs 106213726
|
||||
# if start != int(frequencies[i*101]):
|
||||
# # We got the wrong frequencies? Let's just log it for now.
|
||||
# logger.warning("Wrong frequency received - %d is not %d", int(frequencies[i*101]), start)
|
||||
# S11
|
||||
values += self.readData("data 0")
|
||||
# S21
|
||||
|
@ -214,8 +216,8 @@ class SweepWorker(QtCore.QRunnable):
|
|||
logger.warning("Got a non-float data value: %s (%s)", d, b)
|
||||
logger.debug("Re-reading %s", data)
|
||||
done = False
|
||||
except Exception:
|
||||
logger.warning("An exception occurred reading %s", data)
|
||||
except Exception as e:
|
||||
logger.exception("An exception occurred reading %s: %s", data, e)
|
||||
logger.debug("Re-reading %s", data)
|
||||
done = False
|
||||
if not done:
|
||||
|
|
|
@ -31,15 +31,37 @@ def main():
|
|||
print("")
|
||||
print("See https://github.com/mihtjel/nanovna-saver for further details")
|
||||
# Main code goes here
|
||||
console_log_level = logging.WARNING
|
||||
file_log_level = logging.DEBUG
|
||||
log_file = ""
|
||||
|
||||
for i in range(len(sys.argv)):
|
||||
if sys.argv[i] == "-d":
|
||||
console_log_level = logging.DEBUG
|
||||
elif sys.argv[i] == "-D" and i < len(sys.argv) - 1:
|
||||
log_file = sys.argv[i+1]
|
||||
elif sys.argv[i] == "-D":
|
||||
print("You must enter a file name when using -D")
|
||||
return
|
||||
|
||||
logger = logging.getLogger("NanoVNASaver")
|
||||
logger.setLevel(logging.DEBUG)
|
||||
ch = logging.StreamHandler()
|
||||
#ch.setLevel(logging.WARNING)
|
||||
ch.setLevel(logging.DEBUG)
|
||||
ch.setLevel(console_log_level)
|
||||
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
|
||||
ch.setFormatter(formatter)
|
||||
logger.addHandler(ch)
|
||||
if log_file != "":
|
||||
try:
|
||||
fh = logging.FileHandler(log_file)
|
||||
except Exception as e:
|
||||
logger.exception("Error opening log file: %s", e)
|
||||
return
|
||||
|
||||
fh.setLevel(file_log_level)
|
||||
fh.setFormatter(formatter)
|
||||
logger.addHandler(fh)
|
||||
|
||||
logger.info("Startup...")
|
||||
|
||||
QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling, True)
|
||||
|
|
Ładowanie…
Reference in New Issue