thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
norbert-walter 2022-04-13 09:24:44 +02:00
parent d029ad0373 1f42852c2c
commit fce5c3a937
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/xdrmappings/GwXDRMappings.h
View File

@ -183,7 +183,7 @@ class GwXDRFoundMapping : public GwBoatItemNameProvider{
return String("xdr")+getTransducerName(); return String("xdr")+getTransducerName();
}; };
virtual String getBoatItemFormat(){ virtual String getBoatItemFormat(){
return "formatXdr"+type->xdrunit; //TODO: use the type def for the correct format return "formatXdr:"+type->xdrtype+":"+type->xdrunit;
}; };
virtual ~GwXDRFoundMapping(){} virtual ~GwXDRFoundMapping(){}
}; };

3
web/index.js
View File

@ -862,6 +862,7 @@ function formatDateForFilename(usePrefix,d){
if (usePrefix){ if (usePrefix){
let fwt=document.querySelector('.status-fwtype'); let fwt=document.querySelector('.status-fwtype');
if (fwt) rt=fwt.textContent; if (fwt) rt=fwt.textContent;
rt+="_";
} }
if (! d) d=new Date(); if (! d) d=new Date();
[d.getFullYear(),d.getMonth(),d.getDate(),d.getHours(),d.getMinutes(),d.getSeconds()] [d.getFullYear(),d.getMonth(),d.getDate(),d.getHours(),d.getMinutes(),d.getSeconds()]
@ -1417,7 +1418,7 @@ function createDashboardItem(name, def, parent) {
src.setAttribute('id','source_'+name); src.setAttribute('id','source_'+name);
let u=fmt?fmt.u:' '; let u=fmt?fmt.u:' ';
if (! fmt && def.format && def.format.match(/formatXdr/)){ if (! fmt && def.format && def.format.match(/formatXdr/)){
u=def.format.replace(/formatXdr/,''); u=def.format.replace(/formatXdr:[^:]*:/,'');
} }
addEl('span','unit',footer,u); addEl('span','unit',footer,u);
return value; return value;