Skip to content

Commit

Permalink
Added some new objects
Browse files Browse the repository at this point in the history 
Fixed issue #97
Added some new predefined objects
Added Inverter Temperature (#86)
  • Loading branch information
@nkleber78
nkleber78 committed Mar 17, 2021
1 parent 3b42a28 commit 3094b84
Show file tree
Hide file tree
Showing 2 changed files with 241 additions and 94 deletions.
158 changes: 139 additions & 19 deletions lib/devObjects.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function createInverterObjects(adapter, id, obj) {

adapter.setObjectNotExists('inverter.' + id, {
type: 'channel',
common: {
Expand Down Expand Up @@ -53,6 +53,51 @@ function createInverterObjects(adapter, id, obj) {
native: {}
});
}
if (obj.hasOwnProperty("IAC_L1")) {
adapter.setObjectNotExists('inverter.' + id + '.IAC_L1', {
type: "state",
common: {
name: "IAC_L1",
type: "number",
role: "value",
unit: "A",
read: true,
write: false,
desc: "AC current L1"
},
native: {}
});
}
if (obj.hasOwnProperty("IAC_L2")) {
adapter.setObjectNotExists('inverter.' + id + '.IAC_L2', {
type: "state",
common: {
name: "IAC_L2",
type: "number",
role: "value",
unit: "A",
read: true,
write: false,
desc: "AC current L2"
},
native: {}
});
}
if (obj.hasOwnProperty("IAC_L3")) {
adapter.setObjectNotExists('inverter.' + id + '.IAC_L3', {
type: "state",
common: {
name: "IAC_L3",
type: "number",
role: "value",
unit: "A",
read: true,
write: false,
desc: "AC current L3"
},
native: {}
});
}
if (obj.hasOwnProperty("IDC")) {
adapter.setObjectNotExists('inverter.' + id + '.IDC', {
type: "state",
Expand All @@ -68,6 +113,21 @@ function createInverterObjects(adapter, id, obj) {
native: {}
});
}
if (obj.hasOwnProperty("IDC_2")) {
adapter.setObjectNotExists('inverter.' + id + '.IDC_2', {
type: "state",
common: {
name: "IDC_2",
type: "number",
role: "value",
unit: "A",
read: true,
write: false,
desc: "DC current tracker 2"
},
native: {}
});
}
if (obj.hasOwnProperty("PAC")) {
adapter.setObjectNotExists('inverter.' + id + '.PAC', {
type: "state",
Expand Down Expand Up @@ -128,6 +188,36 @@ function createInverterObjects(adapter, id, obj) {
native: {}
});
}
if (obj.hasOwnProperty("UAC_L1")) {
adapter.setObjectNotExists('inverter.' + id + '.UAC_L1', {
type: "state",
common: {
name: "UAC_L1",
type: "number",
role: "value",
unit: "V",
read: true,
write: false,
desc: "AC voltage L1"
},
native: {}
});
}
if (obj.hasOwnProperty("UAC_L2")) {
adapter.setObjectNotExists('inverter.' + id + '.UAC_L2', {
type: "state",
common: {
name: "UAC_L2",
type: "number",
role: "value",
unit: "V",
read: true,
write: false,
desc: "AC voltage L2"
},
native: {}
});
}
if (obj.hasOwnProperty("UDC")) {
adapter.setObjectNotExists('inverter.' + id + '.UDC', {
type: "state",
Expand All @@ -138,7 +228,37 @@ function createInverterObjects(adapter, id, obj) {
unit: "V",
read: true,
write: false,
desc: "DC voltage"
desc: "DC voltage tracker 1"
},
native: {}
});
}
if (obj.hasOwnProperty("UDC_2")) {
adapter.setObjectNotExists('inverter.' + id + '.UDC_2', {
type: "state",
common: {
name: "UDC_2",
type: "number",
role: "value",
unit: "V",
read: true,
write: false,
desc: "DC voltage tracker 2"
},
native: {}
});
}
if (obj.hasOwnProperty("T_AMBIENT")) {
adapter.setObjectNotExists('inverter.' + id + '.T_AMBIENT', {
type: "state",
common: {
name: "T_AMBIENT",
type: "number",
role: "value",
unit: "°C",
read: true,
write: false,
desc: "Inverter case temperature"
},
native: {}
});
Expand Down Expand Up @@ -208,7 +328,7 @@ function createInverterObjects(adapter, id, obj) {
});

// wait a bit for creating the previous objects before creating the fallback once
setTimeout(function () {
setTimeout(function() {
adapter.log.debug("Fallback Missing Inverter Objects started")
// fallback for not predefined parameters -> defined as number without unit
for (var para in obj) {
Expand All @@ -231,7 +351,7 @@ function createInverterObjects(adapter, id, obj) {
}

function createArchiveObjects(adapter, id, obj) {

adapter.setObjectNotExists('inverter.' + id, {
type: 'channel',
common: {
Expand Down Expand Up @@ -348,7 +468,7 @@ function createArchiveObjects(adapter, id, obj) {
}

// wait a bit for creating the previous objects before creating the fallback once
setTimeout(function () {
setTimeout(function() {
adapter.log.debug("Fallback Missing Archive Objects started")
// fallback for not predefined parameters -> defined as number without unit
for (var para in obj) {
Expand All @@ -371,7 +491,7 @@ function createArchiveObjects(adapter, id, obj) {
}

function createStorageObjects(adapter, id) {

adapter.setObjectNotExists('storage', {
type: 'channel',
common: {
Expand Down Expand Up @@ -516,7 +636,7 @@ function createStorageObjects(adapter, id) {

function createMeterObjects(adapter, id, obj) {



adapter.log.debug("Creating missed MeterObjects...")
adapter.setObjectNotExists('meter', {
Expand Down Expand Up @@ -1672,7 +1792,7 @@ function createMeterObjects(adapter, id, obj) {
adapter.log.debug("MeterObjects created!")

// wait a bit for creating the previous objects before creating the fallback once
setTimeout(function () {
setTimeout(function() {
adapter.log.debug("Fallback MissingMeterObjects started")
// fallback for not predefined parameters -> defined as number without unit
for (var para in obj) {
Expand All @@ -1697,7 +1817,7 @@ function createMeterObjects(adapter, id, obj) {
}

function createSensorNowObjects(adapter, id) {

adapter.setObjectNotExists('sensor', {
type: 'channel',
common: {
Expand All @@ -1718,7 +1838,7 @@ function createSensorNowObjects(adapter, id) {
}

function createSensorMinMaxObjects(adapter, id) {

adapter.setObjectNotExists('sensor', {
type: 'channel',
common: {
Expand All @@ -1739,7 +1859,7 @@ function createSensorMinMaxObjects(adapter, id) {
}

function createPowerFlowInverterObjects(adapter, inverter, obj) {


if (obj.hasOwnProperty("E_Day")) {
adapter.setObjectNotExists('powerflow.inverter' + inverter.toString() + '.E_Day', {
Expand Down Expand Up @@ -1831,7 +1951,7 @@ function createPowerFlowInverterObjects(adapter, inverter, obj) {
}

// wait a bit for creating the previous objects before creating the fallback once
setTimeout(function () {
setTimeout(function() {
adapter.log.debug("Fallback creating missing PowerflowInverter objects started");
// fallback for not predefined parameters -> defined as number without unit
for (var para in obj) {
Expand All @@ -1854,7 +1974,7 @@ function createPowerFlowInverterObjects(adapter, inverter, obj) {
}

function createPowerFlowObjects(adapter, obj) {

adapter.setObjectNotExists('powerflow', {
type: 'channel',
common: {
Expand Down Expand Up @@ -2075,7 +2195,7 @@ function createPowerFlowObjects(adapter, obj) {
}

// wait a bit for creating the previous objects before creating the fallback once
setTimeout(function () {
setTimeout(function() {
adapter.log.debug("Fallback creating missing Powerflow objects started")
// fallback for not predefined parameters -> defined as number without unit
for (var para in obj) {
Expand All @@ -2098,7 +2218,7 @@ function createPowerFlowObjects(adapter, obj) {
}

function createInverterInfoObjects(adapter, id, obj) {

adapter.setObjectNotExists('inverterinfo', {
type: 'channel',
common: {
Expand Down Expand Up @@ -2173,7 +2293,7 @@ function createInverterInfoObjects(adapter, id, obj) {
}

// wait a bit for creating the previous objects before creating the fallback once
setTimeout(function () {
setTimeout(function() {
adapter.log.debug("Fallback creating missing InverterInfo objects started")
// fallback for not predefined parameters -> defined as number without unit
for (var para in obj) {
Expand All @@ -2196,7 +2316,7 @@ function createInverterInfoObjects(adapter, id, obj) {
}

function createInfoObjects(adapter, obj) {

adapter.delObject('connection');
adapter.delObject('lastsync');
adapter.delObject('lastsyncarchive');
Expand Down Expand Up @@ -2247,7 +2367,7 @@ function createInfoObjects(adapter, obj) {
},
native: {}
});
if(obj === undefined){
if (obj === undefined) {
return;
}
if (obj.hasOwnProperty("HWVersion")) {
Expand Down Expand Up @@ -2471,4 +2591,4 @@ exports.createSensorMinMaxObjects = createSensorMinMaxObjects;
exports.createPowerFlowInverterObjects = createPowerFlowInverterObjects;
exports.createPowerFlowObjects = createPowerFlowObjects;
exports.createInverterInfoObjects = createInverterInfoObjects;
exports.createInfoObjects = createInfoObjects;
exports.createInfoObjects = createInfoObjects;
Loading

0 comments on commit 3094b84

Please sign in to comment.