From 1ea461b0eb7c9daae4eff0e48ab454ef23cf119b Mon Sep 17 00:00:00 2001
From: Christian Hammacher <chr.hammacher@gmail.com>
Date: Fri, 14 Apr 2023 11:01:41 +0200
Subject: [PATCH] Fixed DWC version display on Settings page

Changed version table layout a bit as well
Incompatible versions are now dumped to the JS console
---
 .../dialogs/IncompatibleVersionsDialog.vue      | 13 ++++++++-----
 .../panels/SettingsElectronicsPanel.vue         | 17 +++++++++++------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/components/dialogs/IncompatibleVersionsDialog.vue b/src/components/dialogs/IncompatibleVersionsDialog.vue
index dd032e2a5..c13672ac2 100644
--- a/src/components/dialogs/IncompatibleVersionsDialog.vue
+++ b/src/components/dialogs/IncompatibleVersionsDialog.vue
@@ -52,19 +52,22 @@ export default Vue.extend({
 					if (mainboardVersion) {
 						// Check expansion board firmware versions
 						for (const board of store.state.machine.model.boards) {
-							if (board.canAddress && semver.compare(mainboardVersion, board.firmwareVersion) !== 0) {
+							if (board.canAddress && board.firmwareVersion && semver.compare(mainboardVersion, board.firmwareVersion) !== 0) {
+								console.warn(`Expansion board #${board.canAddress} version mismatch (MB ${mainboardVersion} != EXP ${board.firmwareVersion}`);
 								versionMismatch = true;
 							}
 						}
 
 						// Check DSF version
-						if (!versionMismatch && store.state.machine.model.state.dsfVersion !== null) {
-							versionMismatch = semver.compare(mainboardVersion, store.state.machine.model.state.dsfVersion) !== 0;
+						if (!versionMismatch && store.state.machine.model.state.dsfVersion !== null && semver.compare(mainboardVersion, store.state.machine.model.state.dsfVersion) !== 0) {
+							console.warn(`DSF version mismatch (MB ${mainboardVersion} != DSF ${store.state.machine.model.state.dsfVersion}`);
+							versionMismatch = true;
 						}
 
 						// Check DWC version
-						if (!versionMismatch) {
-							versionMismatch = semver.compare(mainboardVersion, packageInfo.version) !== 0;
+						if (!versionMismatch && semver.compare(mainboardVersion, packageInfo.version) !== 0) {
+							console.warn(`DWC version mismatch (MB ${mainboardVersion} != DWC ${packageInfo.version}`);
+							versionMismatch = true;
 						}
 					}
 
diff --git a/src/components/panels/SettingsElectronicsPanel.vue b/src/components/panels/SettingsElectronicsPanel.vue
index fde05e1fc..dcc74d0e9 100644
--- a/src/components/panels/SettingsElectronicsPanel.vue
+++ b/src/components/panels/SettingsElectronicsPanel.vue
@@ -1,3 +1,10 @@
+<style scoped>
+th {
+	padding: 0 16px;
+	text-align: left;
+}
+</style>
+
 <template>
 	<v-card outlined>
 		<v-card-title>
@@ -43,7 +50,7 @@
 						Duet WiFi Server
 					</td>
 					<td>
-						<!-- n/a -->
+						{{ $t("generic.noValue") }}
 					</td>
 					<td>
 						{{ wifiVersion }}
@@ -72,18 +79,16 @@
 						DWC
 					</td>
 					<td :title="$t('panel.settingsAbout.buildDateTime', [buildDateTime])">
-						{{ dsfVersion }}
+						{{ dwcVersion }}
 					</td>
 				</tr>
 			</tbody>
-			<tfoot>
-				<upload-btn v-if="!isRestConnector || !isDuetFirmware" target="update" color="primary"
-							class="mt-3 d-flex justify-center" />
-			</tfoot>
 		</v-simple-table>
 		<v-card-text v-else>
 			{{ $t("panel.settingsElectronics.notConnected") }}
 		</v-card-text>
+
+		<upload-btn v-if="!isRestConnector || !isDuetFirmware" class="my-3 d-flex justify-center" target="update" color="primary" />
 	</v-card>
 </template>