#40: underscore in file name, add type to xdr format

This commit is contained in:
andreas 2022-04-12 20:19:47 +02:00
parent 7d653c41ce
commit 1f42852c2c
2 changed files with 3 additions and 2 deletions

View File

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

View File

@ -862,6 +862,7 @@ function formatDateForFilename(usePrefix,d){
if (usePrefix){
let fwt=document.querySelector('.status-fwtype');
if (fwt) rt=fwt.textContent;
rt+="_";
}
if (! d) d=new Date();
[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);
let u=fmt?fmt.u:' ';
if (! fmt && def.format && def.format.match(/formatXdr/)){
u=def.format.replace(/formatXdr/,'');
u=def.format.replace(/formatXdr:[^:]*:/,'');
}
addEl('span','unit',footer,u);
return value;