V2.0

Improved time-out handling

Author: vanvught

FirmwareUpdateUI/build.num

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed Feb 23 16:54:04 CET 2022
-build.number=2
+#Mon Mar 14 14:23:59 CET 2022
+build.number=3

FirmwareUpdateUI/src/org/gd32/dmx/FirmwareInstallation.java

@@ -58,22 +58,22 @@ public class FirmwareInstallation extends JDialog {
 	private JCheckBox chckbxReboot;
 	private JTextField textVersion;
 
-	public FirmwareInstallation(Node node, FirmwareUpdateUI remoteConfig) throws Exception {
+	public FirmwareInstallation(Node node, FirmwareUpdateUI firmwareUpdateUI) throws Exception {
 		InitComponents();
 		CreateEvents();
 
 		setTitle("Workflow Firmware Installation");
 		textNodeInfo.setText(node.toString());
 
-		remoteConfig.sendUDP(node, "!tftp#1");
+		firmwareUpdateUI.sendUDP(node, "!tftp#1");
 
 		try {
 			Thread.sleep(500);
 		} catch (InterruptedException e1) {
 			e1.printStackTrace();
 		}
 
-		final String tftpServer = remoteConfig.requestUDP(node, "?tftp#");
+		final String tftpServer = firmwareUpdateUI.requestUDP(node, "?tftp#");
 
 		chckbxTFTPOn.setSelected(tftpServer.contains("On"));
 
@@ -96,15 +96,15 @@ public void run() {
 
 						System.out.println("TFTP Client Closed with result " + frame.result());
 
-						remoteConfig.sendUDP(node, "!tftp#0");
+						firmwareUpdateUI.sendUDP(node, "!tftp#0");
 
 						try {
 							Thread.sleep(500);
 						} catch (InterruptedException e1) {
 							e1.printStackTrace();
 						}
 
-						final String tftpServer = remoteConfig.requestUDP(node, "?tftp#");
+						final String tftpServer = firmwareUpdateUI.requestUDP(node, "?tftp#");
 
 						chckbxTFTPOff.setSelected(!tftpServer.contains("On"));
 
@@ -113,7 +113,7 @@ public void run() {
 						} else {
 							if (frame.result() > 0) {
 								chckbxReboot.setSelected(true);								
-								remoteConfig.sendUDP(node, "?reboot##");
+								firmwareUpdateUI.sendUDP(node, "?reboot##");
 								String version;
 								String progress = "";
 
@@ -126,13 +126,13 @@ public void run() {
 									} catch (InterruptedException e) {
 										e.printStackTrace();
 									}
-									version = remoteConfig.requestUDP(node, "?version#");
+									version = firmwareUpdateUI.requestUDP(node, "?version#");
 									System.out.println("[" + version + "]");
 								} while (version.contains("tftp") || (version.contains("ERROR")));
 
 								textVersion.setForeground(Color.BLUE);
 								textVersion.setText(version.substring(version.indexOf("[")));
-								remoteConfig.constructTree();
+								firmwareUpdateUI.constructTree();
 							}
 						}
 					}

FirmwareUpdateUI/src/org/gd32/dmx/FirmwareUpdateUI.java

@@ -456,7 +456,19 @@ private void doSwitchToBootLoader(Node node) {
 			if (isEnabled) {
 				sendUDP(node, "?reboot##");
 				try {
-					Thread.sleep(2000);
+					String version;
+					Graphics g = getGraphics();
+					do {
+						textArea.append("|");
+						update(g);
+						Thread.sleep(1000);
+						textArea.append("/");
+						update(g);
+						version = requestUDP(node, "?version#");
+						textArea.append("-");
+						update(g);
+					} while (version.contains("ERROR"));
+					textArea.setText("");
 					constructTree();
 				} catch (InterruptedException e) {
 					e.printStackTrace();
@@ -471,7 +483,19 @@ private void doReboot(Node node) {
 			try {
 				sendUDP(node, "?reboot##");
 				JOptionPane.showMessageDialog(null, "Reboot message has been sent.");
-				Thread.sleep(2000);
+				String version;
+				Graphics g = getGraphics();
+				do {
+					textArea.append("|");
+					update(g);
+					Thread.sleep(1000);
+					textArea.append("/");
+					update(g);
+					version = requestUDP(node, "?version#");
+					textArea.append("-");
+					update(g);
+				} while (version.contains("ERROR"));
+				textArea.setText("");
 				constructTree();
 			} catch (Exception e) {
 				e.printStackTrace();