3.29

lesserkuma · May 14, 2023 · fe0221d · fe0221d
1 parent de9721b
commit fe0221d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/FlashGBX/FlashGBX_GUI.py b/FlashGBX/FlashGBX_GUI.py
@@ -174,7 +174,7 @@ def __init__(self, args):
 		# List devices
 		self.layout_devices = QtWidgets.QHBoxLayout()
 		self.lblDevice = QtWidgets.QLabel()
-		self.lblDevice.mousePressEvent = self.WriteDebugLogOnShiftKey
+		self.lblDevice.mousePressEvent = self.WriteDebugLog
 		self.cmbDevice = QtWidgets.QComboBox()
 		self.cmbDevice.setStyleSheet("QComboBox { border: 0; margin: 0; padding: 0; max-width: 0px; }")
 		self.layout_devices.addWidget(self.lblDevice)
@@ -621,7 +621,7 @@ def WriteDebugLogOnShiftKey(self, event=None):
 		if kbmod == QtCore.Qt.ShiftModifier:
 			self.WriteDebugLog()
 
-	def WriteDebugLog(self):
+	def WriteDebugLog(self, event=None):
 		try:
 			Util.dprint("{:s} version: {:s} ({:d})".format(Util.APPNAME, Util.VERSION_PEP440, Util.VERSION_TIMESTAMP))
 			Util.dprint("Platform: {:s}".format(platform.platform()))

diff --git a/FlashGBX/Util.py b/FlashGBX/Util.py
@@ -9,7 +9,7 @@
 APPNAME = "FlashGBX"
 VERSION_PEP440 = "3.29"
 VERSION = "v{:s}".format(VERSION_PEP440)
-VERSION_TIMESTAMP = 1684078059
+VERSION_TIMESTAMP = 1684079394
 DEBUG = False
 DEBUG_LOG = []
 APP_PATH = ""

diff --git a/FlashGBX/hw_GBxCartRW.py b/FlashGBX/hw_GBxCartRW.py
@@ -1083,7 +1083,7 @@ def ReadFlashSaveID(self):
 
 	def ReadROM(self, address, length, skip_init=False, max_length=64):
 		num = math.ceil(length / max_length)
-		#dprint("Reading 0x{:X} bytes from cartridge ROM at 0x{:X} in {:d} iteration(s)".format(length, address, num))
+		dprint("Reading 0x{:X} bytes from cartridge ROM at 0x{:X} in {:d} iteration(s)".format(length, address, num))
 		if length > max_length: length = max_length
 
 		buffer = bytearray()
@@ -1103,10 +1103,9 @@ def ReadROM(self, address, length, skip_init=False, max_length=64):
 		for n in range(0, num):
 			self._write(self.DEVICE_CMD[command])
 			temp = self._read(length)
-			if isinstance(temp, int): temp = bytearray([temp])
+			if temp is not False and isinstance(temp, int): temp = bytearray([temp])
 			if temp is False or len(temp) != length:
-				if Util.DEBUG:
-					print("{:s}Error while trying to read 0x{:X} bytes from cartridge ROM at 0x{:X} in iteration {:d} of {:d}:{:s}\n{:s}".format(ANSI.RED, length, address, n, num, ANSI.RESET, str(temp)))
+				dprint("Error while trying to read 0x{:X} bytes from cartridge ROM at 0x{:X} in iteration {:d} of {:d} (response: {:s})".format(length, address, n, num, str(temp)))
 				return bytearray()
 			buffer += temp
 			if self.INFO["action"] in (self.ACTIONS["ROM_READ"], self.ACTIONS["SAVE_READ"], self.ACTIONS["ROM_WRITE_VERIFY"]) and not self.NO_PROG_UPDATE: