fix firmware parsing

Author: madgrizzle

DataStructures/data.py

@@ -38,7 +38,7 @@ class Data:
     Version Updater
     '''
     lastChecked = -1
-    pyInstallCurrentVersion = 0.912
+    pyInstallCurrentVersion = 0.913
     pyInstallUpdateAvailable = False
     pyInstallUpdateBrowserUrl = ""
     pyInstallUpdateVersion = 0

WebPageProcessor/webPageProcessor.py

@@ -484,11 +484,12 @@ def createWebPage(self, pageID, isMobile, args):
             )
             return page, "Open Board", False, "medium", "content", "footerSubmit"
         elif pageID == "about":
+            version = self.data.pyInstallCurrentVersion
             if isMobile:
                 pageName = "about.html"
             else:
                 pageName = "about.html"
-            page = render_template(pageName, pageID="about")
+            page = render_template(pageName, pageID="about", version=version)
             return page, "About", False, "medium", "content", False
         elif pageID == "gettingStarted":
             if isMobile:

config/config.py

@@ -597,18 +597,30 @@ def parseFirmwareVersions(self):
         path = home+"/firmware/madgrizzle/*.hex"
         for filename in glob.glob(path):
             version = filename.split("-")
-            version = version[1].split(".hex")
-            self.data.customFirmwareVersion = version[0]
+            maxIndex = len(version)-1
+            if maxIndex >= 0:
+                version = version[maxIndex].split(".hex")
+                self.data.customFirmwareVersion = version[0]
+            else:
+                self.data.customFirmwareVersion = "n/a"
         path = home+"/firmware/maslowcnc/*.hex"
         for filename in glob.glob(path):
             version = filename.split("-")
-            version = version[1].split(".hex")
-            self.data.stockFirmwareVersion = version[0]
+            maxIndex = len(version)-1
+            if maxIndex >= 0:
+                version = version[maxIndex].split(".hex")
+                self.data.stockFirmwareVersion = version[0]
+            else:
+                self.data.stockFirmwareVersion = "n/a"
         path = home+"/firmware/holey/*.hex"
         for filename in glob.glob(path):
             version = filename.split("-")
-            version = version[1].split(".hex")
-            self.data.holeyFirmwareVersion = version[0]
+            maxIndex = len(version)-1
+            if maxIndex >= 0:
+                version = version[maxIndex].split(".hex")
+                self.data.holeyFirmwareVersion = version[0]
+            else:
+                self.data.holeyFirmwareVersion = "n/a"
 
     def processChange(self, key, value):
         ### TODO: This does not currently fire on bools ##

main.py

@@ -7,7 +7,6 @@
 import os
 
 
-
 monkey.patch_all()
 
 import schedule

templates/about.html

@@ -4,7 +4,7 @@
   <div class="card">
       <div class="card-body">
           <h2>WebControl</h2>
-          <p>Version 0.904</p>
+          <p>Version v{{version}}</p>
           <h4 class="mt-0 mb-2">Webcontrol is licensed under the&nbsp;GNU General Public License v3.0</h4>
           <p class="mb-0 text-gray text-small pr-2">Permissions of this strong copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights.</p>
           <p class="mb-0 text-gray text-small pr-2"><a href="https://www.github.com/madgrizzle/webcontrol">https://www.github.com/madgrizzle/webcontrol</a></p>

templates/actions.html

@@ -15,9 +15,6 @@
 		<div class="card">
 			<div class="card-body">
 				<h4 class="card-title">Diagnostics/Maintenance</h4>
-				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="action('returnToCenter');$('#contentModal').modal('hide');">Return to Center</button>
-				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="action('resetChainLengths');$('#contentModal').modal('hide');">Reset Chain Lengths</button>
-				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="action('moveToDefault');$('#contentModal').modal('hide');">Move to Default Location</button>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="action('testMotors');$('#contentModal').modal('hide');">Test Motors/Encoders</button>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="action('queryCamera');$('#contentModal').modal('hide');">Query Camera</button>
 				<a class="btn btn-lg btn-block btn-secondary" href="downloadDiagnostics?rnd=1" onClick="this.href=this.href.split('?')[0]+'?rnd='+new Date().getTime()" target="_blank">Download Diagnostics File</a>
@@ -26,8 +23,6 @@ <h4 class="card-title">Diagnostics/Maintenance</h4>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="action('clearLogs');$('#contentModal').modal('hide');">Clear Log Files</button>
 				<button type="button" class="btn btn-lg btn-block btn-danger" onclick="action('shutdown');$('#contentModal').modal('hide');">{{'Shutdown WebControl/WebMCP' if docker else 'Shutdown WebControl'}}</button>
 				<button type="button" class="btn btn-lg btn-block {{'btn-primary' if updateAvailable else 'btn-secondary'}}" onclick="action('updatePyInstaller');$('#contentModal').modal('hide');" {{'' if updateAvailable else 'disabled'}}>Update WebControl: {{updateRelease}}</button>
-
-
 			</div>
 		</div>
 	</div>
@@ -42,7 +37,9 @@ <h4 class="card-title">Calibration/Setup</h4>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="requestPage('triangularCalibration');$('#contentModal').modal('hide');">Triangular Calibration</button>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" {{'' if enableCustom else 'data-toggle="tooltip" title="Custom Firmware Required"' | safe}} onclick="requestPage('opticalCalibration');$('#contentModal').modal('hide');" {{'' if enableCustom else 'disabled'}}>Optical Calibration</button>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" {{'' if enableHoley else 'data-toggle="tooltip" title="Holey Firmware Required"' | safe}} onclick="requestPage('holeyCalibration');$('#contentModal').modal('hide');" {{'' if enableHoley else 'disabled'}}>Holey Calibration</button>
-				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="requestPage('pidTuning');$('#contentModal').modal('hide');">PID Tuning</button>
+				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="action('returnToCenter');$('#contentModal').modal('hide');">Return to Center</button>
+				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="action('resetChainLengths');$('#contentModal').modal('hide');">Reset Chain Lengths</button>
+				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="action('moveToDefault');$('#contentModal').modal('hide');">Move to Default Location</button>
 			</div>
 		</div>
 	</div>
@@ -57,6 +54,7 @@ <h4 class="card-title">Controller</h4>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="action('wipeEEPROM','Settings');$('#contentModal').modal('hide');">Wipe Controller Settings</button>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="action('wipeEEPROM','Maslow');$('#contentModal').modal('hide');">Wipe Controller Positional Data</button>
 				<button type="button" class="btn btn-lg btn-block btn-secondary" onclick="action('wipeEEPROM','All');$('#contentModal').modal('hide');">Wipe Controller EEPROM</button>
+                <button type="button" class="btn btn-lg btn-block btn-secondary" onclick="requestPage('pidTuning');$('#contentModal').modal('hide');">PID Tuning (Advanced)</button>
  			</div>
 		</div>
 	</div>