yan/archived-teslamate
1
0
Fork 0
mirror of https://github.com/teslamate-org/teslamate.git synced 2026-01-24 21:06:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add start & end rated range to charges

Browse Source
This commit is contained in:
Adrian Kumpf
2019-09-13 21:14:37 +02:00
parent a1c7d8fbdd
commit 1982b413ef
14 changed files with 77 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/teslamate/log/log_charging_test.exs
+22 -12
View File
@@ -143,6 +143,7 @@ defmodule TeslaMate.LogChargingTest do
charger_power: 4,
charger_voltage: 234,
ideal_battery_range_km: 266.6,
rated_battery_range_km: 206.6,
outside_temp: 16
},
%{
@@ -155,6 +156,7 @@ defmodule TeslaMate.LogChargingTest do
charger_power: 4,
charger_voltage: 234,
ideal_battery_range_km: 267.3,
rated_battery_range_km: 207.6,
outside_temp: 15.5
},
%{
@@ -167,6 +169,7 @@ defmodule TeslaMate.LogChargingTest do
charger_power: 4,
charger_voltage: 234,
ideal_battery_range_km: 268.6,
rated_battery_range_km: 208.6,
outside_temp: 15
},
%{
@@ -179,6 +182,7 @@ defmodule TeslaMate.LogChargingTest do
charger_power: 4,
charger_voltage: 234,
ideal_battery_range_km: 268.6,
rated_battery_range_km: 208.6,
outside_temp: 14.5
}
]
@@ -192,13 +196,14 @@ defmodule TeslaMate.LogChargingTest do
assert %DateTime{} = cproc.start_date
assert %DateTime{} = cproc.end_date
assert cproc.calculated_max_range == 497
assert cproc.charge_energy_added == 0.31
assert cproc.duration_min == 4
assert cproc.end_battery_level == 54
assert cproc.start_battery_level == 50
assert cproc.start_range_km == 266.6
assert cproc.end_range_km == 268.6
assert cproc.start_ideal_range_km == 266.6
assert cproc.end_ideal_range_km == 268.6
assert cproc.start_rated_range_km == 206.6
assert cproc.end_rated_range_km == 208.6
assert cproc.outside_temp_avg == 15.25
end
@@ -241,6 +246,7 @@ defmodule TeslaMate.LogChargingTest do
charger_power: 4,
charger_voltage: 234,
ideal_battery_range_km: 266.6,
rated_battery_range_km: 206.6,
outside_temp: 16
},
%{
@@ -253,6 +259,7 @@ defmodule TeslaMate.LogChargingTest do
charger_power: 4,
charger_voltage: 234,
ideal_battery_range_km: 268.6,
rated_battery_range_km: 208.6,
outside_temp: 14.5
}
]
@@ -266,13 +273,14 @@ defmodule TeslaMate.LogChargingTest do
assert %DateTime{} = start_date = cproc.start_date
assert %DateTime{} = cproc.end_date
assert cproc.calculated_max_range == 497
assert cproc.charge_energy_added == 0.31
assert cproc.duration_min == 4
assert cproc.end_battery_level == 54
assert cproc.start_battery_level == 50
assert cproc.start_range_km == 266.6
assert cproc.end_range_km == 268.6
assert cproc.start_ideal_range_km == 266.6
assert cproc.end_ideal_range_km == 268.6
assert cproc.start_rated_range_km == 206.6
assert cproc.end_rated_range_km == 208.6
assert cproc.outside_temp_avg == 15.25
# RESUME
@@ -281,15 +289,15 @@ defmodule TeslaMate.LogChargingTest do
assert ^start_date = cproc.start_date
assert cproc.start_battery_level == 50
assert cproc.start_range_km == 266.6
assert cproc.start_ideal_range_km == 266.6
assert cproc.outside_temp_avg == 15.25
assert cproc.end_date == nil
assert cproc.calculated_max_range == nil
assert cproc.charge_energy_added == nil
assert cproc.duration_min == nil
assert cproc.end_battery_level == nil
assert cproc.end_range_km == nil
assert cproc.end_ideal_range_km == nil
assert cproc.end_rated_range_km == nil
charges = [
%{
@@ -302,6 +310,7 @@ defmodule TeslaMate.LogChargingTest do
charger_power: 4,
charger_voltage: 234,
ideal_battery_range_km: 278.6,
rated_battery_range_km: 218.6,
outside_temp: 15.01
}
]
@@ -315,13 +324,14 @@ defmodule TeslaMate.LogChargingTest do
assert ^start_date = cproc.start_date
assert %DateTime{} = cproc.end_date
assert cproc.calculated_max_range == 507
assert cproc.charge_energy_added == 0.73
assert cproc.duration_min == 14
assert cproc.end_battery_level == 55
assert cproc.start_battery_level == 50
assert cproc.start_range_km == 266.6
assert cproc.end_range_km == 278.6
assert cproc.start_ideal_range_km == 266.6
assert cproc.end_ideal_range_km == 278.6
assert cproc.start_rated_range_km == 206.6
assert cproc.end_rated_range_km == 218.6
assert cproc.outside_temp_avg == 15.17
end
end
test/teslamate/log/log_drive_test.exs
+5 -5
View File
@@ -66,7 +66,7 @@ defmodule TeslaMate.LogDriveTest do
power: 15,
odometer: 284.85156,
ideal_battery_range_km: 338.8,
battery_range_km: 308.8,
rated_battery_range_km: 308.8,
battery_level: 68,
outside_temp: 19.2,
inside_temp: 21.0
@@ -79,7 +79,7 @@ defmodule TeslaMate.LogDriveTest do
power: -4,
odometer: 285.90556,
ideal_battery_range_km: 337.8,
battery_range_km: 307.8,
rated_battery_range_km: 307.8,
battery_level: 68,
outside_temp: 19.0,
inside_temp: 21.1
@@ -92,7 +92,7 @@ defmodule TeslaMate.LogDriveTest do
power: -7,
odometer: 286.969561,
ideal_battery_range_km: 336.8,
battery_range_km: 306.8,
rated_battery_range_km: 306.8,
battery_level: 68,
outside_temp: 21.0,
inside_temp: 21.2
@@ -105,7 +105,7 @@ defmodule TeslaMate.LogDriveTest do
power: 1,
odometer: 287.00556,
ideal_battery_range_km: 335.8,
battery_range_km: 305.8,
rated_battery_range_km: 305.8,
battery_level: 68,
outside_temp: 18,
inside_temp: 20.9
@@ -118,7 +118,7 @@ defmodule TeslaMate.LogDriveTest do
power: 36,
odometer: 288.045561,
ideal_battery_range_km: 334.8,
battery_range_km: 304.8,
rated_battery_range_km: 304.8,
battery_level: 68,
outside_temp: 18.0,
inside_temp: 21.0
test/teslamate/mqtt/pubsub/vehicle_subscriber_test.exs
+2 -2
View File
@@ -34,7 +34,7 @@ defmodule TeslaMate.Mqtt.PubSub.VehicleSubscriberTest do
battery_level: 60.0,
ideal_battery_range_km: 230.5,
est_battery_range_km: 220.0,
battery_range_km: 230.5,
rated_battery_range_km: 230.5,
charge_energy_added: 25,
speed: 40,
outside_temp: 15,
@@ -86,7 +86,7 @@ defmodule TeslaMate.Mqtt.PubSub.VehicleSubscriberTest do
{:publish, "teslamate/cars/0/battery_level", "60.0", [retain: true, qos: 1]}}
assert_receive {MqttPublisherMock,
{:publish, "teslamate/cars/0/battery_range_km", "230.5",
{:publish, "teslamate/cars/0/rated_battery_range_km", "230.5",
[retain: true, qos: 1]}}
assert_receive {MqttPublisherMock,
test/teslamate_web/controllers/car_controller_test.exs
+1 -1
View File
@@ -36,7 +36,7 @@ defmodule TeslaMateWeb.CarControllerTest do
latitude: 0,
ideal_battery_range_km: 380.1,
est_battery_range_km: 401.5,
battery_range_km: 175.1,
rated_battery_range_km: 175.1,
battery_level: 80,
outside_temp: 20.1,
inside_temp: 21.0