new behaviour for non pv mode

Author: Sneak-L8

README.md

@@ -104,9 +104,10 @@ Additionally there are some states to influence behaviour of photovoltaics autom
 * kecontact.n.automatic.limitCurrent - limits your charging to specified amperage in mA (0 = no limitation)
 * kecontact.n.automatic.batteryStorageStrategy - strategy whether and how your battery storage should be using for charging your vehicle
 * kecontact.n.automatic.batterySoCForCharging - limit usage of battery torage for vehicle by specifying a SoC below which charging is prohibited
-* kecontact.n.automatic.stateVehicleSoC - state name to obtain current SoC of vehicle
+* kecontact.n.automatic.stateVehicleSoC - state name to obtain current SoC of vehicle (needed for targetsoc and maxSoc)
 * kecontact.n.automatic.targetSoC - disable PV automatic (charge with max power) unless vehicle reaches this SoC
 * kecontact.n.automatic.resetTargetSoC - set to true, if taget SoC should be cleared after reached
+* kecontact.n.automatic.maxSoC - a maximum SoC, vehicle won't be charged if this SoC is reached
 
 Sample:
 To charge your vehicle with a constant amperage of 6A regardless of surplus, set photovoltaics to false and limitCurrent to 6000.
@@ -120,6 +121,7 @@ To charge your vehicle with a constant amperage of 6A regardless of surplus, set
 ### **WORK IN PROGRESS**
 * (Sneak-L8) new options to charge vehicle up to a specified SoC
 * (Sneak-L8) new option to stop charging at a certain SoC
+* (Sneak-L8) new behaviour in non pv mode: you can stop charging and adapter won't start by itself (like in passive mode but with active max power limitation)
 * (Sneak-L8) raise adapter-dev version from 1.4 to 1.5
 * (Sneak-L8) drop dependencies to chai, sinon and mocha
 

main.js

@@ -52,6 +52,7 @@ class Kecontact extends utils.Adapter {
     wallboxWarningSent = false; // Warning for inacurate regulation with Deutshcland Edition
     wallboxUnknownSent = false; // Warning wallbox not recognized
     isPassive = true; // no automatic power regulation?
+    isSwitchedToNonPv = false;
     // eslint-disable-next-line jsdoc/check-tag-names
     /** @type {Date | null} */
     lastDeviceData = null; // time of last check for device information
@@ -466,6 +467,9 @@ class Kecontact extends utils.Adapter {
                 if (oldValue != newValue) {
                     this.log.info(`change of photovoltaics automatic from ${oldValue} to ${newValue}`);
                     newValue = this.getBoolean(newValue);
+                    if (newValue === false) {
+                        this.isSwitchedToNonPv = true;
+                    }
                     this.displayChargeMode();
                     this.forceUpdateOfCalculation();
                 }
@@ -2358,13 +2362,16 @@ class Kecontact extends utils.Adapter {
                     }
                 }
             } else {
-                curr = tempMax; // no automatic active or vehicle not plugged to wallbox? Charging with maximum power possible
-                this.log.debug(`new current due to vehicle not plugged or pv automatics not active is ${curr}`);
-                this.isMaxPowerCalculation = true;
-                if (this.isVehiclePlugged()) {
-                    newValueFor1p3pSwitching = this.valueFor3pCharging;
-                } else {
-                    newValueFor1p3pSwitching = this.valueFor1p3pOff;
+                // in non pv mode charge with maximum power only if charging is actibated
+                if (this.isSwitchedToNonPv === true || this.getStateDefaultFalse(this.stateWallboxEnabled)) {
+                    curr = tempMax; // no automatic active or vehicle not plugged to wallbox? Charging with maximum power possible
+                    this.log.debug(`new current due to vehicle not plugged or pv automatics not active is ${curr}`);
+                    this.isMaxPowerCalculation = true;
+                    if (this.isVehiclePlugged()) {
+                        newValueFor1p3pSwitching = this.valueFor3pCharging;
+                    } else {
+                        newValueFor1p3pSwitching = this.valueFor1p3pOff;
+                    }
                 }
             }
         }
@@ -2431,6 +2438,7 @@ class Kecontact extends utils.Adapter {
             }
             this.log.debug(`wallbox set to charging maximum of ${curr} mA`);
             this.regulateWallbox(curr);
+            this.isSwitchedToNonPv = false;
             this.chargingToBeStarted = true;
         }
     }