mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-07 00:09:51 +03:00
Merge branch 'dev_' into dev_no_master_thermostat
This commit is contained in:
MichaelDvP
@@ -302,7 +302,7 @@ const EMSESP_BOARDPROFILE_ENDPOINT = REST_ENDPOINT_ROOT + 'boardProfile'
|
||||
const EMSESP_WRITE_VALUE_ENDPOINT = REST_ENDPOINT_ROOT + 'writeValue'
|
||||
const EMSESP_WRITE_SENSOR_ENDPOINT = REST_ENDPOINT_ROOT + 'writeSensor'
|
||||
const EMSESP_WRITE_ANALOG_ENDPOINT = REST_ENDPOINT_ROOT + 'writeAnalog'
|
||||
const EMSESP_EXCLUDE_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'excludeEntities'
|
||||
const EMSESP_MASKED_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'maskedEntities'
|
||||
const EMSESP_RESET_CUSTOMIZATIONS_ENDPOINT = REST_ENDPOINT_ROOT + 'resetCustomizations'
|
||||
|
||||
settings = {
|
||||
@@ -343,19 +343,19 @@ const emsesp_devices = {
|
||||
i: 1,
|
||||
d: 23,
|
||||
p: 77,
|
||||
s: 'Thermostat1',
|
||||
s: 'Thermostat (RC20/Moduline 300)',
|
||||
},
|
||||
{
|
||||
i: 2,
|
||||
d: 8,
|
||||
p: 123,
|
||||
s: 'Boiler',
|
||||
s: 'Boiler (Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i)',
|
||||
},
|
||||
{
|
||||
i: 4,
|
||||
d: 16,
|
||||
p: 165,
|
||||
s: 'Thermostat2',
|
||||
s: 'Thermostat (RC100/Moduline 1000/1010)',
|
||||
},
|
||||
],
|
||||
}
|
||||
@@ -376,7 +376,7 @@ const emsesp_coredata = {
|
||||
{
|
||||
i: 1,
|
||||
t: 'Thermostat',
|
||||
s: 'Thermostat1',
|
||||
s: 'Thermostat',
|
||||
b: '',
|
||||
n: 'RC20/Moduline 300',
|
||||
d: 23,
|
||||
@@ -387,7 +387,7 @@ const emsesp_coredata = {
|
||||
{
|
||||
i: 4,
|
||||
t: 'Thermostat',
|
||||
s: 'Thermostat2',
|
||||
s: 'Thermostat',
|
||||
b: 'Buderus',
|
||||
n: 'RC100/Moduline 1000/1010',
|
||||
d: 16,
|
||||
@@ -449,36 +449,36 @@ const status = {
|
||||
|
||||
// Dashboard data
|
||||
const emsesp_devicedata_1 = {
|
||||
label: 'RC20/Moduline 300',
|
||||
label: 'Thermostat: RC20/Moduline 300',
|
||||
data: [
|
||||
{
|
||||
v: '(0)',
|
||||
u: 0,
|
||||
n: 'error code',
|
||||
n: '00error code',
|
||||
c: '',
|
||||
},
|
||||
{
|
||||
v: '14:54:39 06/06/2021',
|
||||
u: 0,
|
||||
n: 'date/time',
|
||||
n: '00date/time',
|
||||
c: '',
|
||||
},
|
||||
{
|
||||
v: 18,
|
||||
u: 1,
|
||||
n: 'hc1 selected room temperature',
|
||||
n: '00hc1 selected room temperature',
|
||||
c: 'hc1/seltemp',
|
||||
},
|
||||
{
|
||||
v: 22.6,
|
||||
u: 1,
|
||||
n: 'hc1 current room temperature',
|
||||
n: '00hc1 current room temperature',
|
||||
c: '',
|
||||
},
|
||||
{
|
||||
v: 'auto',
|
||||
u: 0,
|
||||
n: 'hc1 mode',
|
||||
n: '00hc1 mode',
|
||||
c: 'hc1/mode',
|
||||
},
|
||||
],
|
||||
@@ -487,107 +487,104 @@ const emsesp_devicedata_1 = {
|
||||
const emsesp_devicedata_2 = {
|
||||
label: 'Boiler: Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i',
|
||||
data: [
|
||||
{ u: 0, n: 'reset', c: 'reset', l: ['-', 'maintenance', 'error'] },
|
||||
{ v: 'false', u: 0, n: 'heating active' },
|
||||
{ v: 'false', u: 0, n: 'tapwater active' },
|
||||
{ v: 5, u: 1, n: 'selected flow temperature', c: 'selflowtemp' },
|
||||
{ v: 0, u: 3, n: 'burner selected max power', c: 'selburnpow' },
|
||||
{ v: 0, u: 3, n: 'heating pump modulation' },
|
||||
{ v: 53.4, u: 1, n: 'current flow temperature' },
|
||||
{ v: 52.7, u: 1, n: 'return temperature' },
|
||||
{ v: 1.3, u: 10, n: 'system pressure' },
|
||||
{ v: 54.9, u: 1, n: 'actual boiler temperature' },
|
||||
{ v: 'false', u: 0, n: 'gas' },
|
||||
{ v: 'false', u: 0, n: 'gas stage 2' },
|
||||
{ v: 0, u: 9, n: 'flame current' },
|
||||
{ v: 'false', u: 0, n: 'heating pump' },
|
||||
{ v: 'false', u: 0, n: 'fan' },
|
||||
{ v: 'false', u: 0, n: 'ignition' },
|
||||
{ v: 'false', u: 0, n: 'oil preheating' },
|
||||
{ v: 'true', u: 0, n: 'heating activated', c: 'heatingactivated', l: ['off', 'on'] },
|
||||
{ v: 80, u: 1, n: 'heating temperature', c: 'heatingtemp' },
|
||||
{ v: 70, u: 3, n: 'burner pump max power', c: 'pumpmodmax' },
|
||||
{ v: 30, u: 3, n: 'burner pump min power', c: 'pumpmodmin' },
|
||||
{ v: 1, u: 8, n: 'pump delay', c: 'pumpdelay' },
|
||||
{ v: 10, u: 8, n: 'burner min period', c: 'burnminperiod' },
|
||||
{ v: 0, u: 3, n: 'burner min power', c: 'burnminpower' },
|
||||
{ v: 50, u: 3, n: 'burner max power', c: 'burnmaxpower' },
|
||||
{ v: -6, u: 2, n: 'hysteresis on temperature', c: 'boilhyston' },
|
||||
{ v: 6, u: 2, n: 'hysteresis off temperature', c: 'boilhystoff' },
|
||||
{ v: 0, u: 1, n: 'set flow temperature' },
|
||||
{ v: 0, u: 3, n: 'burner set power' },
|
||||
{ v: 0, u: 3, n: 'burner current power' },
|
||||
{ v: 326323, u: 0, n: 'burner starts' },
|
||||
{ v: 553437, u: 8, n: 'total burner operating time' },
|
||||
{ v: 451286, u: 8, n: 'total heat operating time' },
|
||||
{ v: 4672173, u: 8, n: 'total UBA operating time' },
|
||||
{ v: '1C(210) 06.06.2020 12:07 (0 min)', u: 0, n: 'last error code' },
|
||||
{ v: '0H', u: 0, n: 'service code' },
|
||||
{ v: 203, u: 0, n: 'service code number' },
|
||||
{ v: 'H00', u: 0, n: 'maintenance message' },
|
||||
{ v: 'manual', u: 0, n: 'maintenance scheduled', c: 'maintenance', l: ['off', 'time', 'date', 'manual'] },
|
||||
{ v: 6000, u: 7, n: 'time to next maintenance', c: 'maintenancetime' },
|
||||
{ v: '01.01.2012', u: 0, n: 'next maintenance date', c: 'maintenancedate', o: 'Format: < dd.mm.yyyy >' },
|
||||
{ v: 'true', u: 0, n: 'dhw turn on/off', c: 'wwtapactivated', l: ['off', 'on'] },
|
||||
{ v: 62, u: 1, n: 'dhw set temperature' },
|
||||
{ v: 60, u: 1, n: 'dhw selected temperature', c: 'wwseltemp' },
|
||||
{ v: 'flow', u: 0, n: 'dhw type' },
|
||||
{ v: 'hot', u: 0, n: 'dhw comfort', c: 'wwcomfort', l: ['hot', 'eco', 'intelligent'] },
|
||||
{ v: 40, u: 2, n: 'dhw flow temperature offset', c: 'wwflowtempoffset' },
|
||||
{ v: 100, u: 3, n: 'dhw max power', c: 'wwmaxpower' },
|
||||
{ v: 'false', u: 0, n: 'dhw circulation pump available', c: 'wwcircpump', l: ['off', 'on'] },
|
||||
{ v: '3-way valve', u: 0, n: 'dhw charging type' },
|
||||
{ v: -5, u: 2, n: 'dhw hysteresis on temperature', c: 'wwhyston' },
|
||||
{ v: 0, u: 2, n: 'dhw hysteresis off temperature', c: 'wwhystoff' },
|
||||
{ v: 70, u: 1, n: 'dhw disinfection temperature', c: 'wwdisinfectiontemp' },
|
||||
{ u: 0, n: '08reset', c: 'reset', l: ['-', 'maintenance', 'error'] },
|
||||
{ v: 'false', u: 0, n: '08heating active' },
|
||||
{ v: 'false', u: 0, n: '04tapwater active' },
|
||||
{ v: 5, u: 1, n: '04selected flow temperature', c: 'selflowtemp' },
|
||||
{ v: 0, u: 3, n: '0Eburner selected max power', c: 'selburnpow' },
|
||||
{ v: 0, u: 3, n: '00heating pump modulation' },
|
||||
{ v: 53.4, u: 1, n: '00current flow temperature' },
|
||||
{ v: 52.7, u: 1, n: '00return temperature' },
|
||||
{ v: 1.3, u: 10, n: '00system pressure' },
|
||||
{ v: 54.9, u: 1, n: '00actual boiler temperature' },
|
||||
{ v: 'false', u: 0, n: '00gas' },
|
||||
{ v: 'false', u: 0, n: '00gas stage 2' },
|
||||
{ v: 0, u: 9, n: '00flame current' },
|
||||
{ v: 'false', u: 0, n: '00heating pump' },
|
||||
{ v: 'false', u: 0, n: '00fan' },
|
||||
{ v: 'false', u: 0, n: '00ignition' },
|
||||
{ v: 'false', u: 0, n: '00oil preheating' },
|
||||
{ v: 'true', u: 0, n: '00heating activated', c: 'heatingactivated', l: ['off', 'on'] },
|
||||
{ v: 80, u: 1, n: '00heating temperature', c: 'heatingtemp' },
|
||||
{ v: 70, u: 3, n: '00burner pump max power', c: 'pumpmodmax' },
|
||||
{ v: 30, u: 3, n: '00burner pump min power', c: 'pumpmodmin' },
|
||||
{ v: 1, u: 8, n: '00pump delay', c: 'pumpdelay' },
|
||||
{ v: 10, u: 8, n: '00burner min period', c: 'burnminperiod' },
|
||||
{ v: 0, u: 3, n: '00burner min power', c: 'burnminpower' },
|
||||
{ v: 50, u: 3, n: '00burner max power', c: 'burnmaxpower' },
|
||||
{ v: -6, u: 2, n: '00hysteresis on temperature', c: 'boilhyston' },
|
||||
{ v: 6, u: 2, n: '00hysteresis off temperature', c: 'boilhystoff' },
|
||||
{ v: 0, u: 1, n: '00set flow temperature' },
|
||||
{ v: 0, u: 3, n: '00burner set power' },
|
||||
{ v: 0, u: 3, n: '00burner current power' },
|
||||
{ v: 326323, u: 0, n: '00burner starts' },
|
||||
{ v: 553437, u: 8, n: '00total burner operating time' },
|
||||
{ v: 451286, u: 8, n: '00total heat operating time' },
|
||||
{ v: 4672173, u: 8, n: '00total UBA operating time' },
|
||||
{ v: '1C(210) 06.06.2020 12:07 (0 min)', u: 0, n: '00last error code' },
|
||||
{ v: '0H', u: 0, n: '00service code' },
|
||||
{ v: 203, u: 0, n: '00service code number' },
|
||||
{ v: 'H00', u: 0, n: '00maintenance message' },
|
||||
{ v: 'manual', u: 0, n: '00maintenance scheduled', c: 'maintenance', l: ['off', 'time', 'date', 'manual'] },
|
||||
{ v: 6000, u: 7, n: '00time to next maintenance', c: 'maintenancetime' },
|
||||
{ v: '01.01.2012', u: 0, n: '00next maintenance date', c: 'maintenancedate', o: 'Format: < dd.mm.yyyy >' },
|
||||
{ v: 'true', u: 0, n: '00dhw turn on/off', c: 'wwtapactivated', l: ['off', 'on'] },
|
||||
{ v: 62, u: 1, n: '00dhw set temperature' },
|
||||
{ v: 60, u: 1, n: '00dhw selected temperature', c: 'wwseltemp' },
|
||||
{ v: 'flow', u: 0, n: '00dhw type' },
|
||||
{ v: 'hot', u: 0, n: '00dhw comfort', c: 'wwcomfort', l: ['hot', 'eco', 'intelligent'] },
|
||||
{ v: 40, u: 2, n: '00dhw flow temperature offset', c: 'wwflowtempoffset' },
|
||||
{ v: 100, u: 3, n: '00dhw max power', c: 'wwmaxpower' },
|
||||
{ v: 'false', u: 0, n: '00dhw circulation pump available', c: 'wwcircpump', l: ['off', 'on'] },
|
||||
{ v: '3-way valve', u: 0, n: '00dhw charging type' },
|
||||
{ v: -5, u: 2, n: '00dhw hysteresis on temperature', c: 'wwhyston' },
|
||||
{ v: 0, u: 2, n: '00dhw hysteresis off temperature', c: 'wwhystoff' },
|
||||
{ v: 70, u: 1, n: '00dhw disinfection temperature', c: 'wwdisinfectiontemp' },
|
||||
{
|
||||
v: 'off',
|
||||
u: 0,
|
||||
n: 'dhw circulation pump mode',
|
||||
n: '00dhw circulation pump mode',
|
||||
c: 'wwcircmode',
|
||||
l: ['off', '1x3min', '2x3min', '3x3min', '4x3min', '5x3min', '6x3min', 'continuous'],
|
||||
},
|
||||
{ v: 'false', u: 0, n: 'dhw circulation active', c: 'wwcirc', l: ['off', 'on'] },
|
||||
{ v: 47.3, u: 1, n: 'dhw current intern temperature' },
|
||||
{ v: 0, u: 4, n: 'dhw current tap water flow' },
|
||||
{ v: 47.3, u: 1, n: 'dhw storage intern temperature' },
|
||||
{ v: 'true', u: 0, n: 'dhw activated', c: 'wwactivated', l: ['off', 'on'] },
|
||||
{ v: 'false', u: 0, n: 'dhw one time charging', c: 'wwonetime', l: ['off', 'on'] },
|
||||
{ v: 'false', u: 0, n: 'dhw disinfecting', c: 'wwdisinfecting', l: ['off', 'on'] },
|
||||
{ v: 'false', u: 0, n: 'dhw charging' },
|
||||
{ v: 'false', u: 0, n: 'dhw recharging' },
|
||||
{ v: 'true', u: 0, n: 'dhw temperature ok' },
|
||||
{ v: 'false', u: 0, n: 'dhw active' },
|
||||
{ v: 'true', u: 0, n: 'dhw 3way valve active' },
|
||||
{ v: 0, u: 3, n: 'dhw set pump power' },
|
||||
{ v: 288768, u: 0, n: 'dhw starts' },
|
||||
{ v: 102151, u: 8, n: 'dhw active time' },
|
||||
{ v: 'false', u: 0, n: '00dhw circulation active', c: 'wwcirc', l: ['off', 'on'] },
|
||||
{ v: 47.3, u: 1, n: '00dhw current intern temperature' },
|
||||
{ v: 0, u: 4, n: '00dhw current tap water flow' },
|
||||
{ v: 47.3, u: 1, n: '00dhw storage intern temperature' },
|
||||
{ v: 'true', u: 0, n: '00dhw activated', c: 'wwactivated', l: ['off', 'on'] },
|
||||
{ v: 'false', u: 0, n: '00dhw one time charging', c: 'wwonetime', l: ['off', 'on'] },
|
||||
{ v: 'false', u: 0, n: '00dhw disinfecting', c: 'wwdisinfecting', l: ['off', 'on'] },
|
||||
{ v: 'false', u: 0, n: '00dhw charging' },
|
||||
{ v: 'false', u: 0, n: '00dhw recharging' },
|
||||
{ v: 'true', u: 0, n: '00dhw temperature ok' },
|
||||
{ v: 'false', u: 0, n: '00dhw active' },
|
||||
{ v: 'true', u: 0, n: '00dhw 3way valve active' },
|
||||
{ v: 0, u: 3, n: '00dhw set pump power' },
|
||||
{ v: 288768, u: 0, n: '00dhw starts' },
|
||||
{ v: 102151, u: 8, n: '00dhw active time' },
|
||||
],
|
||||
}
|
||||
|
||||
const emsesp_devicedata_4 = {
|
||||
label: 'RC100/Moduline 1000/1010',
|
||||
label: 'Thermostat: RC100/Moduline 1000/1010',
|
||||
data: [
|
||||
{
|
||||
v: 16,
|
||||
u: 1,
|
||||
n: 'hc2 selected room temperature',
|
||||
n: '00hc2 selected room temperature',
|
||||
c: 'hc2/seltemp',
|
||||
x: false,
|
||||
},
|
||||
{
|
||||
v: 18.6,
|
||||
u: 1,
|
||||
n: 'hc2 current room temperature',
|
||||
n: '00hc2 current room temperature',
|
||||
c: '',
|
||||
x: true,
|
||||
},
|
||||
{
|
||||
v: 'off',
|
||||
u: 0,
|
||||
n: 'hc2 mode',
|
||||
n: '00hc2 mode',
|
||||
c: 'hc2/mode',
|
||||
x: true,
|
||||
},
|
||||
],
|
||||
}
|
||||
@@ -597,119 +594,119 @@ const emsesp_deviceentities_1 = [
|
||||
v: '(0)',
|
||||
n: 'error code',
|
||||
s: 'errorcode',
|
||||
x: false,
|
||||
i: 1,
|
||||
m: 0,
|
||||
w: false,
|
||||
},
|
||||
{
|
||||
v: '14:54:39 06/06/2021',
|
||||
n: 'date/time',
|
||||
s: 'datetime',
|
||||
x: false,
|
||||
i: 2,
|
||||
m: 0,
|
||||
w: false,
|
||||
},
|
||||
{
|
||||
v: 18.22,
|
||||
v: 18.2,
|
||||
n: 'hc1 selected room temperature',
|
||||
s: 'hc1/seltemp',
|
||||
x: false,
|
||||
i: 3,
|
||||
m: 0,
|
||||
w: true,
|
||||
},
|
||||
{
|
||||
v: 22.6,
|
||||
n: 'hc1 current room temperature',
|
||||
s: 'hc1/curtemp',
|
||||
x: false,
|
||||
i: 4,
|
||||
m: 0,
|
||||
w: false,
|
||||
},
|
||||
{
|
||||
v: 'auto',
|
||||
n: 'hc1 mode',
|
||||
s: 'hc1/mode',
|
||||
x: false,
|
||||
i: 5,
|
||||
m: 0,
|
||||
w: true,
|
||||
},
|
||||
]
|
||||
|
||||
const emsesp_deviceentities_2 = [
|
||||
{ v: false, n: 'heating active', s: 'heatingactive', x: false, i: 1 },
|
||||
{ v: false, n: 'tapwater active', s: 'tapwateractive', x: false, i: 2 },
|
||||
{ v: 5, n: 'selected flow temperature', s: 'selflowtemp', x: false, i: 3 },
|
||||
{ v: 0, n: 'burner selected max power', s: 'selburnpow', x: false, i: 4 },
|
||||
{ v: 0, n: 'heating pump modulation', s: 'heatingpumpmod', x: false, i: 5 },
|
||||
{ n: 'heating pump 2 modulation', s: 'heatingpump2mod', x: true, i: 6 },
|
||||
{ n: 'outside temperature', s: 'outdoortemp', x: true, i: 7 },
|
||||
{ v: 53, n: 'current flow temperature', s: 'curflowtemp', x: false, i: 8 },
|
||||
{ v: 51.8, n: 'return temperature', s: 'rettemp', x: false, i: 9 },
|
||||
{ n: 'mixing switch temperature', s: 'switchtemp', x: true, i: 10 },
|
||||
{ v: 1.3, n: 'system pressure', s: 'syspress', x: false, i: 11 },
|
||||
{ v: 54.6, n: 'actual boiler temperature', s: 'boiltemp', x: false, i: 12 },
|
||||
{ n: 'exhaust temperature', s: 'exhausttemp', x: true, i: 13 },
|
||||
{ v: false, n: 'gas', s: 'burngas', x: false, i: 14 },
|
||||
{ v: false, n: 'gas stage 2', s: 'burngas2', x: false, i: 15 },
|
||||
{ v: 0, n: 'flame current', s: 'flamecurr', x: false, i: 16 },
|
||||
{ v: false, n: 'heating pump', s: 'heatingpump', x: false, i: 17 },
|
||||
{ v: false, n: 'fan', s: 'fanwork', x: false, i: 18 },
|
||||
{ v: false, n: 'ignition', s: 'ignwork', x: false, i: 19 },
|
||||
{ v: false, n: 'oil preheating', s: 'oilpreheat', x: false, i: 20 },
|
||||
{ v: true, n: 'heating activated', s: 'heatingactivated', x: false, i: 21 },
|
||||
{ v: 80, n: 'heating temperature', s: 'heatingtemp', x: false, i: 22 },
|
||||
{ v: 70, n: 'burner pump max power', s: 'pumpmodmax', x: false, i: 23 },
|
||||
{ v: 30, n: 'burner pump min power', s: 'pumpmodmin', x: false, i: 24 },
|
||||
{ v: 1, n: 'pump delay', s: 'pumpdelay', x: false, i: 25 },
|
||||
{ v: 10, n: 'burner min period', s: 'burnminperiod', x: false, i: 26 },
|
||||
{ v: 0, n: 'burner min power', s: 'burnminpower', x: false, i: 27 },
|
||||
{ v: 50, n: 'burner max power', s: 'burnmaxpower', x: false, i: 28 },
|
||||
{ v: -6, n: 'hysteresis on temperature', s: 'boilhyston', x: false, i: 29 },
|
||||
{ v: 6, n: 'hysteresis off temperature', s: 'boilhystoff', x: false, i: 30 },
|
||||
{ v: 0, n: 'set flow temperature', s: 'setflowtemp', x: false, i: 31 },
|
||||
{ v: 0, n: 'burner set power', s: 'setburnpow', x: false, i: 32 },
|
||||
{ v: 0, n: 'burner current power', s: 'curburnpow', x: false, i: 33 },
|
||||
{ v: 326323, n: 'burner starts', s: 'burnstarts', x: false, i: 34 },
|
||||
{ v: 553437, n: 'total burner operating time', s: 'burnworkmin', x: false, i: 35 },
|
||||
{ v: 451286, n: 'total heat operating time', s: 'heatworkmin', x: false, i: 36 },
|
||||
{ v: 4672175, n: 'total UBA operating time', s: 'ubauptime', x: false, i: 37 },
|
||||
{ v: '1C(210) 06.06.2020 12:07 (0 min)', n: 'last error code', s: 'lastcode', x: false, i: 38 },
|
||||
{ v: '0H', n: 'service code', s: 'servicecode', x: false, i: 39 },
|
||||
{ v: 203, n: 'service code number', s: 'servicecodenumber', x: false, i: 40 },
|
||||
{ v: 'H00', n: 'maintenance message', s: 'maintenancemessage', x: false, i: 41 },
|
||||
{ v: 'manual', n: 'maintenance scheduled', s: 'maintenance', x: false, i: 42 },
|
||||
{ v: 6000, n: 'time to next maintenance', s: 'maintenancetime', x: false, i: 43 },
|
||||
{ v: '01.01.2012', n: 'next maintenance date', s: 'maintenancedate', x: false, i: 44 },
|
||||
{ v: true, n: 'dhw turn on/off', s: 'wwtapactivated', x: false, i: 45 },
|
||||
{ v: 62, n: 'dhw set temperature', s: 'wwsettemp', x: false, i: 46 },
|
||||
{ v: 60, n: 'dhw selected temperature', s: 'wwseltemp', x: false, i: 47 },
|
||||
{ n: 'dhw selected lower temperature', s: 'wwseltemplow', x: true, i: 48 },
|
||||
{ n: 'dhw selected temperature for off', s: 'wwseltempoff', x: true, i: 49 },
|
||||
{ n: 'dhw single charge temperature', s: 'wwseltempsingle', x: true, i: 50 },
|
||||
{ v: 'flow', n: 'dhw type', s: 'wwtype', x: false, i: 51 },
|
||||
{ v: 'hot', n: 'dhw comfort', s: 'wwcomfort', x: false, i: 52 },
|
||||
{ v: 40, n: 'dhw flow temperature offset', s: 'wwflowtempoffset', x: false, i: 53 },
|
||||
{ v: 100, n: 'dhw max power', s: 'wwmaxpower', x: false, i: 54 },
|
||||
{ v: false, n: 'dhw circulation pump available', s: 'wwcircpump', x: false, i: 55 },
|
||||
{ v: '3-way valve', n: 'dhw charging type', s: 'wwchargetype', x: false, i: 56 },
|
||||
{ v: -5, n: 'dhw hysteresis on temperature', s: 'wwhyston', x: false, i: 57 },
|
||||
{ v: 0, n: 'dhw hysteresis off temperature', s: 'wwhystoff', x: false, i: 58 },
|
||||
{ v: 70, n: 'dhw disinfection temperature', s: 'wwdisinfectiontemp', x: false, i: 59 },
|
||||
{ v: 'off', n: 'dhw circulation pump mode', s: 'wwcircmode', x: false, i: 60 },
|
||||
{ v: false, n: 'dhw circulation active', s: 'wwcirc', x: false, i: 61 },
|
||||
{ v: 46.4, n: 'dhw current intern temperature', s: 'wwcurtemp', x: false, i: 62 },
|
||||
{ n: 'dhw current extern temperature', s: 'wwcurtemp2', x: true, i: 63 },
|
||||
{ v: 0, n: 'dhw current tap water flow', s: 'wwcurflow', x: false, i: 64 },
|
||||
{ v: 46.3, n: 'dhw storage intern temperature', s: 'wwstoragetemp1', x: false, i: 65 },
|
||||
{ n: 'dhw storage extern temperature', s: 'wwstoragetemp2', x: true, i: 66 },
|
||||
{ v: true, n: 'dhw activated', s: 'wwactivated', x: false, i: 67 },
|
||||
{ v: false, n: 'dhw one time charging', s: 'wwonetime', x: false, i: 68 },
|
||||
{ v: false, n: 'dhw disinfecting', s: 'wwdisinfecting', x: false, i: 69 },
|
||||
{ v: false, n: 'dhw charging', s: 'wwcharging', x: false, i: 70 },
|
||||
{ v: false, n: 'dhw recharging', s: 'wwrecharging', x: false, i: 71 },
|
||||
{ v: true, n: 'dhw temperature ok', s: 'wwtempok', x: false, i: 72 },
|
||||
{ v: false, n: 'dhw active', s: 'wwactive', x: false, i: 73 },
|
||||
{ v: true, n: 'dhw 3way valve active', s: 'ww3wayvalve', x: false, i: 74 },
|
||||
{ v: 0, n: 'dhw set pump power', s: 'wwsetpumppower', x: false, i: 75 },
|
||||
{ n: 'dhw mixer temperature', s: 'wwmixertemp', x: true, i: 76 },
|
||||
{ n: 'dhw cylinder middle temperature (TS3)', s: 'wwcylmiddletemp', x: true, i: 77 },
|
||||
{ v: 288768, n: 'dhw starts', s: 'wwstarts', x: false, i: 78 },
|
||||
{ v: 102151, n: 'dhw active time', s: 'wwworkm', x: false, i: 79 },
|
||||
{ v: false, n: 'heating active', s: 'heatingactive', m: 0 },
|
||||
{ v: false, n: 'tapwater active', s: 'tapwateractive', m: 0 },
|
||||
{ v: 5, n: 'selected flow temperature', s: 'selflowtemp', m: 0 },
|
||||
{ v: 0, n: 'burner selected max power', s: 'selburnpow', m: 0 },
|
||||
{ v: 0, n: 'heating pump modulation', s: 'heatingpumpmod', m: 0 },
|
||||
{ n: 'heating pump 2 modulation', s: 'heatingpump2mod', m: 0 },
|
||||
{ n: 'outside temperature', s: 'outdoortemp', m: 0 },
|
||||
{ v: 53, n: 'current flow temperature', s: 'curflowtemp', m: 0 },
|
||||
{ v: 51.8, n: 'return temperature', s: 'rettemp', m: 0 },
|
||||
{ n: 'mixing switch temperature', s: 'switchtemp', m: 0 },
|
||||
{ v: 1.3, n: 'system pressure', s: 'syspress', m: 0 },
|
||||
{ v: 54.6, n: 'actual boiler temperature', s: 'boiltemp', m: 0 },
|
||||
{ n: 'exhaust temperature', s: 'exhausttemp', m: 0 },
|
||||
{ v: false, n: 'gas', s: 'burngas', m: 0 },
|
||||
{ v: false, n: 'gas stage 2', s: 'burngas2', m: 0 },
|
||||
{ v: 0, n: 'flame current', s: 'flamecurr', m: 0 },
|
||||
{ v: false, n: 'heating pump', s: 'heatingpump', m: 0 },
|
||||
{ v: false, n: 'fan', s: 'fanwork', m: 0 },
|
||||
{ v: false, n: 'ignition', s: 'ignwork', m: 0 },
|
||||
{ v: false, n: 'oil preheating', s: 'oilpreheat', m: 0 },
|
||||
{ v: true, n: 'heating activated', s: 'heatingactivated', m: 0 },
|
||||
{ v: 80, n: 'heating temperature', s: 'heatingtemp', m: 0 },
|
||||
{ v: 70, n: 'burner pump max power', s: 'pumpmodmax', m: 0 },
|
||||
{ v: 30, n: 'burner pump min power', s: 'pumpmodmin', m: 0 },
|
||||
{ v: 1, n: 'pump delay', s: 'pumpdelay', m: 0 },
|
||||
{ v: 10, n: 'burner min period', s: 'burnminperiod', m: 0 },
|
||||
{ v: 0, n: 'burner min power', s: 'burnminpower', m: 0 },
|
||||
{ v: 50, n: 'burner max power', s: 'burnmaxpower', m: 0 },
|
||||
{ v: -6, n: 'hysteresis on temperature', s: 'boilhyston', m: 0 },
|
||||
{ v: 6, n: 'hysteresis off temperature', s: 'boilhystoff', m: 0 },
|
||||
{ v: 0, n: 'set flow temperature', s: 'setflowtemp', m: 0 },
|
||||
{ v: 0, n: 'burner set power', s: 'setburnpow', m: 0 },
|
||||
{ v: 0, n: 'burner current power', s: 'curburnpow', m: 0 },
|
||||
{ v: 326323, n: 'burner starts', s: 'burnstarts', m: 0 },
|
||||
{ v: 553437, n: 'total burner operating time', s: 'burnworkmin', m: 0 },
|
||||
{ v: 451286, n: 'total heat operating time', s: 'heatworkmin', m: 0 },
|
||||
{ v: 4672175, n: 'total UBA operating time', s: 'ubauptime', m: 0 },
|
||||
{ v: '1C(210) 06.06.2020 12:07 (0 min)', n: 'last error code', s: 'lastcode', m: 0 },
|
||||
{ v: '0H', n: 'service code', s: 'servicecode', m: 0 },
|
||||
{ v: 203, n: 'service code number', s: 'servicecodenumber', m: 0 },
|
||||
{ v: 'H00', n: 'maintenance message', s: 'maintenancemessage', m: 0 },
|
||||
{ v: 'manual', n: 'maintenance scheduled', s: 'maintenance', m: 0 },
|
||||
{ v: 6000, n: 'time to next maintenance', s: 'maintenancetime', m: 0 },
|
||||
{ v: '01.01.2012', n: 'next maintenance date', s: 'maintenancedate', m: 0 },
|
||||
{ v: true, n: 'dhw turn on/off', s: 'wwtapactivated', m: 0 },
|
||||
{ v: 62, n: 'dhw set temperature', s: 'wwsettemp', m: 0 },
|
||||
{ v: 60, n: 'dhw selected temperature', s: 'wwseltemp', m: 0 },
|
||||
{ n: 'dhw selected lower temperature', s: 'wwseltemplow', m: 2 },
|
||||
{ n: 'dhw selected temperature for off', s: 'wwseltempoff', m: 2 },
|
||||
{ n: 'dhw single charge temperature', s: 'wwseltempsingle', m: 2 },
|
||||
{ v: 'flow', n: 'dhw type', s: 'wwtype', m: 0 },
|
||||
{ v: 'hot', n: 'dhw comfort', s: 'wwcomfort', m: 0 },
|
||||
{ v: 40, n: 'dhw flow temperature offset', s: 'wwflowtempoffset', m: 0 },
|
||||
{ v: 100, n: 'dhw max power', s: 'wwmaxpower', m: 0 },
|
||||
{ v: false, n: 'dhw circulation pump available', s: 'wwcircpump', m: 0 },
|
||||
{ v: '3-way valve', n: 'dhw charging type', s: 'wwchargetype', m: 0 },
|
||||
{ v: -5, n: 'dhw hysteresis on temperature', s: 'wwhyston', m: 0 },
|
||||
{ v: 0, n: 'dhw hysteresis off temperature', s: 'wwhystoff', m: 0 },
|
||||
{ v: 70, n: 'dhw disinfection temperature', s: 'wwdisinfectiontemp', m: 0 },
|
||||
{ v: 'off', n: 'dhw circulation pump mode', s: 'wwcircmode', m: 0 },
|
||||
{ v: false, n: 'dhw circulation active', s: 'wwcirc', m: 0 },
|
||||
{ v: 46.4, n: 'dhw current intern temperature', s: 'wwcurtemp', m: 0 },
|
||||
{ n: 'dhw current extern temperature', s: 'wwcurtemp2', m: 2 },
|
||||
{ v: 0, n: 'dhw current tap water flow', s: 'wwcurflow', m: 0 },
|
||||
{ v: 46.3, n: 'dhw storage intern temperature', s: 'wwstoragetemp1', m: 0 },
|
||||
{ n: 'dhw storage extern temperature', s: 'wwstoragetemp2', m: 2 },
|
||||
{ v: true, n: 'dhw activated', s: 'wwactivated', m: 0 },
|
||||
{ v: false, n: 'dhw one time charging', s: 'wwonetime', m: 0 },
|
||||
{ v: false, n: 'dhw disinfecting', s: 'wwdisinfecting', m: 0 },
|
||||
{ v: false, n: 'dhw charging', s: 'wwcharging', m: 0 },
|
||||
{ v: false, n: 'dhw recharging', s: 'wwrecharging', m: 0 },
|
||||
{ v: true, n: 'dhw temperature ok', s: 'wwtempok', m: 0 },
|
||||
{ v: false, n: 'dhw active', s: 'wwactive', m: 0 },
|
||||
{ v: true, n: 'dhw 3way valve active', s: 'ww3wayvalve', m: 0 },
|
||||
{ v: 0, n: 'dhw set pump power', s: 'wwsetpumppower', m: 0 },
|
||||
{ n: 'dhw mixer temperature', s: 'wwmixertemp', m: 2 },
|
||||
{ n: 'dhw cylinder middle temperature (TS3)', s: 'wwcylmiddletemp', m: 2 },
|
||||
{ v: 288768, n: 'dhw starts', s: 'wwstarts', m: 0 },
|
||||
{ v: 102151, n: 'dhw active time', s: 'wwworkm', m: 0 },
|
||||
]
|
||||
|
||||
const emsesp_deviceentities_4 = [
|
||||
@@ -717,21 +714,22 @@ const emsesp_deviceentities_4 = [
|
||||
v: 16,
|
||||
n: 'hc2 selected room temperature',
|
||||
s: 'hc2/seltemp',
|
||||
x: false,
|
||||
i: 1,
|
||||
m: 0,
|
||||
w: true,
|
||||
},
|
||||
{
|
||||
v: 18.5,
|
||||
n: 'hc2 current room temperature',
|
||||
s: 'hc2/curtemp',
|
||||
x: true,
|
||||
i: 2,
|
||||
m: 3,
|
||||
w: false,
|
||||
},
|
||||
{
|
||||
v: 'off',
|
||||
n: 'hc2 mode',
|
||||
s: 'hc2/mode',
|
||||
x: true,
|
||||
i: 3,
|
||||
m: 3,
|
||||
w: true,
|
||||
},
|
||||
]
|
||||
|
||||
@@ -924,9 +922,41 @@ rest_server.post(EMSESP_DEVICEENTITIES_ENDPOINT, (req, res) => {
|
||||
}
|
||||
})
|
||||
|
||||
rest_server.post(EMSESP_EXCLUDE_ENTITIES_ENDPOINT, (req, res) => {
|
||||
console.log('exclude list for productid ' + req.body.product_id + ' device_id ' + req.body.device_id + ' entities:')
|
||||
function updateMask(entity, de, dd) {
|
||||
const name = entity.slice(2)
|
||||
const new_mask = parseInt(entity.slice(0, 2), 16)
|
||||
|
||||
objIndex = de.findIndex((obj) => obj.s == name)
|
||||
if (objIndex !== -1) {
|
||||
de[objIndex].m = new_mask
|
||||
const fullname = de[objIndex].n
|
||||
objIndex = dd.data.findIndex((obj) => obj.n.slice(2) == fullname)
|
||||
if (objIndex !== -1) {
|
||||
// see if the mask has changed
|
||||
const old_mask = parseInt(dd.data[objIndex].n.slice(0, 2), 16)
|
||||
if (old_mask !== new_mask) {
|
||||
const mask_hex = entity.slice(0, 2)
|
||||
console.log('Updating ' + dd.data[objIndex].n + ' -> ' + mask_hex + fullname)
|
||||
dd.data[objIndex].n = mask_hex + fullname
|
||||
}
|
||||
}
|
||||
} else {
|
||||
console.log("can't locate record for id " + id)
|
||||
}
|
||||
}
|
||||
|
||||
rest_server.post(EMSESP_MASKED_ENTITIES_ENDPOINT, (req, res) => {
|
||||
const id = req.body.id
|
||||
console.log(req.body.entity_ids)
|
||||
for (const entity of req.body.entity_ids) {
|
||||
if (id === 1) {
|
||||
updateMask(entity, emsesp_deviceentities_1, emsesp_devicedata_1)
|
||||
} else if (id === 2) {
|
||||
updateMask(entity, emsesp_deviceentities_2, emsesp_devicedata_2)
|
||||
} else if (id === 4) {
|
||||
updateMask(entity, emsesp_deviceentities_4, emsesp_devicedata_4)
|
||||
}
|
||||
}
|
||||
res.sendStatus(200)
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user