diff --git a/FlashGBX/FlashGBX_GUI.py b/FlashGBX/FlashGBX_GUI.py index 94b7fc2..2fe4e87 100644 --- a/FlashGBX/FlashGBX_GUI.py +++ b/FlashGBX/FlashGBX_GUI.py @@ -659,7 +659,7 @@ class FlashGBX_GUI(QtWidgets.QWidget): text = "A firmware update for your {:s} device is available. Do you want to update now?".format(dev.GetFullName()) msgbox = QtWidgets.QMessageBox(parent=self, icon=QtWidgets.QMessageBox.Information, windowTitle="{:s} {:s}".format(APPNAME, VERSION), text=text, standardButtons=QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No, defaultButton=QtWidgets.QMessageBox.Yes) cb = QtWidgets.QCheckBox("Ignore firmware updates", checked=dontShowAgain) - msgbox.setCheckBox(cb) + #msgbox.setCheckBox(cb) answer = msgbox.exec() if dev.FW_UPDATE_REQ: if answer == QtWidgets.QMessageBox.Yes: diff --git a/FlashGBX/fw_GBxCartRW_v1_4.py b/FlashGBX/fw_GBxCartRW_v1_4.py index 1fe2855..1d7f0fc 100644 --- a/FlashGBX/fw_GBxCartRW_v1_4.py +++ b/FlashGBX/fw_GBxCartRW_v1_4.py @@ -292,6 +292,8 @@ class FirmwareUpdaterWindow(QtWidgets.QDialog): if answer == QtWidgets.QMessageBox.Cancel: return self.btnUpdate.setEnabled(False) self.btnClose.setEnabled(False) + self.optDevicePCBVer14.setEnabled(False) + self.optDevicePCBVer14a.setEnabled(False) while True: ret = self.FWUPD.WriteFirmware(file_name, self.SetStatus) @@ -299,6 +301,8 @@ class FirmwareUpdaterWindow(QtWidgets.QDialog): text = "The firmware update is complete!" self.btnUpdate.setEnabled(True) self.btnClose.setEnabled(True) + self.optDevicePCBVer14.setEnabled(True) + self.optDevicePCBVer14a.setEnabled(True) msgbox = QtWidgets.QMessageBox(parent=self, icon=QtWidgets.QMessageBox.Information, windowTitle="FlashGBX", text=text, standardButtons=QtWidgets.QMessageBox.Ok) answer = msgbox.exec() self.DEVICE = None @@ -308,6 +312,8 @@ class FirmwareUpdaterWindow(QtWidgets.QDialog): text = "The firmware update is has failed. Please try again." self.btnUpdate.setEnabled(True) self.btnClose.setEnabled(True) + self.optDevicePCBVer14.setEnabled(True) + self.optDevicePCBVer14a.setEnabled(True) msgbox = QtWidgets.QMessageBox(parent=self, icon=QtWidgets.QMessageBox.Critical, windowTitle="FlashGBX", text=text, standardButtons=QtWidgets.QMessageBox.Ok) answer = msgbox.exec() return False @@ -315,6 +321,8 @@ class FirmwareUpdaterWindow(QtWidgets.QDialog): text = "The firmware update file is corrupted. Please re-install the application." self.btnUpdate.setEnabled(True) self.btnClose.setEnabled(True) + self.optDevicePCBVer14.setEnabled(True) + self.optDevicePCBVer14a.setEnabled(True) msgbox = QtWidgets.QMessageBox(parent=self, icon=QtWidgets.QMessageBox.Critical, windowTitle="FlashGBX", text=text, standardButtons=QtWidgets.QMessageBox.Ok) answer = msgbox.exec() return False @@ -326,4 +334,6 @@ class FirmwareUpdaterWindow(QtWidgets.QDialog): if enableUI: self.btnUpdate.setEnabled(True) self.btnClose.setEnabled(True) + self.optDevicePCBVer14.setEnabled(True) + self.optDevicePCBVer14a.setEnabled(True) self.APP.QT_APP.processEvents() diff --git a/FlashGBX/hw_GBxCartRW.py b/FlashGBX/hw_GBxCartRW.py index bab8673..e6dd917 100644 --- a/FlashGBX/hw_GBxCartRW.py +++ b/FlashGBX/hw_GBxCartRW.py @@ -17,6 +17,7 @@ class GbxDevice: DEVICE_NAME = "GBxCart RW" DEVICE_MIN_FW = 1 DEVICE_MAX_FW = 7 + DEVICE_LATEST_FW_TS = { 5:1653902765, 6:1653902765 } DEVICE_CMD = { "NULL":0x30, @@ -340,7 +341,7 @@ class GbxDevice: def FirmwareUpdateAvailable(self): if self.FW["pcb_ver"] not in (5, 6): return False - return (self.FW["pcb_ver"] in (4, 5, 6) and self.FW["fw_ver"] < self.DEVICE_MAX_FW) + return (self.FW["pcb_ver"] in (4, 5, 6) and self.FW["fw_ts"] < self.DEVICE_LATEST_FW_TS[self.FW["pcb_ver"]]) def GetFirmwareUpdaterClass(self): if self.FW["pcb_ver"] == 4: # v1.3 diff --git a/FlashGBX/res/config.zip b/FlashGBX/res/config.zip index d327de9..d87f9f2 100644 Binary files a/FlashGBX/res/config.zip and b/FlashGBX/res/config.zip differ diff --git a/FlashGBX/res/fw_GBxCart_RW_v1_4.zip b/FlashGBX/res/fw_GBxCart_RW_v1_4.zip index e6df47a..9ea2e39 100644 Binary files a/FlashGBX/res/fw_GBxCart_RW_v1_4.zip and b/FlashGBX/res/fw_GBxCart_RW_v1_4.zip differ