pcwvanbeers/assetmgt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMXX - Updated firmwaretool to work with versions

Browse Source
This commit is contained in:
“VeLiTi”
2024-11-22 14:14:54 +01:00
parent 8b7f7920d7
commit f1a38caa86
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
assets/scripts.js
View File

@@ -99,8 +99,17 @@ async function getDeviceData(){
fw = x.substring(b,c); fw = x.substring(b,c);
fw = fw.replace(/^0+/, ''); fw = fw.replace(/^0+/, '');
} }
if (x.indexOf("FWDATE=") > 0){
var a = x.indexOf("FWDATE=");
var b = a + 7;
var c = b + 10;
fwdate = x.substring(b,c);
fwdate = fwdate.replaceAll('-', '');
}
//Check if HW is retrieved from device //Check if HW is retrieved from device
if (x.indexOf("HW=") > 0 && x.indexOf("FW=") >0){ if (x.indexOf("HW=") > 0 && x.indexOf("FW=") >0 && x.indexOf("FWDATE=") >0){
var a = x.indexOf("HW="); var a = x.indexOf("HW=");
var b = a + 3; var b = a + 3;
var c = b + 8; var c = b + 8;
@@ -118,8 +127,8 @@ async function getDeviceData(){
sw = 'R'+f; sw = 'R'+f;
} }
$fw_name = 'Firmware_'+fw+'_'+sw; fw_name = fwdate+'_Firmware_'+fw+'_'+sw;
console.log($fw_name); console.log(fw_name);
getServiceID().then(firmwareUpdate); getServiceID().then(firmwareUpdate);
progressBar("80", "checking for available firmware", "#04AA6D"); progressBar("80", "checking for available firmware", "#04AA6D");
setTimeout(checkAvailableFirmware, 5000); setTimeout(checkAvailableFirmware, 5000);
@@ -134,7 +143,7 @@ async function getDeviceData(){
function firmwareUpdate(data){ function firmwareUpdate(data){
var serialnumber = serial; var serialnumber = serial;
var action = '/v2/products_software/sn='+serialnumber+'&version='+$fw_name; var action = '/v2/products_software/sn='+serialnumber+'&version='+fw_name;
var url = link+action; var url = link+action;
var bearer = 'Bearer ' + data; var bearer = 'Bearer ' + data;

15
equipment.php
View File

@@ -233,19 +233,10 @@ $view .= '<div class="content-block">
<tr> <tr>
<td style="width:25%;">'.$equipment_label5.'</td> <td style="width:25%;">'.$equipment_label5.'</td>
<td>'.$responses->hw_version.'</td> <td>'.$responses->hw_version.'</td>
</tr>'; </tr>
//SHOW SOFTWARE NAME WHEN AVAILABLE <tr>
$software_name = '';
if (isset($products_software) && $products_software !=''){
foreach ($products_software as $products_soft){
if ($products_soft->version == $responses->sw_version){
$software_name = ' - '.$products_soft->software;
}
}
}
$view .= ' <tr>
<td style="width:25%;">'.$equipment_label6.'</td> <td style="width:25%;">'.$equipment_label6.'</td>
<td>'.$responses->sw_version.$software_name.'</td> <td>'.$responses->sw_version.'</td>
</tr>'; </tr>';
//SHOW ONLY SW_UPGRADE WHEN SET //SHOW ONLY SW_UPGRADE WHEN SET
if (isset($products_software) && $products_software !=''){ if (isset($products_software) && $products_software !=''){