New picing module for Spanish PVPC model

CHANGELOG.md

@@ -20,6 +20,8 @@ This document logs the changes per release of TWCManager.
   * Expose all time properties to the policy module for evaluation (thanks @MikeBishop)
   * Impovements to policy page in Web UI to show the value of policy parameters (thanks @MikeBishop)
   * Move grace period functionality for vehicles connected prior to policy evaluation to the master module, which opens the door to policy evaluation based on vehicle arrival/VIN (thanks @MikeBishop)
+  * Split and show the values of Charger Load and Other Load in console output when the Subtract Charger Load setting is enabled (thanks @mikey4321)
+  * Added EMS module support for SmartMe API
   * Bugfixes
       * Add a sleep of 5 seconds when waking car up to avoid an infinite loop (thanks @dschuesae)
       * Fix a bug with the legacy web interface which causes the Resume Track Green Energy setting of None to fail. Also added a deprecation notice to the web interface to ensure people don't inadvertently use it over the modular interface.

README.md

@@ -7,7 +7,7 @@
 
 ## Screenshots
 ![Screenshot](docs/screenshot.png)
-![Screenshot](docs/screenshot2.png)
+![Screenshot](docs/screenshot3.png)
 
 ## How it works
 

TWCManager.py

@@ -74,6 +74,7 @@
     "Status.MQTTStatus",
     "Pricing.aWATTarPricing",
     "Pricing.StaticPricing",
+    "Pricing.PVPCesPricing",
 ]
 
 # Enable support for Python Visual Studio Debugger
@@ -99,6 +100,10 @@
     debugLog(1, "Unable to find a configuration file.")
     sys.exit()
 
+
+
+
+########################################################################
 # All TWCs ship with a random two-byte TWCID. We default to using 0x7777 as our
 # fake TWC ID. There is a 1 in 64535 chance that this ID will match each real
 # TWC on the network, in which case you should pick a different random id below.
@@ -242,6 +247,7 @@ def background_tasks_thread(master):
             elif task["cmd"] == "saveSettings":
                 master.saveSettings()
 
+
         except:
             master.debugLog(
                 1,
@@ -288,7 +294,6 @@ def check_green_energy():
         master.setGeneration(module["name"], module["ref"].getGeneration())
     master.setMaxAmpsToDivideAmongSlaves(master.getMaxAmpsToDivideGreenEnergy())
 
-
 def update_statuses():
 
     # Print a status update if we are on track green energy showing the

docs/Settings.md

@@ -37,3 +37,15 @@ The Do not Charge action states that outside of scheduled or Track Green Energy
       * Track Green Energy
 
 This is an option that currently does not operate (and will only set Non-Scheduled Charging rate to 0). In future, this will allow continuing of Track Green Energy behaviour outside of the hard-coded daylight hours (6am - 8pm).
+
+### Manual Tesla API key override
+
+In some instances, you may prefer to obtain the Tesla API keys yourself. The main benefit of this approach is that you do not need to provide your Tesla username or password to TWCManager.
+
+Another reason to use this feature might be as a temporary workaround if the Tesla authentication flow is changed or the TWCManager authentication function is faulty.
+
+Note: Providing your Tesla username and password to TWCManager to automatically fetch your Tesla API access and refresh tokens does not put your credentials at significant risk as they are only used once to fetch the token before being destroyed, however there may nonetheless be a preference not to provide these credentials at all.
+
+To obtain the key, you will need some knowledge of the Tesla API authentication flow. To assist with this, a <a href="http://registration.teslatasks.com/generateTokens">link</a> to a service which can assist you with this process is provided, however this does therefore require you to provide your credentials to that service. Otherwise, you may want to research the Tesla authentication flow and obtain the tokens yourself, or to obtain them from another application that you have previously authenticated to.
+
+Providing any value for the Access or Refresh tokens will result in the current stored tokens being overridden with the value you supply. We don't perform any validation of the tokens and the previous values are lost. Back up your settings.json file prior to entering your token manually if you need to revert your settings.

etc/twcmanager/config.json

@@ -32,6 +32,32 @@
         # wiringMaxAmpsPerTWC = 50 * 0.8 = 40 and wiringMaxAmpsAllTWCs = 40 + 40 = 80.
         "wiringMaxAmpsPerTWC": 6,
 
+
+        # If you what to limit the power drawn from the Grid you need to set this
+        # maxAmpsAllowedFromGrid and extend the policy you what it to apply, i.e.:
+        # { "name": "Charge Now with Grid power limit",
+        #   "match": [
+        #       "settings.chargeNowAmps",
+        #       "settings.chargeNowTimeEnd",
+        #       "settings.chargeNowTimeEnd",
+        #   ],
+        #   "condition": ["gt", "gt", "gt"],
+        #   "value": [0, 0, "now"],
+        #   "background_task": "checkMaxPowerFromGrid",
+        #   "charge_amps": "settings.chargeNowAmps",
+        #   "charge_limit": "config.chargeNowLimit"},
+
+        # { "name": "Scheduled Charging with Grid power limit",
+        #   "match": [ "checkScheduledCharging()" ],
+        #   "condition": [ "eq" ],
+        #   "value": [ 1 ],
+        #   "background_task": "checkMaxPowerFromGrid",
+        #   "charge_amps": "settings.scheduledAmpsMax",
+        #   "charge_limit": "config.scheduledLimit"},
+
+        "maxAmpsAllowedFromGrid": 15,
+
+
         # https://teslamotorsclub.com/tmc/threads/model-s-gen2-charger-efficiency-testing.78740/#post-1844789
         # says you're using 10.85% more power (91.75/82.77=1.1085) charging at 5A vs 40A,
         # 2.48% more power at 10A vs 40A, and 1.9% more power at 20A vs 40A.  This is
@@ -258,6 +284,25 @@
         #
         # They should primarily be used to abort charging when necessary.
         "emergency":[
+         { "name": "Charge Now with Grid power limit",
+           "match": [
+               "settings.chargeNowAmps",
+               "settings.chargeNowTimeEnd",
+               "settings.chargeNowTimeEnd",
+           ],
+           "condition": ["gt", "gt", "gt"],
+           "value": [0, 0, "now"],
+           "background_task": "checkMaxPowerFromGrid",
+           "charge_amps": "settings.chargeNowAmps",
+           "charge_limit": "config.chargeNowLimit"},
+
+         { "name": "Scheduled Charging with Grid power limit",
+           "match": [ "checkScheduledCharging()" ],
+           "condition": [ "eq" ],
+           "value": [ 1 ],
+           "background_task": "checkMaxPowerFromGrid",
+           "charge_amps": "settings.scheduledAmpsMax",
+           "charge_limit": "config.scheduledLimit"},
         ],
         # Rules in the before section here are evaluated after the Charge Now rule
         "before":[
@@ -423,7 +468,14 @@
                 "import": 0.20,
                 "export": 0.09
             }
+        },
+        "PVPCes": {
+            # Enable this module if you are a customer under PVPC in Spain
+            # You need to get a personal token from https://api.esios.ree.es/ 
+            "enabled": false,
+            "token": "xxx"
         }
+
     },
     "sources":{
         # This section is where we configure the various sources that we retrieve our generation and consumption

html/index.php

@@ -7,10 +7,6 @@
     // 1 is just the most useful info.
     // 10 is all info.
     $debugLevel = 0;
-
-    // Point $twcScriptDir to the directory containing the TWCManager.py script.
-    // Interprocess Communication with TWCManager.py will not work if this
-    // parameter is incorrect.
     $twcScriptDir = "/etc/twcmanager";
 
     // End configuration parameters