diff --git a/APS1.plugin.txt b/APS1.plugin.txt
index dc6b027..81c570f 100644
--- a/APS1.plugin.txt
+++ b/APS1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract APS data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getAPSData")
userName = encodeURIComponent(userName)
passWord = encodeURIComponent(passWord)
diff --git a/CSI1.plugin(oud).txt b/CSI1.plugin(oud).txt
index 7469d77..cfcfb4a 100644
--- a/CSI1.plugin(oud).txt
+++ b/CSI1.plugin(oud).txt
@@ -4,7 +4,7 @@
///////// By Oepi-Loepi ///////////////
-function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
var data = "value=" + passWord;
diff --git a/CSI1.plugin.txt b/CSI1.plugin.txt
index 368a107..0c6974c 100644
--- a/CSI1.plugin.txt
+++ b/CSI1.plugin.txt
@@ -103,7 +103,7 @@ function sha256(ascii) {
}
-function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
var newHash = sha256(passWord);
if (debugOutput) console.log("*********SolarPanel new function sha256: " + newHash)
diff --git a/DELTA1.plugin.txt b/DELTA1.plugin.txt
index cf33cd5..f6edb30 100644
--- a/DELTA1.plugin.txt
+++ b/DELTA1.plugin.txt
@@ -4,7 +4,7 @@
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
var xhr = new XMLHttpRequest()
xhr.withCredentials = true;
diff --git a/DOM-DOUBLE1.plugin.txt b/DOM-DOUBLE1.plugin.txt
index a384e40..35fbbf6 100644
--- a/DOM-DOUBLE1.plugin.txt
+++ b/DOM-DOUBLE1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Domoticz (Double) Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
var arraynew = apiKey.split("+")
var firstIDX
var secondIDX
@@ -18,11 +18,11 @@
secondIDX = arraynew[1].trim()
number = 2
}
- getStep2(number,firstIDX,secondIDX,urlString,totalValue)
+ getStep2(number,firstIDX,secondIDX,urlString,useSSL,totalPower)
}
- function getStep2(number,firstIDX,secondIDX,urlString,totalValue){
+ function getStep2(number,firstIDX,secondIDX,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getDomoticzData")
var http = new XMLHttpRequest();
http.open("GET", "http://" + urlString + "/json.htm?type=devices&rid=" + firstIDX, true)
diff --git a/DOMOTICZ1.plugin.txt b/DOMOTICZ1.plugin.txt
index 6a3ba52..d286987 100644
--- a/DOMOTICZ1.plugin.txt
+++ b/DOMOTICZ1.plugin.txt
@@ -3,10 +3,11 @@
///////// Plugin to extract Domoticz Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getDomoticzData")
var http = new XMLHttpRequest();
- http.open("GET", "http://" + urlString + "/json.htm?type=devices&rid=" + apiKey, true)
+ var protocol = (useSSL == true) ? 'https' : 'http'
+ http.open("GET", protocol + "://" + urlString + "/json.htm?type=devices&rid=" + apiKey, true)
http.onreadystatechange = function() {
if (http.readyState == XMLHttpRequest.DONE) {
if (http.status === 200 || http.status === 300 || http.status === 302) {
diff --git a/ENPHASE-T1.plugin.txt b/ENPHASE-T1.plugin.txt
index 29ee02a..4a228ba 100644
--- a/ENPHASE-T1.plugin.txt
+++ b/ENPHASE-T1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Enphase Solar data for Toon ///////////////
///////// By Oepi-Loepi /////////////
- function getSolarData(passWord,userName,sessionID,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,sessionID,siteid,urlString,useSSL,totalPower){
var sessionID = apiKey
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
getEnphaseStep1(urlString,passWord,userName,sessionID);
@@ -66,7 +66,7 @@ function parseEnpaseInfo(urlString,passWord,userName,sessionID,totalValue){
}
if (envoyfirmware === 'D5'){
- getD5data(urlString,totalValue)
+ getD5data(urlString,useSSL,totalPower)
}
}
@@ -289,7 +289,7 @@ function startLogin(passWord,userName,urlString,envoyserial,envoyfirmware, total
}
- function getD5data(urlString,totalValue){
+ function getD5data(urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getD5data")
var http = new XMLHttpRequest()
var url = "http://" + urlString + "/production.json"
diff --git a/ENPHASE1-D7.plugin.txt b/ENPHASE1-D7.plugin.txt
index 31e84e3..9e2410b 100644
--- a/ENPHASE1-D7.plugin.txt
+++ b/ENPHASE1-D7.plugin.txt
@@ -5,7 +5,7 @@
- function getSolarData(passWord,userName,apiKeyPlugin,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKeyPlugin,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
var http = new XMLHttpRequest()
diff --git a/ENPHASE1.plugin.txt b/ENPHASE1.plugin.txt
index 0717d83..440b82f 100644
--- a/ENPHASE1.plugin.txt
+++ b/ENPHASE1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Enphase Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getEnphaseData")
var http = new XMLHttpRequest();
http.open("GET", "http://" + urlString + "/api/v1/production", true)
diff --git a/ENPHASE2.plugin.txt b/ENPHASE2.plugin.txt
index 52f7f2b..21062ed 100644
--- a/ENPHASE2.plugin.txt
+++ b/ENPHASE2.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Enphase Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getEnphaseData")
var http = new XMLHttpRequest();
var url = "https://api.enphaseenergy.com/api/v2/systems/" + siteid+ "/summary?key=" + apiKey + "&user_id=" + userName
diff --git a/ENPHASEV4-2.plugin.txt b/ENPHASEV4-2.plugin.txt
index 4c1c93c..e13f706 100644
--- a/ENPHASEV4-2.plugin.txt
+++ b/ENPHASEV4-2.plugin.txt
@@ -6,7 +6,7 @@
-function getSolarData(passWord,userName,apiKeyPlugin,siteid,urlString,totalValue){
+function getSolarData(passWord,userName,apiKeyPlugin,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
var sessionID = apiKeyPlugin
var http = new XMLHttpRequest()
diff --git a/ENPHASEV4.plugin.txt b/ENPHASEV4.plugin.txt
index 0af6e93..9a7133c 100644
--- a/ENPHASEV4.plugin.txt
+++ b/ENPHASEV4.plugin.txt
@@ -32,7 +32,7 @@
}
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
var base64encoded =base64Encode(userName + ":" + passWord);
if (debugOutput) console.log("*********SolarPanel base64encoded: " + base64encoded)
@@ -57,7 +57,7 @@
enphaseV4Access_token = JsonObject.access_token
enphaseV4Refresh_token = JsonObject.refresh_token
solarPanel_enphaseV4Refresh_token.write(JsonObject.refresh_token)
- getStep2(passWord,userName,apiKey,siteid,urlString,totalValue);
+ getStep2(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower);
}
catch (e){
currentPower = 0
@@ -73,7 +73,7 @@
}
- function getStep2(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getStep2(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getStep2")
var http = new XMLHttpRequest()
var url = "https://api.enphaseenergy.com/api/v4/systems/" + siteid + "/summary?key=" + apiKey
diff --git a/FOX1.plugin.txt b/FOX1.plugin.txt
index fe82fc5..3431238 100644
--- a/FOX1.plugin.txt
+++ b/FOX1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract FoxCloud Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKeyPlugin,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKeyPlugin,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
if (debugOutput) console.log("*********SolarPanel Start getSolarData apiKey: " + apiKeyPlugin)
diff --git a/FP4ALL.plugin.txt b/FP4ALL.plugin.txt
index 69aabac..1bc3125 100644
--- a/FP4ALL.plugin.txt
+++ b/FP4ALL.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract FP4ALL Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getFP4ALLData")
var http = new XMLHttpRequest();
http.open("GET", "http://" + urlString + "/status.xml", true)
diff --git a/FRONIUS1.plugin.txt b/FRONIUS1.plugin.txt
index fcc5a38..0644ee4 100644
--- a/FRONIUS1.plugin.txt
+++ b/FRONIUS1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Fronius Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getFroniusData")
var http = new XMLHttpRequest();
http.open("GET", "http://" + urlString + "/solar_api/v1/GetInverterRealtimeData.cgi?Scope=Device&DeviceID=1&DataCollection=CommonInverterData", true)
diff --git a/GOODWE1.plugin.txt b/GOODWE1.plugin.txt
index a60f51d..45d9c59 100644
--- a/GOODWE1.plugin.txt
+++ b/GOODWE1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Goodwe Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarDataStep1")
var http = new XMLHttpRequest()
var url = "https://www.semsportal.com/api/v1/Common/CrossLogin";
diff --git a/GOODWE2.plugin.txt b/GOODWE2.plugin.txt
index e6143ec..1c06243 100644
--- a/GOODWE2.plugin.txt
+++ b/GOODWE2.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Goodwe Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarDataStep1")
var http = new XMLHttpRequest()
var url = "https://www.semsportal.com/api/v1/Common/CrossLogin";
diff --git a/GROW1.plugin.txt b/GROW1.plugin.txt
index 3d9a576..9afa8ad 100644
--- a/GROW1.plugin.txt
+++ b/GROW1.plugin.txt
@@ -1,85 +1,85 @@
-///////// 1.0.13
-///////// GROW1 /////////////
-///////// Plugin to extract Growatt Solar data for Toon ///////////////
-///////// By Oepi-Loepi ///////////////
-
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
- if (debugOutput) console.log("*********SolarPanel Start getGrowattStep1")
- //modified hash : if first of pairs is 0 then replace by c
- var newpass= Qt.md5(passWord)
- var newString =""
- for(var x = 0;x < newpass.length ;x++){
- if ((x%2 == 0) && newpass[x] == "0") {
- newString += "c"
- }
- else{
- newString += newpass[x]
- }
- }
- var params = "password=" + newString + "&userName=" + userName
- var http = new XMLHttpRequest()
- var url2 = "https://server-api.growatt.com/newTwoLoginAPI.do"
- console.log("*********SolarPanel url2" + url2)
- http.open("POST", url2, true)
- http.setRequestHeader("Content-type", "application/x-www-form-urlencoded")
- http.setRequestHeader("Content-length", params.length)
- http.setRequestHeader("Connection", "keep-alive")
- http.setUserAgent = "ShinePhone/5.92 (iPad; iOS 14.6; Scale/2.00)"
- http.onreadystatechange = function() { // Call a function when the state changes.
- if (http.readyState === 4) {
- if (http.status === 200) {
- var JsonString = http.responseText
- if (debugOutput) console.log("*********SolarPanel JsonString " + JsonString)
- var JsonObject= JSON.parse(JsonString)
- getGrowattStep2();
- } else {
- if (debugOutput) console.log("*********SolarPanel getGrowattStep2 http.status " + http.status)
- currentPower = 0
- parseReturnData(0,totalValue,0,0,0,0,0, http.status,"error")
- }
- }
- }
- http.send(params);
- }
-
-
-
- function getGrowattStep2(){
- if (debugOutput) console.log("*********SolarPanel Start getGrowattStep3")
- var http = new XMLHttpRequest()
- var params = "language=5"
- var url2 = "https://server-api.growatt.com/newPlantAPI.do?action=getUserCenterEnertyDataTwo"
- console.log("*********SolarPanel url2 " + url2)
- http.open("GET", url2, true)
- http.setRequestHeader("Content-type", "application/x-www-form-urlencoded")
- http.setRequestHeader("Content-length", params.length)
- http.setRequestHeader("Connection", "keep-alive")
- http.setUserAgent = "ShinePhone/5.92 (iPad; iOS 14.6; Scale/2.00)"
- http.onreadystatechange = function() { // Call a function when the state changes.
- if (http.readyState === 4) {
- if (http.status === 200) {
- try {
- var JsonString = http.responseText
- if (debugOutput) console.log("*********SolarPanel JsonString " + JsonString)
- var JsonObject= JSON.parse(JsonString)
- currentPower = parseInt(JsonObject.powerValue)
- if (debugOutput) console.log("currentPower: " + currentPower)
- var today2 = Math.floor((JsonObject.todayValue)*1000)
- if (debugOutput) console.log("today2: " + today2)
- totalValue= Math.floor((JsonObject.totalValue)*1000)
- if (debugOutput) console.log("totalValue: " + totalValue)
- //getGrowattStep3()
- parseReturnData(currentPower,totalValue,today2,0,0,0,0,http.status,"succes")
- }
- catch (e){
- currentPower = 0
- parseReturnData(0,totalValue,0,0,0,0,0, http.status,"error")
- }
- } else {
- if (debugOutput) console.log("*********SolarPanel getGrowattStep3 http.status " + http.status)
- parseReturnData(0,totalValue,0,0,0,0,0, http.status,"error")
- }
- }
- }
- http.send(params);
+///////// 1.0.13
+///////// GROW1 /////////////
+///////// Plugin to extract Growatt Solar data for Toon ///////////////
+///////// By Oepi-Loepi ///////////////
+
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
+ if (debugOutput) console.log("*********SolarPanel Start getGrowattStep1")
+ //modified hash : if first of pairs is 0 then replace by c
+ var newpass= Qt.md5(passWord)
+ var newString =""
+ for(var x = 0;x < newpass.length ;x++){
+ if ((x%2 == 0) && newpass[x] == "0") {
+ newString += "c"
+ }
+ else{
+ newString += newpass[x]
+ }
+ }
+ var params = "password=" + newString + "&userName=" + userName
+ var http = new XMLHttpRequest()
+ var url2 = "https://server-api.growatt.com/newTwoLoginAPI.do"
+ console.log("*********SolarPanel url2" + url2)
+ http.open("POST", url2, true)
+ http.setRequestHeader("Content-type", "application/x-www-form-urlencoded")
+ http.setRequestHeader("Content-length", params.length)
+ http.setRequestHeader("Connection", "keep-alive")
+ http.setUserAgent = "ShinePhone/5.92 (iPad; iOS 14.6; Scale/2.00)"
+ http.onreadystatechange = function() { // Call a function when the state changes.
+ if (http.readyState === 4) {
+ if (http.status === 200) {
+ var JsonString = http.responseText
+ if (debugOutput) console.log("*********SolarPanel JsonString " + JsonString)
+ var JsonObject= JSON.parse(JsonString)
+ getGrowattStep2();
+ } else {
+ if (debugOutput) console.log("*********SolarPanel getGrowattStep2 http.status " + http.status)
+ currentPower = 0
+ parseReturnData(0,totalValue,0,0,0,0,0, http.status,"error")
+ }
+ }
+ }
+ http.send(params);
+ }
+
+
+
+ function getGrowattStep2(){
+ if (debugOutput) console.log("*********SolarPanel Start getGrowattStep3")
+ var http = new XMLHttpRequest()
+ var params = "language=5"
+ var url2 = "https://server-api.growatt.com/newPlantAPI.do?action=getUserCenterEnertyDataTwo"
+ console.log("*********SolarPanel url2 " + url2)
+ http.open("GET", url2, true)
+ http.setRequestHeader("Content-type", "application/x-www-form-urlencoded")
+ http.setRequestHeader("Content-length", params.length)
+ http.setRequestHeader("Connection", "keep-alive")
+ http.setUserAgent = "ShinePhone/5.92 (iPad; iOS 14.6; Scale/2.00)"
+ http.onreadystatechange = function() { // Call a function when the state changes.
+ if (http.readyState === 4) {
+ if (http.status === 200) {
+ try {
+ var JsonString = http.responseText
+ if (debugOutput) console.log("*********SolarPanel JsonString " + JsonString)
+ var JsonObject= JSON.parse(JsonString)
+ currentPower = parseInt(JsonObject.powerValue)
+ if (debugOutput) console.log("currentPower: " + currentPower)
+ var today2 = Math.floor((JsonObject.todayValue)*1000)
+ if (debugOutput) console.log("today2: " + today2)
+ totalValue= Math.floor((JsonObject.totalValue)*1000)
+ if (debugOutput) console.log("totalValue: " + totalValue)
+ //getGrowattStep3()
+ parseReturnData(currentPower,totalValue,today2,0,0,0,0,http.status,"succes")
+ }
+ catch (e){
+ currentPower = 0
+ parseReturnData(0,totalValue,0,0,0,0,0, http.status,"error")
+ }
+ } else {
+ if (debugOutput) console.log("*********SolarPanel getGrowattStep3 http.status " + http.status)
+ parseReturnData(0,totalValue,0,0,0,0,0, http.status,"error")
+ }
+ }
+ }
+ http.send(params);
}
\ No newline at end of file
diff --git a/HOMEASSISTANT1.plugin.txt b/HOMEASSISTANT1.plugin.txt
index c3e4895..e0f5022 100644
--- a/HOMEASSISTANT1.plugin.txt
+++ b/HOMEASSISTANT1.plugin.txt
@@ -5,9 +5,10 @@
//////// v1.0.2 changed http to https
-function getSolarData(password, username, apiKey, siteId, urlString, totalPower) {
+function getSolarData(password, username, apiKey, siteId, urlString, useSSL, totalPower) {
if (debugOutput) console.log("*********SolarPanel Start getHomeAssistantData")
- var url = "https://" + urlString + "/api/states/sensor.solar_panel"
+ var protocol = (useSSL == true) ? 'https' : 'http'
+ var url = protocol + "://" + urlString + "/api/states/sensor.solar_panel"
var http = new XMLHttpRequest();
if (debugOutput) console.log("*********SolarPanel HA url " + url)
http.open("GET", url, true)
diff --git a/HOMEWIZ1.plugin.txt b/HOMEWIZ1.plugin.txt
index 526944e..62f3e61 100644
--- a/HOMEWIZ1.plugin.txt
+++ b/HOMEWIZ1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract HomeWizard data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getHomewizardData")
var http = new XMLHttpRequest();
http.open("GET", "http://" + urlString + "/api/v1/data", true)
diff --git a/HOY1.plugin.txt b/HOY1.plugin.txt
index 2572513..66f4d10 100644
--- a/HOY1.plugin.txt
+++ b/HOY1.plugin.txt
@@ -4,7 +4,7 @@
///////// By Oepi-Loepi ///////////////
-function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
var data = "{\"ERROR_BACK\":true,\"LOAD\":{\"loading\":true},\"body\":{\"password\":\"" + Qt.md5(passWord) + "\",\"user_name\":\"" + userName + "\"},\"WAITING_PROMISE\":true}";
var xhr = new XMLHttpRequest();
diff --git a/HUAWEI-T1.plugin.txt b/HUAWEI-T1.plugin.txt
index 2d0d2d5..5bdf983 100644
--- a/HUAWEI-T1.plugin.txt
+++ b/HUAWEI-T1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Huawei Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
if (debugOutput) console.log("*********SolarPanel Start Huawei")
if (debugOutput) console.log("*********SolarPanel haal de huawei info op via tsc command")
diff --git a/KOSTAL1.plugin.txt b/KOSTAL1.plugin.txt
index bb13754..3a3ed92 100644
--- a/KOSTAL1.plugin.txt
+++ b/KOSTAL1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Kostal Piko Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
-function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
var http = new XMLHttpRequest();
http.open("GET", "http://pvserver:pvwr@" + urlString, true)
http.onreadystatechange = function() {
diff --git a/OMNIK1.plugin.txt b/OMNIK1.plugin.txt
index e8e7bfa..3d6ccbd 100644
--- a/OMNIK1.plugin.txt
+++ b/OMNIK1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Omnik Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarDataStep1")
var http = new XMLHttpRequest()
var url = "https://api.omnikportal.com/v1/user/account_validate";
diff --git a/OMNIK2.plugin.txt b/OMNIK2.plugin.txt
index f81f931..3230dbf 100644
--- a/OMNIK2.plugin.txt
+++ b/OMNIK2.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Omnik Local Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarDataStep1")
var http = new XMLHttpRequest()
var url = "http://" + urlString + "/js/status.js"
diff --git a/PVOUTPUT1.plugin.txt b/PVOUTPUT1.plugin.txt
index 342fc91..051e450 100644
--- a/PVOUTPUT1.plugin.txt
+++ b/PVOUTPUT1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract PVoutput data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
-function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getPVOutputData")
var http = new XMLHttpRequest()
var url = "https://pvoutput.org/service/r2/getstatus.jsp?stats=1"
diff --git a/SAJ1.plugin.txt b/SAJ1.plugin.txt
index f306047..2a31531 100644
--- a/SAJ1.plugin.txt
+++ b/SAJ1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract SAJ Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSAJData")
var http = new XMLHttpRequest();
http.open("GET", "http://" + urlString + "/real_time_data.xml", true)
diff --git a/SAJ2.plugin.txt b/SAJ2.plugin.txt
index e6fcaa1..70c099c 100644
--- a/SAJ2.plugin.txt
+++ b/SAJ2.plugin.txt
@@ -5,7 +5,7 @@
-function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
console.log("Start getStep1")
var xhr = new XMLHttpRequest()
diff --git a/SMA1.plugin.txt b/SMA1.plugin.txt
index a37d070..b2de79b 100644
--- a/SMA1.plugin.txt
+++ b/SMA1.plugin.txt
@@ -4,7 +4,7 @@
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSmaStep1")
var http = new XMLHttpRequest()
var url = "http://" + urlString + "/dyn/login.json"
diff --git a/SMA2.plugin.txt b/SMA2.plugin.txt
index 61839f1..c5b0ee2 100644
--- a/SMA2.plugin.txt
+++ b/SMA2.plugin.txt
@@ -4,7 +4,7 @@
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start Step1")
var http = new XMLHttpRequest()
var url = "https://www.sunnyportal.com/Templates/PublicPage.aspx?page=" + apiKey
diff --git a/SMA3.plugin.txt b/SMA3.plugin.txt
index 16ceced..34dc12c 100644
--- a/SMA3.plugin.txt
+++ b/SMA3.plugin.txt
@@ -1,69 +1,69 @@
-///////// 1.0.1
-///////// SMA3 /////////////
-///////// Plugin to extract SMA Solar data for Toon ///////////////
-///////// By Oepi-Loepi ///////////////
-
-
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
- if (debugOutput) console.log("*********SolarPanel Start getSmaStep1")
- var http = new XMLHttpRequest()
- var url = "https://" + urlString + "/dyn/login.json"
- var params = "{\"pass\" : \"" + passWord + "\", \"right\" : \"usr\"}"
- http.open("POST", url, true);
- http.setRequestHeader("Accept", "application/json, text/plain, */*")
- http.setRequestHeader("Content-type", "application/json;charset=UTF-8")
- http.setRequestHeader("Connection", "Keep-alive");
- http.setRequestHeader("Content-length", params.length)
- http.onreadystatechange = function() {
- if (http.readyState === 4) {
- if (http.status === 200) {
- var JsonString = http.responseText
- var JsonObject= JSON.parse(JsonString)
- var smaSID = JsonObject.result.sid
- getSmaStep2(smaSID, urlString)
- } else {
- if (debugOutput) console.log("*********SolarPanel error: " + http.status)
- parseReturnData(0,totalValue,0,0,0,0,0, http.status,"error")
- }
- }
- }
- http.send(params);
- }
-
-
- function getSmaStep2(smaSID,urlString2){
- var http = new XMLHttpRequest()
- var url2 = "https://" + urlString2 + "/dyn/getValues.json?sid=" + smaSID
- var params = "{\"destDev\":[],\"keys\":[\"6400_00260100\",\"6400_00262200\",\"6100_40263F00\"]}"
- http.open("POST", url2, true);
- http.setRequestHeader("Accept", "application/json, text/plain, */*")
- http.setRequestHeader("Content-type", "application/json;charset=UTF-8")
- http.setRequestHeader("Connection", "Keep-alive");
- http.setRequestHeader("Content-length", params.length)
- http.onreadystatechange = function() { // Call a function when the state changes.
- if (http.readyState === 4) {
- if (http.status === 200) {
- var JsonString = http.responseText
- var JsonObject= JSON.parse(JsonString)
- var today2
-
- var jsonstr = JSON.stringify(JsonObject["result"])
- var s1= jsonstr.indexOf("\"") + 1
- var s2= jsonstr.indexOf("\"",s1)
- var identnr = jsonstr.substring(s1,s2)
-
- if ( typeof(JsonObject["result"][identnr]["6100_40263F00"]["1"][0].val) != "undefined") {currentPower = parseInt(JsonObject["result"][identnr]["6100_40263F00"]["1"][0].val)}else{ currentPower = 0}
- if ( typeof currentPower == "undefined" || isNaN(currentPower)) {currentPower =0}
- if ( typeof(JsonObject["result"][identnr]["6400_00262200"]["1"][0].val) != "undefined") today2 = parseInt(JsonObject["result"][identnr]["6400_00262200"]["1"][0].val)
- if ( typeof(JsonObject["result"][identnr]["6400_00260100"]["1"][0].val) != "undefined") totalValue = parseInt(JsonObject["result"][identnr]["6400_00260100"]["1"][0].val)
-
- parseReturnData(currentPower,totalValue,today2,0,0,0,0,http.status,"succes")
-
- } else {
- if (debugOutput) console.log("*********SolarPanel error: " + http.status)
- parseReturnData(0,totalValue,0,0,0,0,0, http.status,"error")
- }
- }
- }
- http.send(params)
- }
+///////// 1.0.1
+///////// SMA3 /////////////
+///////// Plugin to extract SMA Solar data for Toon ///////////////
+///////// By Oepi-Loepi ///////////////
+
+
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
+ if (debugOutput) console.log("*********SolarPanel Start getSmaStep1")
+ var http = new XMLHttpRequest()
+ var url = "https://" + urlString + "/dyn/login.json"
+ var params = "{\"pass\" : \"" + passWord + "\", \"right\" : \"usr\"}"
+ http.open("POST", url, true);
+ http.setRequestHeader("Accept", "application/json, text/plain, */*")
+ http.setRequestHeader("Content-type", "application/json;charset=UTF-8")
+ http.setRequestHeader("Connection", "Keep-alive");
+ http.setRequestHeader("Content-length", params.length)
+ http.onreadystatechange = function() {
+ if (http.readyState === 4) {
+ if (http.status === 200) {
+ var JsonString = http.responseText
+ var JsonObject= JSON.parse(JsonString)
+ var smaSID = JsonObject.result.sid
+ getSmaStep2(smaSID, urlString)
+ } else {
+ if (debugOutput) console.log("*********SolarPanel error: " + http.status)
+ parseReturnData(0,totalValue,0,0,0,0,0, http.status,"error")
+ }
+ }
+ }
+ http.send(params);
+ }
+
+
+ function getSmaStep2(smaSID,urlString2){
+ var http = new XMLHttpRequest()
+ var url2 = "https://" + urlString2 + "/dyn/getValues.json?sid=" + smaSID
+ var params = "{\"destDev\":[],\"keys\":[\"6400_00260100\",\"6400_00262200\",\"6100_40263F00\"]}"
+ http.open("POST", url2, true);
+ http.setRequestHeader("Accept", "application/json, text/plain, */*")
+ http.setRequestHeader("Content-type", "application/json;charset=UTF-8")
+ http.setRequestHeader("Connection", "Keep-alive");
+ http.setRequestHeader("Content-length", params.length)
+ http.onreadystatechange = function() { // Call a function when the state changes.
+ if (http.readyState === 4) {
+ if (http.status === 200) {
+ var JsonString = http.responseText
+ var JsonObject= JSON.parse(JsonString)
+ var today2
+
+ var jsonstr = JSON.stringify(JsonObject["result"])
+ var s1= jsonstr.indexOf("\"") + 1
+ var s2= jsonstr.indexOf("\"",s1)
+ var identnr = jsonstr.substring(s1,s2)
+
+ if ( typeof(JsonObject["result"][identnr]["6100_40263F00"]["1"][0].val) != "undefined") {currentPower = parseInt(JsonObject["result"][identnr]["6100_40263F00"]["1"][0].val)}else{ currentPower = 0}
+ if ( typeof currentPower == "undefined" || isNaN(currentPower)) {currentPower =0}
+ if ( typeof(JsonObject["result"][identnr]["6400_00262200"]["1"][0].val) != "undefined") today2 = parseInt(JsonObject["result"][identnr]["6400_00262200"]["1"][0].val)
+ if ( typeof(JsonObject["result"][identnr]["6400_00260100"]["1"][0].val) != "undefined") totalValue = parseInt(JsonObject["result"][identnr]["6400_00260100"]["1"][0].val)
+
+ parseReturnData(currentPower,totalValue,today2,0,0,0,0,http.status,"succes")
+
+ } else {
+ if (debugOutput) console.log("*********SolarPanel error: " + http.status)
+ parseReturnData(0,totalValue,0,0,0,0,0, http.status,"error")
+ }
+ }
+ }
+ http.send(params)
+ }
diff --git a/SOLAX1.plugin.txt b/SOLAX1.plugin.txt
index 7ec5be5..282c5cc 100644
--- a/SOLAX1.plugin.txt
+++ b/SOLAX1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Solax Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
-function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolaxData")
var http = new XMLHttpRequest();
http.open("GET", "https://www.solaxcloud.com:9443/proxy/api/getRealtimeInfo.do?tokenId=" + apiKey + "&sn=" + siteid, true)
diff --git a/SOLEDGE1.plugin.txt b/SOLEDGE1.plugin.txt
index f5d1aa5..4d80771 100644
--- a/SOLEDGE1.plugin.txt
+++ b/SOLEDGE1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract SolarEdge Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
-function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarEdgeData")
var fingerprint = "69 01 51 C2 49 16 4A 38 93 FA 7C A8 E4 BC 61 9A 25 4B 98 BF"
var http = new XMLHttpRequest();
diff --git a/SOLIS1.plugin.txt b/SOLIS1.plugin.txt
index efe4f06..84dea72 100644
--- a/SOLIS1.plugin.txt
+++ b/SOLIS1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Ginglong Solis Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarDataStep1")
var http = new XMLHttpRequest()
var url = "http://apic-cdn.solarman.cn/v/ap.2.0/cust/user/login?user_id=" + userName+ "&user_pass=" + passWord
diff --git a/SOLISCLOUD1.plugin.txt b/SOLISCLOUD1.plugin.txt
index 47e417c..7e57c10 100644
--- a/SOLISCLOUD1.plugin.txt
+++ b/SOLISCLOUD1.plugin.txt
@@ -34,7 +34,7 @@
}
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolisStep1")
var body = "{\"pageNo\":1,\"pageSize\":10}"
var keyId= userName
diff --git a/SOLMAN1.plugin.txt b/SOLMAN1.plugin.txt
index 8e007c6..9ce238d 100644
--- a/SOLMAN1.plugin.txt
+++ b/SOLMAN1.plugin.txt
@@ -103,7 +103,7 @@ function sha256(ascii) {
}
-function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
var newHash = sha256(passWord);
if (debugOutput) console.log("*********SolarPanel new function sha256: " + newHash)
diff --git a/ZEVER1.plugin.txt b/ZEVER1.plugin.txt
index ecb4f75..2c9c0bd 100644
--- a/ZEVER1.plugin.txt
+++ b/ZEVER1.plugin.txt
@@ -1,87 +1,87 @@
-///////// 1.0.8
-///////// ZEVER1 /////////////
-///////// Plugin to extract ZeverSolar Solar data for Toon ///////////////
-///////// By Oepi-Loepi ///////////////
-
-function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
- if (debugOutput) console.log("*********SolarPanel Start getZeversolarData")
- var http = new XMLHttpRequest();
- http.open("GET", "http://" + urlString + "/home.cgi", true)
- http.onreadystatechange = function() {
- if (http.readyState == XMLHttpRequest.DONE) {
- if (http.status === 200 || http.status === 300 || http.status === 302) {
- try {
- var responseText = http.responseText
- var zeversolararray = responseText.split("\n")
- if (zeversolararray[12]=="OK"){
- currentPower = parseInt(parseFloat(zeversolararray[10]))
- var today2
- var zevensolarString = zeversolararray[11].split(".")
- if (zevensolarString[1].length==1){today2 = (parseFloat(zevensolarString[0] + ".0" + zevensolarString[1])).toFixed(2)}
- if (zevensolarString[1].length==0 || zevensolarString[1].length==2){today2 = parseFloat(zeversolararray[11]).toFixed(2)}
- today2 = today2*1000
- totalValue= parseFloat(parseFloat(yesterdayTotal) + (today2))
- parseReturnData(currentPower,totalValue,today2,0,0,0,0,http.status,"succes")
- }
- else{
- parseReturnData(0,yesterdayTotal,0,0,0,0,0,http.status,"succes")
- }
- }
- catch (e){
- currentPower = 0
- parseReturnData(0,yesterdayTotal,0,0,0,0,0,http.status,"succes")
- }
- } else {
- parseReturnData(0,yesterdayTotal,0,0,0,0,0,http.status,"succes")
- }
- }
- }
- http.send();
- }
-
-
-
-
-/*
-///////// 1.0.6
-///////// ZEVER1 /////////////
-///////// Plugin to extract ZeverSolar Solar data for Toon ///////////////
-///////// By Oepi-Loepi ///////////////
-
-function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
- if (debugOutput) console.log("*********SolarPanel Start getZeversolarData")
- var http = new XMLHttpRequest();
- http.open("GET", "http://" + urlString + "/home.cgi", true)
- http.onreadystatechange = function() {
- if (http.readyState == XMLHttpRequest.DONE) {
- if (http.status === 200 || http.status === 300 || http.status === 302) {
- try {
- var responseText = http.responseText
- var zeversolararray = responseText.split("\n")
- if (zeversolararray[12]=="OK"){
- currentPower = parseInt(parseFloat(zeversolararray[10]))
- var today2
- var zevensolarString = zeversolararray[11].split(".")
- if (zevensolarString[1].length==1){today2 = (parseFloat(zevensolarString[0] + ".0" + zevensolarString[1])).toFixed(2)}
- if (zevensolarString[1].length==0 || zevensolarString[1].length==2){today2 = parseFloat(zeversolararray[11]).toFixed(2)}
- today2 = today2*1000
- totalValue= parseFloat( parseFloat(yesterdayTotal) + (today2))
- parseReturnData(currentPower,totalValue,today2,0,0,0,0,http.status,"succes")
- }
- else{
- parseReturnData(0,totalValue,todayValue,0,0,0,0,http.status,"error")
- }
- }
- catch (e){
- currentPower = 0
- parseReturnData(0,totalValue,todayValue,0,0,0,0, http.status,"error")
- }
- } else {
- parseReturnData(0,totalValue,todayValue,0,0,0,0, http.status,"error")
- }
- }
- }
- http.send();
- }
-
-*/
+///////// 1.0.8
+///////// ZEVER1 /////////////
+///////// Plugin to extract ZeverSolar Solar data for Toon ///////////////
+///////// By Oepi-Loepi ///////////////
+
+function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
+ if (debugOutput) console.log("*********SolarPanel Start getZeversolarData")
+ var http = new XMLHttpRequest();
+ http.open("GET", "http://" + urlString + "/home.cgi", true)
+ http.onreadystatechange = function() {
+ if (http.readyState == XMLHttpRequest.DONE) {
+ if (http.status === 200 || http.status === 300 || http.status === 302) {
+ try {
+ var responseText = http.responseText
+ var zeversolararray = responseText.split("\n")
+ if (zeversolararray[12]=="OK"){
+ currentPower = parseInt(parseFloat(zeversolararray[10]))
+ var today2
+ var zevensolarString = zeversolararray[11].split(".")
+ if (zevensolarString[1].length==1){today2 = (parseFloat(zevensolarString[0] + ".0" + zevensolarString[1])).toFixed(2)}
+ if (zevensolarString[1].length==0 || zevensolarString[1].length==2){today2 = parseFloat(zeversolararray[11]).toFixed(2)}
+ today2 = today2*1000
+ totalValue= parseFloat(parseFloat(yesterdayTotal) + (today2))
+ parseReturnData(currentPower,totalValue,today2,0,0,0,0,http.status,"succes")
+ }
+ else{
+ parseReturnData(0,yesterdayTotal,0,0,0,0,0,http.status,"succes")
+ }
+ }
+ catch (e){
+ currentPower = 0
+ parseReturnData(0,yesterdayTotal,0,0,0,0,0,http.status,"succes")
+ }
+ } else {
+ parseReturnData(0,yesterdayTotal,0,0,0,0,0,http.status,"succes")
+ }
+ }
+ }
+ http.send();
+ }
+
+
+
+
+/*
+///////// 1.0.6
+///////// ZEVER1 /////////////
+///////// Plugin to extract ZeverSolar Solar data for Toon ///////////////
+///////// By Oepi-Loepi ///////////////
+
+function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
+ if (debugOutput) console.log("*********SolarPanel Start getZeversolarData")
+ var http = new XMLHttpRequest();
+ http.open("GET", "http://" + urlString + "/home.cgi", true)
+ http.onreadystatechange = function() {
+ if (http.readyState == XMLHttpRequest.DONE) {
+ if (http.status === 200 || http.status === 300 || http.status === 302) {
+ try {
+ var responseText = http.responseText
+ var zeversolararray = responseText.split("\n")
+ if (zeversolararray[12]=="OK"){
+ currentPower = parseInt(parseFloat(zeversolararray[10]))
+ var today2
+ var zevensolarString = zeversolararray[11].split(".")
+ if (zevensolarString[1].length==1){today2 = (parseFloat(zevensolarString[0] + ".0" + zevensolarString[1])).toFixed(2)}
+ if (zevensolarString[1].length==0 || zevensolarString[1].length==2){today2 = parseFloat(zeversolararray[11]).toFixed(2)}
+ today2 = today2*1000
+ totalValue= parseFloat( parseFloat(yesterdayTotal) + (today2))
+ parseReturnData(currentPower,totalValue,today2,0,0,0,0,http.status,"succes")
+ }
+ else{
+ parseReturnData(0,totalValue,todayValue,0,0,0,0,http.status,"error")
+ }
+ }
+ catch (e){
+ currentPower = 0
+ parseReturnData(0,totalValue,todayValue,0,0,0,0, http.status,"error")
+ }
+ } else {
+ parseReturnData(0,totalValue,todayValue,0,0,0,0, http.status,"error")
+ }
+ }
+ }
+ http.send();
+ }
+
+*/
diff --git a/ZONNEPLAN-T1.plugin.txt b/ZONNEPLAN-T1.plugin.txt
index 428c936..62fdb99 100644
--- a/ZONNEPLAN-T1.plugin.txt
+++ b/ZONNEPLAN-T1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Zonneplan data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
if (getDataCount == 0){getZonneplanStep1(1);}
if (getDataCount == 1){getZonneplanStep1(2);}
diff --git a/ZONNEPLAN1.plugin.txt b/ZONNEPLAN1.plugin.txt
index 0b2d923..e3e86b0 100644
--- a/ZONNEPLAN1.plugin.txt
+++ b/ZONNEPLAN1.plugin.txt
@@ -3,7 +3,7 @@
///////// Plugin to extract Zonneplan data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
var http = new XMLHttpRequest()
diff --git a/inverters.json b/inverters.json
index b53119c..73af65d 100644
--- a/inverters.json
+++ b/inverters.json
@@ -1,36 +1,35 @@
{"plugins":[
- {"friendlyName":"APS (Altenergy)", "filename":"APS1", "data": ["Username","Password"], "info":"Plugin voor APSystems (Altenergy Power). Werkt via het webportal dus login voor de webinterface nodig"},
- {"friendlyName":"Canadian Solar", "filename":"CSI1", "data": ["Username","Password"], "info":"Plugin voor Canadian Solar. Geef de naam en wachtwoord van de https://monitoring.csisolar.com site"},
- {"friendlyName":"DeltaSolar", "filename":"DELTA1", "data": ["Username","Password"], "info":"Plugin voor DeltaSolar omvormers met naam en wachtwoord (van de app)"},
- {"friendlyName":"Domoticz", "filename":"DOM-DOUBLE1", "data": ["IDX","URL"], "info":"Plugin voor Domoticz. Voor enkele omvormer, geef 1 IDX, voor een dubbele omvormer geef 2 IDX als bijvoorbeeld 12+19. Geef ip incl Port als 192.168.2.86:8084"},
- {"friendlyName":"Enphase 1", "filename":"ENPHASE1", "data": ["URL"], "info":"Plugin voor Enphase omvormers. (lokaal)"},
- {"friendlyName":"Enphase D7", "filename":"ENPHASE1-D7", "data": ["Username", "Password"], "info":"Geef de naam en wachtwoord van de https://enlighten.enphaseenergy.com site"},
- {"friendlyName":"Enphase T", "filename":"ENPHASE-T1", "data": ["Username", "Password","URL"], "info":"Geef de naam en wachtwoord van de https://enlighten.enphaseenergy.com site en de URL van jouw envoy, bijvoorbeeld 192.168.10.3"},
- {"friendlyName":"FoxCloud", "filename":"FOX1", "data": ["Username","Password"], "info":"Plugin voor Foxcloud. Werkt via het webportal dus login voor de webinterface nodig"},
- {"friendlyName":"Fronius", "filename":"FRONIUS1", "data": ["URL"], "info":"Plugin voor Fronius omvormers. (lokaal)"},
- {"friendlyName":"FP4ALL", "filename":"FP4ALL", "data": ["URL"], "info":"Plugin voor FP4ALL dataloggers. (lokaal)"},
- {"friendlyName":"Goodwe", "filename":"GOODWE1", "data": ["Username","Password"], "info":"Plugin voor Goodwe omvormers via het portal"},
- {"friendlyName":"Goodwe2", "filename":"GOODWE2", "data": ["Username","Password","SiteID"], "info":"Plugin voor Goodwe omvormers via het portal. Deze gebruiken als je wilt selecteren op naam van de installtie. Vul de naam in bij siteId."},
- {"friendlyName":"Growatt", "filename":"GROW1", "data": ["Username","Password"], "info":"Plugin voor Growatt omvormers via het portal"},
- {"friendlyName":"Home Assistant", "filename":"HOMEASSISTANT1", "data": ["URL","APIKey"], "info":"Plugin voor Home Assistant. Zie README.HOMEASSISTANT1.md voor sensor specificaties.Geef ip incl Port als 192.168.1.1:8123"},
- {"friendlyName":"Homewizard", "filename":"HOMEWIZ1", "data": ["URL"], "info":"Plugin voor Wifi kWh meter van HomeWizard. ga naar in Home Wizard naar Settings, meters, jouw meter en zet Lokale API aan. Geef hier het IP adres van de kWh meter."},
- {"friendlyName":"Hoymiles", "filename":"HOY1", "data": ["SiteID","Username","Password"], "info":"Plugin voor Hoymiles omvormers via het portal. SiteId wordt gevonden door bovenin het schem in de url tekijken als je bent ingelogd."},
- {"friendlyName":"Huawei", "filename":"HUAWEI-T1", "data": ["Username","Password"], "info":"Plugin voor Huawei omvormers met naam en wachtwoord"},
- {"friendlyName":"Kostal Piko", "filename":"KOSTAL1", "data": ["URL"], "info":"Plugin voor Kostal omvormers. (lokaal)"},
- {"friendlyName":"Omnik", "filename":"OMNIK1", "data": ["Username","Password"], "info":"Deze plugin maakt gebruik van het Omnik Portal. Soms gaat het portal de fout in met de dagwaarden."},
- {"friendlyName":"Omnik lokaal", "filename":"OMNIK2", "data": ["URL"], "info":"Deze Plugin maakt lokaal verbinding met de omvormer. Probeer vooraf of het voor je omvormer werkt: http://xxx.xxx.x.xxx/js/status.js"},
- {"friendlyName":"PVOutput", "filename":"PVOUTPUT1", "data": ["SiteID", "APIKey"], "info":""},
- {"friendlyName":"SAJ Solar (local)", "filename":"SAJ1", "data": ["URL"], "info":"Deze Plugin maakt lokaal verbinding met de omvormer. Probeer vooraf of het voor je omvormer werkt: http://xxx.xxx.x.xxx/real_time_data.xml"},
- {"friendlyName":"SAJ Solar (web)", "filename":"SAJ2", "data": ["Username","Password"], "info":"Deze Plugin haalt data vanaf https://fop.saj-electric.com/ geef naam en wachtwoord."},
- {"friendlyName":"SMA (SB1.5 etc)", "filename":"SMA1", "data": ["URL", "Password"], "info":"Deze plugin dient voor de nieuwere SMA modellen zoals de SB1.5, SB2.0 en SB 3.0. De plugin maakt lokaal verbinding met de omvormer. HTTP versie"},
- {"friendlyName":"SMA (SB1.5 etc, HTTPS)", "filename":"SMA3", "data": ["URL", "Password"], "info":"Deze plugin dient voor de nieuwere SMA modellen zoals de SB1.5, SB2.0 en SB 3.0. De plugin maakt lokaal verbinding met de omvormer. HTTPS versie"},
- {"friendlyName":"SMA (tl series)", "filename":"SMA2", "data": ["APIKey"],"info":"Deze plugin dient voor de oudere SMA modellen zoals de SB3000tl-21 en SB3600tl. De plugin maakt verbinding via SunnyPortal. Login op SunnyPortal -> Scroll naar benedenv(Configuratie) en klik Overzicht van de installatie -> De API-sleutel staat in de url achter page="},
- {"friendlyName":"Solaredge", "filename":"SOLEDGE1", "data": ["SiteID", "APIKey"], "info":"Plugin voor SolarEdge omvormers via het portal"},
- {"friendlyName":"Solarman", "filename":"SOLMAN1", "data": ["Username","Password"], "info":"Plugin voor Solarman. Geef de naam en wachtwoord van de https://home.solarmanpv.com/ site"},
- {"friendlyName":"Solax", "filename":"SOLAX1", "data": ["SiteID", "APIKey"], "info":"Plugin voor Solax omvormers via het portal. De API key en de siteID wordt verkregen via het portal. Het siteID is het serienummer van de LAN module."},
- {"friendlyName":"Solis (Ginglong)", "filename":"SOLIS1", "data": ["Username","Password"], "info":"Plugin voor Solis omvormers via het portal"},
- {"friendlyName":"SolisCloud", "filename":"SOLISCLOUD1", "data": ["Username","Password","SiteID"], "info":"Vraag de sleutels aan bij Solis. (Gebr. naam=KeyId, Wachtwoord=keySecret,SiteID=Port). Zie voor info: toonforum.nl/d/633-aanvragen-van-soliscloud-sleutels-api"},
- {"friendlyName":"ZeverSolar", "filename":"ZEVER1", "data": ["URL"], "info":"Plugin voor Zeversolar omvormers. (lokaal)"},
- {"friendlyName":"Zonneplan T", "filename":"ZONNEPLAN-T1", "data": ["Username"], "info":"Geef een emailadres en klik op knop \"mail versturen\". Ga daarna naar je mail box en klik op mail bevestigen in de mail. Klik pas daarna op \"mail bevestigd\"."}
-]
-}
+ {"friendlyName":"APS (Altenergy)", "filename":"APS1", "data": ["Username","Password"], "info":"Plugin voor APSystems (Altenergy Power). Werkt via het webportal dus login voor de webinterface nodig"},
+ {"friendlyName":"Canadian Solar", "filename":"CSI1", "data": ["Username","Password"], "info":"Plugin voor Canadian Solar. Geef de naam en wachtwoord van de https://monitoring.csisolar.com site"},
+ {"friendlyName":"DeltaSolar", "filename":"DELTA1", "data": ["Username","Password"], "info":"Plugin voor DeltaSolar omvormers met naam en wachtwoord (van de app)"},
+ {"friendlyName":"Domoticz", "filename":"DOM-DOUBLE1", "data": ["IDX","URL","UseSSL"], "info":"Plugin voor Domoticz. Voor enkele omvormer, geef 1 IDX, voor een dubbele omvormer geef 2 IDX als bijvoorbeeld 12+19. Geef ip incl Port als 192.168.2.86:8084"},
+ {"friendlyName":"Enphase 1", "filename":"ENPHASE1", "data": ["URL"], "info":"Plugin voor Enphase omvormers. (lokaal)"},
+ {"friendlyName":"Enphase D7", "filename":"ENPHASE1-D7", "data": ["Username", "Password"], "info":"Geef de naam en wachtwoord van de https://enlighten.enphaseenergy.com site"},
+ {"friendlyName":"Enphase T", "filename":"ENPHASE-T1", "data": ["Username", "Password","URL"], "info":"Geef de naam en wachtwoord van de https://enlighten.enphaseenergy.com site en de URL van jouw envoy, bijvoorbeeld 192.168.10.3"},
+ {"friendlyName":"FoxCloud", "filename":"FOX1", "data": ["Username","Password"], "info":"Plugin voor Foxcloud. Werkt via het webportal dus login voor de webinterface nodig"},
+ {"friendlyName":"Fronius", "filename":"FRONIUS1", "data": ["URL"], "info":"Plugin voor Fronius omvormers. (lokaal)"},
+ {"friendlyName":"FP4ALL", "filename":"FP4ALL", "data": ["URL"], "info":"Plugin voor FP4ALL dataloggers. (lokaal)"},
+ {"friendlyName":"Goodwe", "filename":"GOODWE1", "data": ["Username","Password"], "info":"Plugin voor Goodwe omvormers via het portal"},
+ {"friendlyName":"Goodwe2", "filename":"GOODWE2", "data": ["Username","Password","SiteID"], "info":"Plugin voor Goodwe omvormers via het portal. Deze gebruiken als je wilt selecteren op naam van de installtie. Vul de naam in bij siteId."},
+ {"friendlyName":"Growatt", "filename":"GROW1", "data": ["Username","Password"], "info":"Plugin voor Growatt omvormers via het portal"},
+ {"friendlyName":"Home Assistant", "filename":"HOMEASSISTANT1", "data": ["URL","APIKey","UseSSL"], "info":"Plugin voor Home Assistant. Zie README.HOMEASSISTANT1.md voor sensor specificaties. Geef ip incl port als 192.168.1.1:8123"},
+ {"friendlyName":"Homewizard", "filename":"HOMEWIZ1", "data": ["URL"], "info":"Plugin voor Wifi kWh meter van HomeWizard. ga naar in Home Wizard naar Settings, meters, jouw meter en zet Lokale API aan. Geef hier het IP adres van de kWh meter."},
+ {"friendlyName":"Hoymiles", "filename":"HOY1", "data": ["SiteID","Username","Password"], "info":"Plugin voor Hoymiles omvormers via het portal. SiteId wordt gevonden door bovenin het schem in de url tekijken als je bent ingelogd."},
+ {"friendlyName":"Huawei", "filename":"HUAWEI-T1", "data": ["Username","Password"], "info":"Plugin voor Huawei omvormers met naam en wachtwoord"},
+ {"friendlyName":"Kostal Piko", "filename":"KOSTAL1", "data": ["URL"], "info":"Plugin voor Kostal omvormers. (lokaal)"},
+ {"friendlyName":"Omnik", "filename":"OMNIK1", "data": ["Username","Password"], "info":"Deze plugin maakt gebruik van het Omnik Portal. Soms gaat het portal de fout in met de dagwaarden."},
+ {"friendlyName":"Omnik lokaal", "filename":"OMNIK2", "data": ["URL"], "info":"Deze Plugin maakt lokaal verbinding met de omvormer. Probeer vooraf of het voor je omvormer werkt: http://xxx.xxx.x.xxx/js/status.js"},
+ {"friendlyName":"PVOutput", "filename":"PVOUTPUT1", "data": ["SiteID", "APIKey"], "info":""},
+ {"friendlyName":"SAJ Solar (local)", "filename":"SAJ1", "data": ["URL"], "info":"Deze Plugin maakt lokaal verbinding met de omvormer. Probeer vooraf of het voor je omvormer werkt: http://xxx.xxx.x.xxx/real_time_data.xml"},
+ {"friendlyName":"SAJ Solar (web)", "filename":"SAJ2", "data": ["Username","Password"], "info":"Deze Plugin haalt data vanaf https://fop.saj-electric.com/ geef naam en wachtwoord."},
+ {"friendlyName":"SMA (SB1.5 etc)", "filename":"SMA1", "data": ["URL", "Password"], "info":"Deze plugin dient voor de nieuwere SMA modellen zoals de SB1.5, SB2.0 en SB 3.0. De plugin maakt lokaal verbinding met de omvormer. HTTP versie"},
+ {"friendlyName":"SMA (SB1.5 etc, HTTPS)", "filename":"SMA3", "data": ["URL", "Password"], "info":"Deze plugin dient voor de nieuwere SMA modellen zoals de SB1.5, SB2.0 en SB 3.0. De plugin maakt lokaal verbinding met de omvormer. HTTPS versie"},
+ {"friendlyName":"SMA (tl series)", "filename":"SMA2", "data": ["APIKey"],"info":"Deze plugin dient voor de oudere SMA modellen zoals de SB3000tl-21 en SB3600tl. De plugin maakt verbinding via SunnyPortal. Login op SunnyPortal -> Scroll naar benedenv(Configuratie) en klik Overzicht van de installatie -> De API-sleutel staat in de url achter page="},
+ {"friendlyName":"Solaredge", "filename":"SOLEDGE1", "data": ["SiteID", "APIKey"], "info":"Plugin voor SolarEdge omvormers via het portal"},
+ {"friendlyName":"Solarman", "filename":"SOLMAN1", "data": ["Username","Password"], "info":"Plugin voor Solarman. Geef de naam en wachtwoord van de https://home.solarmanpv.com/ site"},
+ {"friendlyName":"Solax", "filename":"SOLAX1", "data": ["SiteID", "APIKey"], "info":"Plugin voor Solax omvormers via het portal. De API key en de siteID wordt verkregen via het portal. Het siteID is het serienummer van de LAN module."},
+ {"friendlyName":"Solis (Ginglong)", "filename":"SOLIS1", "data": ["Username","Password"], "info":"Plugin voor Solis omvormers via het portal"},
+ {"friendlyName":"SolisCloud", "filename":"SOLISCLOUD1", "data": ["Username","Password","SiteID"], "info":"Vraag de sleutels aan bij Solis. (Gebr. naam=KeyId, Wachtwoord=keySecret,SiteID=Port). Zie voor info: toonforum.nl/d/633-aanvragen-van-soliscloud-sleutels-api"},
+ {"friendlyName":"ZeverSolar", "filename":"ZEVER1", "data": ["URL"], "info":"Plugin voor Zeversolar omvormers. (lokaal)"},
+ {"friendlyName":"Zonneplan T", "filename":"ZONNEPLAN-T1", "data": ["Username"], "info":"Geef een emailadres en klik op knop \"mail versturen\". Ga daarna naar je mail box en klik op mail bevestigen in de mail. Klik pas daarna op \"mail bevestigd\"."}
+]}
diff --git a/invertersTest.json b/invertersTest.json
index d8c9dbc..2573b7c 100644
--- a/invertersTest.json
+++ b/invertersTest.json
@@ -1,38 +1,36 @@
{"plugins":[
- {"friendlyName":"APS (Altenergy)", "filename":"APS1", "data": ["Username","Password"], "info":"Plugin voor APSystems (Altenergy Power). Werkt via het webportal dus login voor de webinterface nodig"},
- {"friendlyName":"Canadian Solar", "filename":"CSI1", "data": ["Username","Password"], "info":"Plugin voor Canadian Solar. Geef de naam en wachtwoord van de https://monitoring.csisolar.com site"},
- {"friendlyName":"DeltaSolar", "filename":"DELTA1", "data": ["Username","Password"], "info":"Plugin voor DeltaSolar omvormers met naam en wachtwoord (van de app)"},
- {"friendlyName":"Domoticz", "filename":"DOM-DOUBLE1", "data": ["IDX","URL"], "info":"Plugin voor Domoticz. Voor enkele omvormer, geef 1 IDX, voor een dubbele omvormer geef 2 IDX als bijvoorbeeld 12+19. Geef ip incl Port als 192.168.2.86:8084"},
- {"friendlyName":"Enphase 1", "filename":"ENPHASE1", "data": ["URL"], "info":"Plugin voor Enphase omvormers. (lokaal)"},
- {"friendlyName":"Enphase 2", "filename":"ENPHASE2", "data": ["Username", "APIKey", "SiteID"], "info":"Deze plugin werkt met een API key, site id en user_id. Lees het forum voor het verkrijgen van de sleutels. Vul bij de gebruikersnaam de verkregen user_id in."},
- {"friendlyName":"Enphase D7", "filename":"ENPHASE1-D7", "data": ["Username", "Password"], "info":"Geef de naam en wachtwoord van de https://enlighten.enphaseenergy.com site"},
- {"friendlyName":"Enphase T", "filename":"ENPHASE-T1", "data": ["Username", "Password","URL"], "info":"Geef de naam en wachtwoord van de https://enlighten.enphaseenergy.com site en de URL van jouw envoy, bijvoorbeeld 192.168.10.3"},
- {"friendlyName":"Fronius", "filename":"FRONIUS1", "data": ["URL"], "info":"Plugin voor Fronius omvormers. (lokaal)"},
- {"friendlyName":"FP4ALL", "filename":"FP4ALL", "data": ["URL"], "info":"Plugin voor FP4ALL dataloggers. (lokaal)"},
- {"friendlyName":"Goodwe", "filename":"GOODWE1", "data": ["Username","Password"], "info":"Plugin voor Goodwe omvormers via het portal"},
- {"friendlyName":"Goodwe2", "filename":"GOODWE2", "data": ["Username","Password","SiteID"], "info":"Plugin voor Goodwe omvormers via het portal. Deze gebruiken als je wilt selecteren op naam van de installtie. Vul de naam in bij siteId."},
- {"friendlyName":"Growatt", "filename":"GROW1", "data": ["Username","Password"], "info":"Plugin voor Growatt omvormers via het portal"},
- {"friendlyName":"Home Assistant", "filename":"HOMEASSISTANT1", "data": ["URL","APIKey"], "info":"Plugin voor Home Assistant. Zie README.HOMEASSISTANT1.md voor sensor specificaties.Geef ip incl Port als 192.168.1.1:8123"},
- {"friendlyName":"Homewizard", "filename":"HOMEWIZ1", "data": ["URL"], "info":"Plugin voor Wifi kWh meter van HomeWizard. ga naar in Home Wizard naar Settings, meters, jouw meter en zet Lokale API aan. Geef hier het IP adres van de kWh meter."},
- {"friendlyName":"Hoymiles", "filename":"HOY1", "data": ["SiteID","Username","Password"], "info":"Plugin voor Hoymiles omvormers via het portal. SiteId wordt gevonden door bovenin het schem in de url tekijken als je bent ingelogd."},
- {"friendlyName":"Huawei", "filename":"HUAWEI-T1", "data": ["Username","Password"], "info":"Plugin voor Huawei omvormers met naam en wachtwoord"},
- {"friendlyName":"Kostal Piko", "filename":"KOSTAL1", "data": ["URL"], "info":"Plugin voor Kostal omvormers. (lokaal)"},
- {"friendlyName":"Omnik", "filename":"OMNIK1", "data": ["Username","Password"], "info":"Deze plugin maakt gebruik van het Omnik Portal. Soms gaat het portal de fout in met de dagwaarden."},
- {"friendlyName":"Omnik lokaal", "filename":"OMNIK2", "data": ["URL"], "info":"Deze Plugin maakt lokaal verbinding met de omvormer. Probeer vooraf of het voor je omvormer werkt: http://xxx.xxx.x.xxx/js/status.js"},
- {"friendlyName":"PVOutput", "filename":"PVOUTPUT1", "data": ["SiteID", "APIKey"], "info":""},
- {"friendlyName":"SAJ Solar (local)", "filename":"SAJ1", "data": ["URL"], "info":"Deze Plugin maakt lokaal verbinding met de omvormer. Probeer vooraf of het voor je omvormer werkt: http://xxx.xxx.x.xxx/real_time_data.xml"},
- {"friendlyName":"SAJ Solar (web)", "filename":"SAJ2", "data": ["Username","Password"], "info":"Deze Plugin haalt data vanaf https://fop.saj-electric.com/ geef naam en wachtwoord."},
- {"friendlyName":"SMA (SB1.5 etc)", "filename":"SMA1", "data": ["URL", "Password"], "info":"Deze plugin dient voor de nieuwere SMA modellen zoals de SB1.5, SB2.0 en SB 3.0. De plugin maakt lokaal verbinding met de omvormer. HTTP versie"},
- {"friendlyName":"SMA (SB1.5 etc, HTTPS)", "filename":"SMA3", "data": ["URL", "Password"], "info":"Deze plugin dient voor de nieuwere SMA modellen zoals de SB1.5, SB2.0 en SB 3.0. De plugin maakt lokaal verbinding met de omvormer. HTTPS versie"},
- {"friendlyName":"SMA (tl series)", "filename":"SMA2", "data": ["APIKey"],"info":"Deze plugin dient voor de oudere SMA modellen zoals de SB3000tl-21 en SB3600tl. De plugin maakt verbinding via SunnyPortal. Login op SunnyPortal -> Scroll naar benedenv(Configuratie) en klik Overzicht van de installatie -> De API-sleutel staat in de url achter page="},
- {"friendlyName":"Solaredge", "filename":"SOLEDGE1", "data": ["SiteID", "APIKey"], "info":"Plugin voor SolarEdge omvormers via het portal"},
- {"friendlyName":"Solarman", "filename":"SOLMAN1", "data": ["Username","Password"], "info":"Plugin voor Solarman. Geef de naam en wachtwoord van de https://home.solarmanpv.com/ site"},
- {"friendlyName":"Solax", "filename":"SOLAX1", "data": ["SiteID", "APIKey"], "info":"Plugin voor Solax omvormers via het portal. De API key en de siteID wordt verkregen via het portal. Het siteID is het serienummer van de LAN module."},
- {"friendlyName":"Solis (Ginglong)", "filename":"SOLIS1", "data": ["Username","Password"], "info":"Plugin voor Solis omvormers via het portal"},
- {"friendlyName":"SolisCloud", "filename":"SOLISCLOUD1", "data": ["Username","Password","SiteID"], "info":"Vraag de sleutels aan bij Solis. (Gebr. naam=KeyId, Wachtwoord=keySecret,SiteID=Port). Zie voor info: toonforum.nl/d/633-aanvragen-van-soliscloud-sleutels-api"},
- {"friendlyName":"ZeverSolar", "filename":"ZEVER1", "data": ["URL"], "info":"Plugin voor Zeversolar omvormers. (lokaal)"},
- {"friendlyName":"Zonneplan T", "filename":"ZONNEPLAN-T1", "data": ["Username"], "info":"Geef een emailadres en klik op knop \"mail versturen\". Ga daarna naar je mail box en klik op mail bevestigen in de mail. Klik pas daarna op \"mail bevestigd\"."},
- {"friendlyName":"Zonneplan", "filename":"ZONNEPLAN1", "data": ["Username"], "info":"Geef een emailadres en klik op knop \"mail versturen\". Ga daarna naar je mail box en klik op mail bevestigen in de mail. Klik pas daarna op \"mail bevestigd\"."}
-]
-}
-
+ {"friendlyName":"APS (Altenergy)", "filename":"APS1", "data": ["Username","Password"], "info":"Plugin voor APSystems (Altenergy Power). Werkt via het webportal dus login voor de webinterface nodig"},
+ {"friendlyName":"Canadian Solar", "filename":"CSI1", "data": ["Username","Password"], "info":"Plugin voor Canadian Solar. Geef de naam en wachtwoord van de https://monitoring.csisolar.com site"},
+ {"friendlyName":"DeltaSolar", "filename":"DELTA1", "data": ["Username","Password"], "info":"Plugin voor DeltaSolar omvormers met naam en wachtwoord (van de app)"},
+ {"friendlyName":"Domoticz", "filename":"DOM-DOUBLE1", "data": ["IDX","URL","UseSSL"], "info":"Plugin voor Domoticz. Voor enkele omvormer, geef 1 IDX, voor een dubbele omvormer geef 2 IDX als bijvoorbeeld 12+19. Geef ip incl Port als 192.168.2.86:8084"},
+ {"friendlyName":"Enphase 1", "filename":"ENPHASE1", "data": ["URL"], "info":"Plugin voor Enphase omvormers. (lokaal)"},
+ {"friendlyName":"Enphase 2", "filename":"ENPHASE2", "data": ["Username", "APIKey", "SiteID"], "info":"Deze plugin werkt met een API key, site id en user_id. Lees het forum voor het verkrijgen van de sleutels. Vul bij de gebruikersnaam de verkregen user_id in."},
+ {"friendlyName":"Enphase D7", "filename":"ENPHASE1-D7", "data": ["Username", "Password"], "info":"Geef de naam en wachtwoord van de https://enlighten.enphaseenergy.com site"},
+ {"friendlyName":"Enphase T", "filename":"ENPHASE-T1", "data": ["Username", "Password","URL"], "info":"Geef de naam en wachtwoord van de https://enlighten.enphaseenergy.com site en de URL van jouw envoy, bijvoorbeeld 192.168.10.3"},
+ {"friendlyName":"Fronius", "filename":"FRONIUS1", "data": ["URL"], "info":"Plugin voor Fronius omvormers. (lokaal)"},
+ {"friendlyName":"FP4ALL", "filename":"FP4ALL", "data": ["URL"], "info":"Plugin voor FP4ALL dataloggers. (lokaal)"},
+ {"friendlyName":"Goodwe", "filename":"GOODWE1", "data": ["Username","Password"], "info":"Plugin voor Goodwe omvormers via het portal"},
+ {"friendlyName":"Goodwe2", "filename":"GOODWE2", "data": ["Username","Password","SiteID"], "info":"Plugin voor Goodwe omvormers via het portal. Deze gebruiken als je wilt selecteren op naam van de installtie. Vul de naam in bij siteId."},
+ {"friendlyName":"Growatt", "filename":"GROW1", "data": ["Username","Password"], "info":"Plugin voor Growatt omvormers via het portal"},
+ {"friendlyName":"Home Assistant", "filename":"HOMEASSISTANT1", "data": ["URL","APIKey","UseSSL"], "info":"Plugin voor Home Assistant. Zie README.HOMEASSISTANT1.md voor sensor specificaties. Geef ip incl port als 192.168.1.1:8123"},
+ {"friendlyName":"Homewizard", "filename":"HOMEWIZ1", "data": ["URL"], "info":"Plugin voor Wifi kWh meter van HomeWizard. ga naar in Home Wizard naar Settings, meters, jouw meter en zet Lokale API aan. Geef hier het IP adres van de kWh meter."},
+ {"friendlyName":"Hoymiles", "filename":"HOY1", "data": ["SiteID","Username","Password"], "info":"Plugin voor Hoymiles omvormers via het portal. SiteId wordt gevonden door bovenin het schem in de url tekijken als je bent ingelogd."},
+ {"friendlyName":"Huawei", "filename":"HUAWEI-T1", "data": ["Username","Password"], "info":"Plugin voor Huawei omvormers met naam en wachtwoord"},
+ {"friendlyName":"Kostal Piko", "filename":"KOSTAL1", "data": ["URL"], "info":"Plugin voor Kostal omvormers. (lokaal)"},
+ {"friendlyName":"Omnik", "filename":"OMNIK1", "data": ["Username","Password"], "info":"Deze plugin maakt gebruik van het Omnik Portal. Soms gaat het portal de fout in met de dagwaarden."},
+ {"friendlyName":"Omnik lokaal", "filename":"OMNIK2", "data": ["URL"], "info":"Deze Plugin maakt lokaal verbinding met de omvormer. Probeer vooraf of het voor je omvormer werkt: http://xxx.xxx.x.xxx/js/status.js"},
+ {"friendlyName":"PVOutput", "filename":"PVOUTPUT1", "data": ["SiteID", "APIKey"], "info":""},
+ {"friendlyName":"SAJ Solar (local)", "filename":"SAJ1", "data": ["URL"], "info":"Deze Plugin maakt lokaal verbinding met de omvormer. Probeer vooraf of het voor je omvormer werkt: http://xxx.xxx.x.xxx/real_time_data.xml"},
+ {"friendlyName":"SAJ Solar (web)", "filename":"SAJ2", "data": ["Username","Password"], "info":"Deze Plugin haalt data vanaf https://fop.saj-electric.com/ geef naam en wachtwoord."},
+ {"friendlyName":"SMA (SB1.5 etc)", "filename":"SMA1", "data": ["URL", "Password"], "info":"Deze plugin dient voor de nieuwere SMA modellen zoals de SB1.5, SB2.0 en SB 3.0. De plugin maakt lokaal verbinding met de omvormer. HTTP versie"},
+ {"friendlyName":"SMA (SB1.5 etc, HTTPS)", "filename":"SMA3", "data": ["URL", "Password"], "info":"Deze plugin dient voor de nieuwere SMA modellen zoals de SB1.5, SB2.0 en SB 3.0. De plugin maakt lokaal verbinding met de omvormer. HTTPS versie"},
+ {"friendlyName":"SMA (tl series)", "filename":"SMA2", "data": ["APIKey"],"info":"Deze plugin dient voor de oudere SMA modellen zoals de SB3000tl-21 en SB3600tl. De plugin maakt verbinding via SunnyPortal. Login op SunnyPortal -> Scroll naar benedenv(Configuratie) en klik Overzicht van de installatie -> De API-sleutel staat in de url achter page="},
+ {"friendlyName":"Solaredge", "filename":"SOLEDGE1", "data": ["SiteID", "APIKey"], "info":"Plugin voor SolarEdge omvormers via het portal"},
+ {"friendlyName":"Solarman", "filename":"SOLMAN1", "data": ["Username","Password"], "info":"Plugin voor Solarman. Geef de naam en wachtwoord van de https://home.solarmanpv.com/ site"},
+ {"friendlyName":"Solax", "filename":"SOLAX1", "data": ["SiteID", "APIKey"], "info":"Plugin voor Solax omvormers via het portal. De API key en de siteID wordt verkregen via het portal. Het siteID is het serienummer van de LAN module."},
+ {"friendlyName":"Solis (Ginglong)", "filename":"SOLIS1", "data": ["Username","Password"], "info":"Plugin voor Solis omvormers via het portal"},
+ {"friendlyName":"SolisCloud", "filename":"SOLISCLOUD1", "data": ["Username","Password","SiteID"], "info":"Vraag de sleutels aan bij Solis. (Gebr. naam=KeyId, Wachtwoord=keySecret,SiteID=Port). Zie voor info: toonforum.nl/d/633-aanvragen-van-soliscloud-sleutels-api"},
+ {"friendlyName":"ZeverSolar", "filename":"ZEVER1", "data": ["URL"], "info":"Plugin voor Zeversolar omvormers. (lokaal)"},
+ {"friendlyName":"Zonneplan T", "filename":"ZONNEPLAN-T1", "data": ["Username"], "info":"Geef een emailadres en klik op knop \"mail versturen\". Ga daarna naar je mail box en klik op mail bevestigen in de mail. Klik pas daarna op \"mail bevestigd\"."},
+ {"friendlyName":"Zonneplan", "filename":"ZONNEPLAN1", "data": ["Username"], "info":"Geef een emailadres en klik op knop \"mail versturen\". Ga daarna naar je mail box en klik op mail bevestigen in de mail. Klik pas daarna op \"mail bevestigd\"."}
+]}
diff --git a/test_delta b/test_delta
index 59b702c..24b01d1 100644
--- a/test_delta
+++ b/test_delta
@@ -3,7 +3,7 @@
///////// Plugin to extract Delta Solar data for Toon ///////////////
///////// By Oepi-Loepi ///////////////
- function getSolarData(passWord,userName,apiKey,siteid,urlString,totalValue){
+ function getSolarData(passWord,userName,apiKey,siteid,urlString,useSSL,totalPower){
if (debugOutput) console.log("*********SolarPanel Start getSolarData")
if (debugOutput) console.log("*********SolarPanel Start Delta")
if (debugOutput) console.log("*********SolarPanel haal de Delta info op via tsc command")