FlashGBX 4.2__tar.gz → 4.4__tar.gz

{FlashGBX-4.2 → flashgbx-4.4}/FlashGBX/DataTransfer.py

@@ -5,7 +5,6 @@
 import traceback
 from serial import SerialException
 from . import pyside as PySide2
-from . import Util
 from .Util import dprint
 
 class DataTransfer(PySide2.QtCore.QThread):
@@ -54,5 +53,5 @@ class DataTransfer(PySide2.QtCore.QThread):
 		if error is not None:
 			print(tb)
 			dprint(tb)
-			self.updateProgress.emit({"action":"ABORT", "info_type":"msgbox_critical", "fatal":True, "info_msg":"An unresolvable error has occured. See console output for more information. Reconnect the device, restart the software and try again.\n\n{:s}: {:s}".format(type(error).__name__, str(error)), "abortable":False})
+			self.updateProgress.emit({"action":"ABORT", "info_type":"msgbox_critical", "fatal":True, "info_msg":"An unresolvable error has occured. See the debug log file for more information. Reconnect the device, restart the software and try again.\n\n{:s}: {:s}".format(type(error).__name__, str(error)), "abortable":False})
 			self.FINISHED = True

{FlashGBX-4.2 → flashgbx-4.4}/FlashGBX/FlashGBX.py

@@ -133,9 +133,9 @@ def main(portableMode=False):
 	ap_cli1.add_argument("path", nargs="?", default="auto", help="target or source file path (optional when reading, required when writing)")
 	
 	ap_cli2 = parser.add_argument_group('optional command line interface arguments')
-	ap_cli2.add_argument("--dmg-romsize", choices=["auto", "32kb", "64kb", "128kb", "256kb", "512kb", "1mb", "2mb", "4mb", "8mb", "16mb", "32mb"], type=str.lower, default="auto", help="set size of Game Boy cartridge ROM data")
+	ap_cli2.add_argument("--dmg-romsize", choices=["auto", "32kb", "64kb", "128kb", "256kb", "512kb", "1mb", "2mb", "4mb", "8mb", "16mb", "32mb", "64mb", "128mb"], type=str.lower, default="auto", help="set size of Game Boy cartridge ROM data")
 	ap_cli2.add_argument("--dmg-mbc", type=str.lower, default="auto", help="set memory bank controller type of Game Boy cartridge")
-	ap_cli2.add_argument("--dmg-savesize", choices=["auto", "4k", "16k", "64k", "256k", "512k", "1m", "eeprom2k", "eeprom4k", "tama5", "4m"], type=str.lower, default="auto", help="set size of Game Boy cartridge save data")
+	ap_cli2.add_argument("--dmg-savetype", choices=["auto", "4k", "16k", "64k", "256k", "512k", "1m", "mbc6", "mbc7_2k", "mbc7_4k", "tama5", "sram4m", "eeprom1m", "photo"], type=str.lower, default="auto", help="set type of Game Boy cartridge save data")
 	ap_cli2.add_argument("--agb-romsize", choices=["auto", "32kb", "64kb", "128kb", "256kb", "512kb", "1mb", "2mb", "4mb", "8mb", "16mb", "32mb", "64mb", "128mb", "256mb", "512mb"], type=str.lower, default="auto", help="set size of Game Boy Advance cartridge ROM data")
 	ap_cli2.add_argument("--agb-savetype", choices=["auto", "eeprom4k", "eeprom64k", "sram256k", "flash512k", "flash1m", "dacs8m", "sram512k", "sram1m"], type=str.lower, default="auto", help="set type of Game Boy Advance cartridge save data")
 	ap_cli2.add_argument("--store-rtc", action="store_true", default=False, help="store RTC register values if supported")

{FlashGBX-4.2 → flashgbx-4.4}/FlashGBX/FlashGBX_CLI.py

@@ -371,11 +371,21 @@ class FlashGBX_CLI():
 
 		elif self.CONN.INFO["last_action"] == 2: # Backup RAM
 			self.CONN.INFO["last_action"] = 0
-			if not "debug" in self.ARGS and self.CONN.GetMode() == "DMG" and self.CONN.INFO["mapper_raw"] == 252 and self.CONN.INFO["transferred"] == 131072: # Pocket Camera / 128 KiB: # 128 KiB
+			if not "debug" in self.ARGS and self.CONN.GetMode() == "DMG" and self.CONN.INFO["mapper_raw"] == 252 and self.CONN.INFO["transferred"] == 0x20000 or (self.CONN.INFO["transferred"] == 0x100000 and self.CONN.INFO["dump_info"]["header"]["ram_size_raw"] == 0x204):
 				answer = input("Would you like to extract Game Boy Camera pictures to “{:s}” now? [Y/n]: ".format(Util.formatPathOS(os.path.abspath(os.path.splitext(self.CONN.INFO["last_path"])[0]), end_sep=True) + "IMG_PC**.{:s}".format(self.ARGS["argparsed"].gbcamera_outfile_format))).strip().lower()
 				if answer != "n":
+					if self.CONN.INFO["transferred"] == 0x100000:
+						answer = int(input("A Photo! save file was detected. Please select the roll of pictures that you would like to load.\n- 1:   Current Save Data\n- 2-8: Flash Directory Slots\nLoad Roll [1-8]: "))
+						if answer == 0:
+							return
+						with open(self.CONN.INFO["last_path"], "rb") as f:
+							f.seek(0x20000 * (answer - 1))
+							file = bytearray(f.read(0x20000))
+					else:
+						file = self.CONN.INFO["last_path"]
+
 					pc = PocketCamera()
-					if pc.LoadFile(self.CONN.INFO["last_path"]) != False:
+					if pc.LoadFile(file) != False:
 						palettes = [ "grayscale", "dmg", "sgb", "cgb1", "cgb2", "cgb3" ]
 						pc.SetPalette(palettes.index(self.ARGS["argparsed"].gbcamera_palette))
 						file = os.path.splitext(self.CONN.INFO["last_path"])[0] + "/IMG_PC00.png"
@@ -571,12 +581,10 @@ class FlashGBX_CLI():
 				bad_read = True
 			
 			s += "ROM Checksum:         "
-			#Util.AGB_Global_CRC32 = 0
 			db_agb_entry = data["db"]
 			if db_agb_entry != None:
 				if data["rom_size_calc"] < 0x400000:
 					s += "In database (0x{:06X})\n".format(db_agb_entry['rc'])
-					#Util.AGB_Global_CRC32 = db_agb_entry['rc']
 				s += "ROM Size:             {:d} MiB\n".format(int(db_agb_entry['rs']/1024/1024))
 				data['rom_size'] = db_agb_entry['rs']
 			elif data["rom_size"] != 0:
@@ -606,10 +614,6 @@ class FlashGBX_CLI():
 			
 			if data['logo_correct'] and isinstance(db_agb_entry, dict) and "rs" in db_agb_entry and db_agb_entry['rs'] == 0x4000000 and not self.CONN.IsSupported3dMemory():
 				print("{:s}\nWARNING: This cartridge uses a Memory Bank Controller that may not be completely supported yet. A future version of the {:s} device firmware may add support for it.{:s}".format(ANSI.YELLOW, self.CONN.GetFullName(), ANSI.RESET))
-		
-			# if "has_rtc" in data and data["has_rtc"] is not True and "no_rtc_reason" in data:
-			# 	if data["no_rtc_reason"] == 1:
-			# 		print("{:s}NOTE: It seems that this cartridge’s Real Time Clock battery may no longer be functional and needs to be replaced.{:s}".format(ANSI.YELLOW, ANSI.RESET))
 
 		return (bad_read, s, data)
 	
@@ -624,7 +628,8 @@ class FlashGBX_CLI():
 		
 		header = self.CONN.ReadInfo()
 		self.ReadCartridge(header)
-		ret = self.CONN.DetectCartridge(limitVoltage=limitVoltage, checkSaveType=True)
+		self.CONN._DetectCartridge(args={"limitVoltage":limitVoltage, "checkSaveType":True})
+		ret = self.CONN.INFO["detect_cart"]
 		(header, _, save_type, save_chip, sram_unstable, cart_types, cart_type_id, cfi_s, _, flash_id, detected_size) = ret
 
 		# Save Type
@@ -638,6 +643,8 @@ class FlashGBX_CLI():
 			supp_cart_types = self.CONN.GetSupportedCartridgesDMG()
 		elif self.CONN.GetMode() == "AGB":
 			supp_cart_types = self.CONN.GetSupportedCartridgesAGB()
+		else:
+			raise NotImplementedError
 		
 		if len(cart_types) > 0:
 			cart_type = cart_type_id
@@ -654,6 +661,7 @@ class FlashGBX_CLI():
 
 		# Save Type
 		msg_save_type_s = ""
+		temp = ""
 		if save_chip is not None:
 			temp = "{:s} ({:s})".format(Util.AGB_Header_Save_Types[save_type], save_chip)
 		else:
@@ -695,6 +703,7 @@ class FlashGBX_CLI():
 		else:
 			if (len(flash_id.split("\n")) > 2) and ((self.CONN.GetMode() == "DMG") or ("dacs_8m" in header and header["dacs_8m"] is not True)):
 				msg_cart_type_s = "Cartridge Type: Unknown flash cartridge."
+				try_this = ""
 				if ("[     0/90]" in flash_id):
 					try_this = "Generic Flash Cartridge (0/90)"
 				elif ("[   AAA/AA]" in flash_id):
@@ -767,7 +776,7 @@ class FlashGBX_CLI():
 					print("{:s}Couldn’t determine ROM size, will use 8 MiB. It can also be manually set with the “--dmg-romsize” command line switch.{:s}".format(ANSI.YELLOW, ANSI.RESET))
 					rom_size = 8 * 1024 * 1024
 			else:
-				sizes = [ "auto", "32kb", "64kb", "128kb", "256kb", "512kb", "1mb", "2mb", "4mb", "8mb", "16mb", "32mb" ]
+				sizes = [ "auto", "32kb", "64kb", "128kb", "256kb", "512kb", "1mb", "2mb", "4mb", "8mb", "16mb", "32mb", "64mb", "128mb" ]
 				rom_size = Util.DMG_Header_ROM_Sizes_Flasher_Map[sizes.index(args.dmg_romsize) - 1]
 		
 		elif self.CONN.GetMode() == "AGB":
@@ -820,6 +829,9 @@ class FlashGBX_CLI():
 				carts = self.CONN.GetSupportedCartridgesDMG()[1]
 			elif self.CONN.GetMode() == "AGB":
 				carts = self.CONN.GetSupportedCartridgesAGB()[1]
+			else:
+				raise NotImplementedError
+
 			cart_type = 0
 			for i in range(0, len(carts)):
 				if not "names" in carts[i]: continue
@@ -895,7 +907,6 @@ class FlashGBX_CLI():
 			elif os.path.getsize(path) < 0x400:
 				print("{:s}ROM files smaller than 1 KiB are not supported.{:s}".format(ANSI.RED, ANSI.RESET))
 				return
-			#with open(path, "rb") as file: buffer = bytearray(file.read())
 
 			with open(path, "rb") as file:
 				ext = os.path.splitext(path)[1]
@@ -978,6 +989,9 @@ class FlashGBX_CLI():
 				s_mbc = " using Mapper Type 0x{:X}".format(mbc)
 		elif self.CONN.GetMode() == "AGB":
 			hdr = RomFileAGB(buffer).GetHeader()
+		else:
+			raise NotImplementedError
+
 		if not hdr["logo_correct"] and (self.CONN.GetMode() == "AGB" or (self.CONN.GetMode() == "DMG" and mbc not in (0x203, 0x205))):
 			print("{:s}Warning: The ROM file you selected will not boot on actual hardware due to invalid boot logo data.{:s}".format(ANSI.YELLOW, ANSI.RESET))
 			bootlogo = None
@@ -1021,6 +1035,7 @@ class FlashGBX_CLI():
 	def BackupRestoreRAM(self, args, header):
 		add_date_time = args.save_filename_add_datetime is True
 		rtc = args.store_rtc is True
+		cart_type = 0
 		
 		path_datetime = ""
 		if add_date_time:
@@ -1053,7 +1068,7 @@ class FlashGBX_CLI():
 				else:
 					mbc = 0x19
 
-			if args.dmg_savesize == "auto":
+			if args.dmg_savetype == "auto":
 				try:
 					if header['mapper_raw'] == 0x06: # MBC2
 						save_type = 1
@@ -1063,19 +1078,22 @@ class FlashGBX_CLI():
 						save_type = 0x102
 					elif header['mapper_raw'] == 0xFD: # TAMA5
 						save_type = 0x103
-					elif header['mapper_raw'] == 0x20: # TAMA5
+					elif header['mapper_raw'] == 0x20: # MBC6
 						save_type = 0x104
 					else:
 						save_type = header['ram_size_raw']
 				except:
-					save_type = 0x20000
+					save_type = 0
 			else:
-				sizes = [ "auto", "4k", "16k", "64k", "256k", "512k", "1m", "eeprom2k", "eeprom4k", "tama5", "4m" ]
-				save_type = args.dmg_savesize
+				sizes = [ "auto", "4k", "16k", "64k", "256k", "512k", "1m", "mbc6", "mbc7_2k", "mbc7_4k", "tama5", "sram4m", "eeprom1m", "photo" ]
+				save_type = Util.DMG_Header_RAM_Sizes_Map[sizes.index(args.dmg_savetype)]
 
 			if save_type == 0:
-				print("{:s}Unable to auto-detect the save size. Please use the “--dmg-savesize” command line switch to manually select it.{:s}".format(ANSI.RED, ANSI.RESET))
+				print("{:s}Unable to auto-detect the save size. Please use the “--dmg-savetype” command line switch to manually select it.{:s}".format(ANSI.RED, ANSI.RESET))
 				return
+
+			if save_type == 0x204:
+				cart_type = self.DetectCartridge()
 		
 		elif self.CONN.GetMode() == "AGB":
 			if args.agb_savetype == "auto":
@@ -1174,13 +1192,13 @@ class FlashGBX_CLI():
 			self.CONN.TransferData(args={ 'mode':2, 'path':path, 'mbc':mbc, 'save_type':save_type, 'rtc':rtc }, signal=self.PROGRESS.SetProgress)
 		elif args.action == "restore-save":
 			verify_write = args.no_verify_write is False
-			targs = { 'mode':3, 'path':path, 'mbc':mbc, 'save_type':save_type, 'erase':False, 'rtc':rtc, 'verify_write':verify_write }
+			targs = { 'mode':3, 'path':path, 'mbc':mbc, 'save_type':save_type, 'erase':False, 'rtc':rtc, 'verify_write':verify_write, 'cart_type':cart_type }
 			if buffer is not None:
 				targs["buffer"] = buffer
 				targs["path"] = None
 			self.CONN.TransferData(args=targs, signal=self.PROGRESS.SetProgress)
 		elif args.action == "erase-save":
-			self.CONN.TransferData(args={ 'mode':3, 'path':path, 'mbc':mbc, 'save_type':save_type, 'erase':True, 'rtc':rtc }, signal=self.PROGRESS.SetProgress)
+			self.CONN.TransferData(args={ 'mode':3, 'path':path, 'mbc':mbc, 'save_type':save_type, 'erase':True, 'rtc':rtc, 'cart_type':cart_type }, signal=self.PROGRESS.SetProgress)
 		elif args.action == "debug-test-save": # debug
 			self.ARGS["debug"] = True
 
@@ -1249,14 +1267,6 @@ class FlashGBX_CLI():
 					print("\n{:s}Done! The writable save data size is {:s} out of {:s} checked.{:s}".format(ANSI.GREEN, Util.formatFileSize(size=found_length), Util.formatFileSize(size=Util.DMG_Header_RAM_Sizes_Flasher_Map[Util.DMG_Header_RAM_Sizes_Map.index(save_type)]), ANSI.RESET))
 				elif self.CONN.GetMode() == "AGB":
 					print("\n{:s}Done! The writable save data size using save type “{:s}” is {:s}.{:s}".format(ANSI.GREEN, Util.AGB_Header_Save_Types[save_type], Util.formatFileSize(size=found_length), ANSI.RESET))
-			
-			try:
-				(_, _, cfi) = self.CONN.CheckFlashChip(limitVoltage=False)
-				if len(cfi["raw"]) > 0:
-					with open(Util.CONFIG_PATH + "/cfi.bin", "wb") as f: f.write(cfi["raw"])
-					print("CFI data was extracted to “cfi.bin”.")
-			except:
-				pass
 
 	def UpdateFirmware_PrintText(self, text, enableUI=False, setProgress=None):
 		if setProgress is not None:
@@ -1415,8 +1425,8 @@ class FlashGBX_CLI():
 			with zf.open("fw.ini") as f: ini_file = f.read()
 			ini_file = ini_file.decode(encoding="utf-8")
 			self.INI = Util.IniSettings(ini=ini_file, main_section="Firmware")
-			fw_ver = self.INI.GetValue("fw_ver")
-			fw_buildts = self.INI.GetValue("fw_buildts")
+			#fw_ver = self.INI.GetValue("fw_ver")
+			#fw_buildts = self.INI.GetValue("fw_buildts")
 		
 		print("Select the firmware to install:\n1) Lesserkuma’s FlashGBX firmware\n2) BennVenn’s Drag’n’Drop firmware\n3) BennVenn’s JoeyGUI firmware\n")
 		answer = input("Enter number 1-3: ").lower().strip()
@@ -1454,6 +1464,7 @@ class FlashGBX_CLI():
 					FWUPD = FirmwareUpdater(port=port)
 					file_name = Util.APP_PATH + "/res/fw_JoeyJr.zip"
 					with zipfile.ZipFile(file_name) as archive:
+						fw_data = None
 						if fw_choice == 1:
 							with archive.open("FIRMWARE_LK.JR") as f: fw_data = bytearray(f.read())
 						elif fw_choice == 2: