halteren/smartmeter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed battery

Browse Source
This commit is contained in:
Aart van Halteren
2022-01-10 20:45:05 +01:00
parent adb2e38efa
commit 849ce0ea1c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/battery.rb
View File

@@ -7,6 +7,10 @@ class Battery
@battery_max_kwh = battery_capacity @battery_max_kwh = battery_capacity
end end
def reset
@battery_kwh = 0.0
end
def charge(kwh) def charge(kwh)
return 0.0 if kwh.nil? return 0.0 if kwh.nil?
if battery_kwh + kwh <= battery_max_kwh if battery_kwh + kwh <= battery_max_kwh
@@ -15,7 +19,7 @@ class Battery
return kwh return kwh
else else
old_kwh = battery_kwh old_kwh = battery_kwh
battery_kwh = battery_max_kwh @battery_kwh = battery_max_kwh
#p "Battery is now at %s kwh" % battery_kwh #p "Battery is now at %s kwh" % battery_kwh
return (battery_max_kwh-old_kwh) return (battery_max_kwh-old_kwh)
end end
@@ -29,7 +33,7 @@ class Battery
return kwh return kwh
else else
old_kwh = battery_kwh old_kwh = battery_kwh
battery_kwh = 0.0 @battery_kwh = 0.0
#p "Battery is now at %s kwh" % battery_kwh #p "Battery is now at %s kwh" % battery_kwh
return old_kwh return old_kwh
end end