From a0aee729a338c1676f46222b1559e8be1f781fb8 Mon Sep 17 00:00:00 2001
From: Lennart-O <otten.l@web.de>
Date: Mon, 1 Jun 2020 19:56:08 +0200
Subject: [PATCH 1/2] Added more standard amps for Europe

Required for proper solar charging together with openWB
---
 HTML/index.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/HTML/index.php b/HTML/index.php
index adf4daed..76d0b90e 100755
--- a/HTML/index.php
+++ b/HTML/index.php
@@ -399,9 +399,16 @@
                     $use24HourTime = true;
                     $aryStandardAmps = array(
                                             '6A' => '6',
+                                            '7A' => '7',
                                             '8A' => '8',
+                                            '9A' => '9',
                                             '10A' => '10',
+                                            '11A' => '11',
+                                            '12A' => '12',
                                             '13A' => '13',
+                                            '14A' => '14',
+                                            '15A' => '15',
+                                            '16A' => '16',
                                             '17A' => '17',
                                             '21A' => '21',
                                             '25A' => '25',
@@ -747,4 +754,4 @@ function DisplayCheckbox($name, $extraParams, $value)
     }
 ?>
 </body>
-</html>
\ No newline at end of file
+</html>

From 2edb7ae5641c5d84c2726c4500654b700798ad4c Mon Sep 17 00:00:00 2001
From: Lennart-O <otten.l@web.de>
Date: Fri, 5 Jun 2020 21:46:00 +0200
Subject: [PATCH 2/2] Removed Spike Handling

Removed spike handling in order to smooth out solar charging with openWB
---
 TWCManager.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/TWCManager.py b/TWCManager.py
index f219e91f..e63e12a1 100644
--- a/TWCManager.py
+++ b/TWCManager.py
@@ -2251,12 +2251,12 @@ def receive_slave_heartbeat(self, heartbeatData):
                         # case, the fix is to offer it lower amps.
                         if(debugLevel >= 1):
                             print(time_now() + ': Car stuck when offered spikeAmpsToCancel6ALimit.  Offering 2 less.')
-                        desiredAmpsOffered = spikeAmpsToCancel6ALimit - 2.0
-                    elif(now - self.timeLastAmpsOfferedChanged > 5):
+                        desiredAmpsOffered = desiredAmpsOffered #don't do anything
+                    elif(now - self.timeLastAmpsOfferedChanged > 10): #increase time
                         # self.lastAmpsOffered hasn't gotten the car to draw
-                        # enough amps for over 5 seconds, so try
+                        # enough amps for over 10 seconds, so try
                         # spikeAmpsToCancel6ALimit
-                        desiredAmpsOffered = spikeAmpsToCancel6ALimit
+                        desiredAmpsOffered = desiredAmpsOffered #don't do anything
                     else:
                         # Otherwise, don't change the value of lastAmpsOffered.
                         desiredAmpsOffered = self.lastAmpsOffered