diff --git a/FlashGBX/FlashGBX.py b/FlashGBX/FlashGBX.py index dd10565..42ca428 100644 --- a/FlashGBX/FlashGBX.py +++ b/FlashGBX/FlashGBX.py @@ -11,7 +11,7 @@ hw_devices = [hw_GBxCartRW] APPNAME = "FlashGBX" -VERSION_PEP440 = "1.2" +VERSION_PEP440 = "1.2.1" VERSION = "v{:s}".format(VERSION_PEP440) class FlashGBX(QtWidgets.QWidget): diff --git a/FlashGBX/hw_GBxCartRW.py b/FlashGBX/hw_GBxCartRW.py index 1f94276..46b5e90 100644 --- a/FlashGBX/hw_GBxCartRW.py +++ b/FlashGBX/hw_GBxCartRW.py @@ -475,15 +475,13 @@ def set_mode(self, command): buffer = format(command, 's') self.write(buffer) if command in (self.DEVICE_CMD["VOLTAGE_3_3V"], self.DEVICE_CMD["VOLTAGE_5V"]): - #time.sleep(0.01) + #time.sleep(0.005) pass def set_number(self, number, command): buffer = format(command, 's') + format(int(number), 'x') + '\x00' self.write(buffer) - if command in (self.DEVICE_CMD["SET_START_ADDRESS"]): - #time.sleep(0.005) - pass + time.sleep(0.005) def EnableRAM(self, mbc=1, enable=True): if enable: @@ -1181,7 +1179,7 @@ def _TransferData(self, args, signal): # called by thread self.gbx_flash_write_data_bytes(self.DEVICE_CMD["GBA_FLASH_WRITE_BYTE"], data) else: # EEPROM / SRAM - self.gbx_flash_write_data_bytes(write_command, data) + self.gbx_flash_write_data_bytes(self.DEVICE_CMD[write_command], data) self.SetProgress({"action":"WRITE", "bytes_added":len(data)}) self.wait_for_ack() diff --git a/FlashGBX/res/config.zip b/FlashGBX/res/config.zip index bb2c0de..33b21c4 100644 Binary files a/FlashGBX/res/config.zip and b/FlashGBX/res/config.zip differ diff --git a/README.md b/README.md index 0b9df5e..2df57c9 100644 --- a/README.md +++ b/README.md @@ -267,7 +267,8 @@ The author would like to thank the following very kind people for their help and - Added a firmware check when writing to cartridges with flash chips manufactured by Sharp (unsupported by GBxCart RW firmware R25) - Added optional verification of written data after ROM flashing *(thanks marv17 for the suggestion)* -### v1.2 (released 2021-01-16) +### v1.2/v1.2.1 (released 2021-01-16) - Fixed a bug introduced in v1.1 that broke MBC3 handling *(thanks marv17 for reporting)* - Will now default back to 5V for Game Boy cartridges after unsuccessful flash chip auto-detection - Added support for DIY carts with the AT49F040 flash chip *(thanks howie0210)* +- Minor bug fixes diff --git a/setup.py b/setup.py index 11b5644..639429f 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="FlashGBX", - version="1.2", + version="1.2.1", author="Lesserkuma", description="A GUI application that can read and write Game Boy and Game Boy Advance cartridge data. Currently supports the GBxCart RW hardware device by insideGadgets.", url="https://github.com/lesserkuma/FlashGBX",