Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added more standard amps for Europe #23

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added more standard amps for Europe #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0aee72
Added more standard amps for Europe
Lennart-O Jun 1, 2020
2edb7ae
Removed Spike Handling
Lennart-O Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion HTML/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -747,4 +754,4 @@ function DisplayCheckbox($name, $extraParams, $value)
}
?>
</body>
</html>
</html>
8 changes: 4 additions & 4 deletions TWCManager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down