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

intermediate: xdr config handling

This commit is contained in:
wellenvogel 2021-11-21 19:40:18 +01:00
parent ef299bd9ba
commit ca55063c8e
3 changed files with 285 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/index.css
View File

@ -89,6 +89,12 @@ body{
.hidden{
display: none !important;
}
#xdrPage .content.hidden {
display: unset !important;
}
#xdrPage .category .title{
display: none;
}
.msgDetails .value {
width: 5em;
text-align: right;

11
web/index.html
View File

@ -17,6 +17,7 @@
<div id="tabs">
<div class="tab active" data-page="statusPage">Status</div>
<div class="tab" data-page="configPage">Config</div>
<div class="tab" data-page="xdrPage">XDR</div>
<div class="tab" data-page="dashboardPage">Data</div>
</div>
<div id="statusPage" class="tabPage">
@ -56,6 +57,16 @@
<button id="factoryReset">FactoryReset</button>
</div>
</div>
<div class="configForm tabPage hidden" id="xdrPage" >
<div class="configFormRows">
</div>
<div class="buttons">
<button id="resetForm">ReloadConfig</button>
<button id="changeConfig">Save&Restart</button>
<button id="loadUnassigned">Show Unmapped</button>
</div>
</div>
<div class="tabPage hidden" id="dashboardPage">
</div>

258
web/index.js
View File

@ -3,12 +3,14 @@ let lastUpdate = (new Date()).getTime();
let reloadConfig = false;
function addEl(type, clazz, parent, text) {
let el = document.createElement(type);
if (clazz) {
if (!(clazz instanceof Array)) {
clazz = clazz.split(/ */);
}
clazz.forEach(function (ce) {
el.classList.add(ce);
});
}
if (text) el.textContent = text;
if (parent) parent.appendChild(el);
return el;
@ -230,15 +232,22 @@ function checkChange(el, row) {
}
}
}
let configDefinitions;
let xdrConfig;
function createInput(configItem, frame) {
let el;
if (configItem.type === 'boolean' || configItem.type === 'list') {
el = document.createElement('select')
el=addEl('select','',frame);
el.setAttribute('name', configItem.name)
let slist = [];
if (configItem.list) {
configItem.list.forEach(function (v) {
if (v instanceof Object){
slist.push({l:v.l,v:v.v});
}
else{
slist.push({ l: v, v: v });
}
})
}
else {
@ -246,60 +255,16 @@ function createInput(configItem, frame) {
slist.push({ l: 'off', v: 'false' })
}
slist.forEach(function (sitem) {
let sitemEl = document.createElement('option');
let sitemEl = addEl('option','',el,sitem.l);
sitemEl.setAttribute('value', sitem.v);
sitemEl.textContent = sitem.l;
el.appendChild(sitemEl);
})
frame.appendChild(el);
return el;
}
if (configItem.type === 'filter') {
el = document.createElement('div');
el.classList.add('filter');
let ais = createInput({
type: 'list',
name: configItem.name + "_ais",
list: ['aison', 'aisoff']
}, el);
let mode = createInput({
type: 'list',
name: configItem.name + "_mode",
list: ['whitelist', 'blacklist']
}, el);
let sentences = createInput({
type: 'text',
name: configItem.name + "_sentences",
}, el);
let data = document.createElement('input');
data.setAttribute('type', 'hidden');
el.appendChild(data);
let changeFunction = function () {
let cv = data.value || "";
let parts = cv.split(":");
ais.value = (parts[0] == '0') ? "aisoff" : "aison";
mode.value = (parts[1] == '0') ? "whitelist" : "blacklist";
sentences.value = parts[2] || "";
return createFilterInput(configItem,frame);
}
let updateFunction = function () {
let nv = (ais.value == 'aison') ? "1" : "0";
nv += ":";
nv += (mode.value == 'blacklist') ? "1" : "0";
nv += ":";
nv += sentences.value;
data.value = nv;
let chev = new Event('change');
data.dispatchEvent(chev);
}
mode.addEventListener('change', updateFunction);
ais.addEventListener("change", updateFunction);
sentences.addEventListener("change", updateFunction);
data.addEventListener('change', function (ev) {
changeFunction();
});
data.setAttribute('name', configItem.name);
frame.appendChild(el);
return data;
if (configItem.type === 'xdr'){
return createXdrInput(configItem,frame);
}
el = document.createElement('input');
el.setAttribute('name', configItem.name)
@ -324,20 +289,186 @@ function createInput(configItem, frame) {
}
return el;
}
let configDefinitions;
function loadConfigDefinitions() {
getJson("api/capabilities")
.then(function (capabilities) {
getJson("config.json")
.then(function (defs) {
function updateSelectList(item,slist){
item.innerHTML='';
slist.forEach(function (sitem) {
let sitemEl = addEl('option','',item,sitem.l);
sitemEl.setAttribute('value', sitem.v);
})
}
function getXdrCategories(){
let rt=[];
for (let c in xdrConfig){
if (xdrConfig[c].enabled !== false){
rt.push({l:c,v:xdrConfig[c].id});
}
}
return rt;
}
function getXdrSelectors(category){
category=parseInt(category);
for (let c in xdrConfig){
let base=xdrConfig[c];
if (parseInt(base.id) == category){
return base.selector || [];
}
}
return [];
}
function getXdrFields(category){
category=parseInt(category);
for (let c in xdrConfig){
let base=xdrConfig[c];
if (parseInt(base.id) == category){
return base.fields || [];
}
}
return [];
}
function createXdrInput(configItem,frame){
let el = addEl('div','filter',frame);
let direction=createInput({
type:'list',
name: configItem.name+"_dir",
list: [
//GwXDRMappingDef::Direction
{l:'off',v:0},
{l:'bidir',v:1},
{l:'to2K',v:2},
{l:'from2K',v:3}
]
},el);
let category=createInput({
type: 'list',
name: configItem.name+"_cat",
list:getXdrCategories()
},el);
let selector=createInput({
type: 'list',
name: configItem.name+"_sel",
list:[]
},el);
let field=createInput({
type:'list',
name: configItem.name+'_field',
list: []
},el);
let imode=createInput({
type:'list',
name: configItem.name+"_imode",
list:[
//GwXDRMappingDef::InstanceMode
{l:'single',v:0},
{l:'ignore',v:1},
{l:'auto',v:2}
]
},el);
let instance=createInput({
type:'number',
name: configItem.name+"_instance",
},el);
let xdrName=createInput({
type:'text',
name: configItem.name+"_xdr"
},el);
let data = addEl('input',undefined,el);
data.setAttribute('type', 'hidden');
data.setAttribute('name', configItem.name);
let changeFunction = function () {
let parts=data.value.split(',');
direction.value=parts[1] || 0;
category.value=parts[0] || 0;
updateSelectList(selector,getXdrSelectors(category.value));
updateSelectList(field,getXdrFields(category.value));
selector.value=parts[2]||0;
field.value=parts[3]||0;
imode.value=parts[4]||0;
instance.value=parts[5]||0;
xdrName.value=parts[6]||'';
}
let updateFunction = function () {
let txt=category.value+","+direction.value+","+
selector.value+","+field.value+","+imode.value;
let instanceValue=parseInt(instance.value||0);
if (isNaN(instanceValue)) instanceValue=0;
if (instanceValue<0) instanceValue=0;
if (instanceValue>255) instanceValue=255;
txt+=","+instanceValue;
let xdr=xdrName.value.replace(/[^a-zA-Z0-9]/g,'');
txt+=","+xdr;
data.value=txt;
let ev=new Event('change');
data.dispatchEvent(ev);
}
category.addEventListener('change',updateFunction);
direction.addEventListener('change',updateFunction);
selector.addEventListener('change',updateFunction);
field.addEventListener('change',updateFunction);
imode.addEventListener('change',updateFunction);
instance.addEventListener('change',updateFunction);
xdrName.addEventListener('change',updateFunction);
data.addEventListener('change',changeFunction);
return data;
}
function createFilterInput(configItem, frame) {
let el = addEl('div','filter',frame);
let ais = createInput({
type: 'list',
name: configItem.name + "_ais",
list: ['aison', 'aisoff']
}, el);
let mode = createInput({
type: 'list',
name: configItem.name + "_mode",
list: ['whitelist', 'blacklist']
}, el);
let sentences = createInput({
type: 'text',
name: configItem.name + "_sentences",
}, el);
let data = addEl('input',undefined,el);
data.setAttribute('type', 'hidden');
let changeFunction = function () {
let cv = data.value || "";
let parts = cv.split(":");
ais.value = (parts[0] == '0') ? "aisoff" : "aison";
mode.value = (parts[1] == '0') ? "whitelist" : "blacklist";
sentences.value = parts[2] || "";
}
let updateFunction = function () {
let nv = (ais.value == 'aison') ? "1" : "0";
nv += ":";
nv += (mode.value == 'blacklist') ? "1" : "0";
nv += ":";
nv += sentences.value;
data.value = nv;
let chev = new Event('change');
data.dispatchEvent(chev);
}
mode.addEventListener('change', updateFunction);
ais.addEventListener("change", updateFunction);
sentences.addEventListener("change", updateFunction);
data.addEventListener('change', function (ev) {
changeFunction();
});
data.setAttribute('name', configItem.name);
return data;
}
function createConfigDefinitions(parent, capabilities, defs,includeXdr) {
let category;
let categoryEl;
let frame = document.querySelector('.configFormRows');
let frame = parent.querySelector('.configFormRows');
if (!frame) throw Error("no config form");
frame.innerHTML = '';
configDefinitions = defs;
defs.forEach(function (item) {
if (!item.type) return;
if ((item.category === 'xdr') !== includeXdr) return;
if (item.category != category || !categoryEl) {
let categoryFrame = addEl('div', 'category', frame);
let categoryTitle = addEl('div', 'title', categoryFrame);
@ -395,9 +526,24 @@ function loadConfigDefinitions() {
showOverlay(item.description);
});
})
}
function loadConfigDefinitions() {
getJson("api/capabilities")
.then(function (capabilities) {
getJson("config.json")
.then(function (defs) {
getJson("xdrconfig.json")
.then(function(xdr){
xdrConfig=xdr;
configDefinitions=defs;
let normalConfig=document.getElementById('configPage');
let xdrParent=document.getElementById('xdrPage');
if (normalConfig) createConfigDefinitions(normalConfig,capabilities,defs,false);
if (xdrParent) createConfigDefinitions(xdrParent,capabilities,defs,true);
resetForm();
})
})
})
.catch(function (err) { alert("unable to load config: " + err) })
}
function converterInfo() {