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

adds constants and class variables 2

Browse Source
This commit is contained in:
Aart van Halteren
2022-01-09 19:46:30 +01:00
parent feb26239f6
commit e6e5ac1791
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/reading.rb
View File

@@ -181,7 +181,7 @@ class Reading < ActiveRecord::Base
p "Battery is now at %s kwh" % @@battery_kwh p "Battery is now at %s kwh" % @@battery_kwh
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)
@@ -231,7 +231,7 @@ class Reading < ActiveRecord::Base
else else
easy_usage_rate, easy_return_rate = easy_energy_rate(formatted_hour) easy_usage_rate, easy_return_rate = easy_energy_rate(formatted_hour)
# if rate > charge_rate + 0.05 || more than 5.0 kwh then discharge_battery # if rate > charge_rate + 0.05 || more than 5.0 kwh then discharge_battery
if @battery_kwh > 5.0 || (easy_usage_rate.to_f > (low_usage_rate.to_f + 0.05)) if @@battery_kwh > 5.0 || (easy_usage_rate.to_f > (low_usage_rate.to_f + 0.05))
usage_kwh -= discharge_battery(usage_kwh) usage_kwh -= discharge_battery(usage_kwh)
end end
end end
@@ -250,7 +250,7 @@ class Reading < ActiveRecord::Base
hour_diff[:total_kwh_produced_low], hour_diff[:total_kwh_produced_low],
usage_kwh, usage_kwh,
return_kwh, return_kwh,
@battery_kwh, @@battery_kwh,
easy_usage_rate, easy_usage_rate,
easy_return_rate, easy_return_rate,
easy_cost_with_battery, easy_cost_with_battery,