diff --git a/WIZMakeCMD.py b/WIZMakeCMD.py index e36be0b..ed1ed79 100644 --- a/WIZMakeCMD.py +++ b/WIZMakeCMD.py @@ -20,7 +20,7 @@ "W7500-S2E", "W7500P-S2E", ] -SECURITY_DEVICE = ["WIZ510SSL", "WIZ5XXSR-RP", "WIZ5XXSR-RP_E-SAVE"] +SECURITY_DEVICE = ["WIZ510SSL", "WIZ5XXSR-RP", "WIZ5XXSR-RP_E-SAVE", "W55RP20-S2E", "W232N"] TWO_PORT_DEV = ["WIZ752SR-12x", "WIZ752SR-120", "WIZ752SR-125"] """ @@ -165,7 +165,7 @@ def search(self, mac_addr, idcode, devname, version, devstatus=None): if 'WIZ510SSL' in devname: for cmd in cmd_wiz510ssl: cmd_list.append([cmd, ""]) - elif 'WIZ5XXSR' in devname: + elif 'WIZ5XXSR' in devname or 'W55RP20-S2E' in devname or 'W232N' in devname: print(f"search::devstatus={devstatus}") if devstatus == 'BOOT': for cmd in cmd_1p_boot: @@ -233,7 +233,7 @@ def setcommand(self, mac_addr, idcode, set_pw, command_list, param_list, devname if 'WIZ510SSL' in devname: for cmd in cmd_wiz510ssl: cmd_list.append([cmd, ""]) - elif 'WIZ5XXSR' in devname: + elif 'WIZ5XXSR' in devname or 'W55RP20-S2E' in devname or 'W232N' in devname: if status != "BOOT": for cmd in cmd_wiz5xxsr: cmd_list.append([cmd, ""]) diff --git a/main_gui.py b/main_gui.py index 0c38987..f11d6a6 100644 --- a/main_gui.py +++ b/main_gui.py @@ -621,7 +621,7 @@ def object_config_for_device(self): self.radiobtn_group_s0.hide() self.radiobtn_group_s1.hide() self.group_dtrdsr.show() - if "WIZ5XXSR" in self.curr_dev: + if 'WIZ5XXSR' in self.curr_dev or 'W55RP20-S2E' in self.curr_dev or 'W232N' in self.curr_dev: self.groupbox_ch1_timeout.show() self.groupbox_ch1_timeout.setEnabled(True) else: @@ -643,7 +643,7 @@ def object_config_for_device(self): self.ch1_mqtts_client.setEnabled(True) # Current bank (RO) self.group_current_bank.show() - if "WIZ5XXSR" in self.curr_dev: + if 'WIZ5XXSR' in self.curr_dev or 'W55RP20-S2E' in self.curr_dev or 'W232N' in self.curr_dev: self.group_current_bank.hide() # self.combobox_current_bank.setEnabled(True) else: @@ -741,7 +741,7 @@ def general_tab_config(self): # self.logger.debug(f'totalTab: {len(self.generalTab)}, currentTab: {self.generalTab.currentIndex()}') # self.generalTab.insertTab(2, self.userio_tab, self.userio_tab_text) # self.generalTab.setTabEnabled(2, True) - if "WIZ5XXSR" in self.curr_dev: + if 'WIZ5XXSR' in self.curr_dev or 'W55RP20-S2E' in self.curr_dev or 'W232N' in self.curr_dev: # if len(self.generalTab) == 4: # # Basic settings / User I/O / Options / MQTT Options / Certificate manager # self.generalTab.insertTab(2, self.userio_tab, self.userio_tab_text) @@ -1787,7 +1787,7 @@ def fill_devinfo(self, dev_data): if "BA" in dev_data and dev_data["BA"].isdigit(): self.combobox_current_bank.setCurrentIndex(int(dev_data["BA"])) # SSL Timeout - if "WIZ5XXSR" in self.curr_dev: + if 'WIZ5XXSR' in self.curr_dev or 'W55RP20-S2E' in self.curr_dev or 'W232N' in self.curr_dev: pass # if 'UF' in dev_data: # self.combobox_current_bank.setCurrentIndex(int(dev_data['UF'])) @@ -2068,7 +2068,7 @@ def get_object_value(self): else: setcmd["CE"] = "0" # 2022.05.10 add option - if "WIZ5XXSR" in self.curr_dev: + if 'WIZ5XXSR' in self.curr_dev or 'W55RP20-S2E' in self.curr_dev or 'W232N' in self.curr_dev: # Bank setting # setcmd['UF'] = str(self.combobox_current_bank.currentIndex()) # Add ssl timeout option @@ -2379,8 +2379,8 @@ def firmware_file_open(self): if self.curr_dev in SECURITY_DEVICE: self.logger.info("SECURITY_DEVICE update") - if "WIZ5XXSR" in self.curr_dev: - self.logger.info("WIZ5XXSR update") + if 'WIZ5XXSR' in self.curr_dev or 'W55RP20-S2E' in self.curr_dev or 'W232N' in self.curr_dev: + self.logger.info(f'{self.curr_dev} update') self.firmware_update(self.fw_filename, self.fw_filesize) else: # Get current bank number diff --git a/version b/version index 102bb5e..eac1e0a 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.5.5.3 +1.5.6