1
0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-03-28 18:06:37 +01:00

Integrate many changes from master

This commit is contained in:
2026-03-18 13:29:57 +01:00
parent b2e67880d3
commit caf833e6ac
107 changed files with 8565 additions and 2688 deletions

View File

@@ -167,8 +167,17 @@ class PipelineInfo{
updateStatus();
if (gitSha !== undefined) param.tag=gitSha;
param.config=JSON.stringify(config);
let buildname=config['root:buildname']
if (buildname){
param.suffix="-"+buildname
}
if (buildVersion !== undefined){
param.suffix="-"+buildVersion;
if (param.suffix){
param.suffix+="-"+buildVersion;
}
else{
param.suffix="-"+buildVersion;
}
}
fetchJson(API,Object.assign({
api:'start'},param))
@@ -234,7 +243,11 @@ class PipelineInfo{
}
const downloadConfig=()=>{
let name=configName;
if (isModified) name=name.replace(/[0-9]*$/,'')+formatDate(undefined,true);
const buildname=config["root:buildname"]
if (buildname && name != buildname){
name+="-"+buildname+"-";
}
name=name.replace(/[0-9]*$/,'')+formatDate(undefined,true);
name+=".json";
fileDownload(JSON.stringify(config),name);
}
@@ -521,6 +534,38 @@ class PipelineInfo{
addDescription(config,inputFrame);
initialConfig=expandedValues[0];
}
if (config.type === 'string'){
let ip=addEl('input','t'+config.type,inputFrame);
addDescription(config,inputFrame);
const buildChild=(value)=>{
if (value) {
if (config.max) {
if (value && value.length > config.max) {
value = value.substring(0, config.max);
}
}
if (config.allowed) {
let check = new RegExp("[^" + config.allowed + "]", "g");
let nv = value.replace(check, "");
if (nv != value) {
value = nv;
}
}
}
return Object.assign({},config,{key: value,value:value});
}
initialConfig=buildChild(current);
ip.value=initialConfig.value||"";
ip.addEventListener('change',(ev)=>{
let value=ev.target.value;
let cbv=buildChild(value);
if (cbv.value != value){
ev.target.value=cbv.value;
}
callback(cbv,false);
});
}
let childFrame=addEl('div','childFrame',frame);
if (initialConfig !== undefined){
callback(initialConfig,true,childFrame);