rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved version mismatch message

Browse source
This commit is contained in:
Joel Collins 2020-05-18 16:22:51 +01:00
parent 35a5a45ae7
commit 5d6f85c374
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/viewComponents/connectDisplay.vue
View file

@ -349,18 +349,17 @@ export default {
serverVersionMajor != clientVersionMajor serverVersionMajor != clientVersionMajor
) { ) {
var versionWarning = `Client and microscope versions do not match.\ var versionWarning = `Client and microscope versions do not match.\
Consider updating your microscope software.\ Please update your microscope software.\
Some functionality may currently be broken.<br><br> \
<b>Client version:</b> ${clientVersion}<br> \ <b>Client version:</b> ${clientVersion}<br> \
<b>Server version:</b> ${serverVersion}<br><br>`; <b>Server version:</b> ${serverVersion}<br><br>`;
if (serverVersion < 1.1) { if (serverVersion < 1.1) {
versionWarning = versionWarning =
versionWarning + versionWarning +
"You may need to install a never server version on a clean SD card."; "You will need to install a newer server version on a clean SD card.";
} else { } else {
versionWarning = versionWarning =
versionWarning + versionWarning +
"Try running 'ofm upgrade' on your microscope."; "Run <b><tt>ofm update</tt></b> and then <b><tt>ofm upgrade</tt></b> on your microscope.";
} }
this.modalDialog("Version mismatch", versionWarning); this.modalDialog("Version mismatch", versionWarning);
} }