yan/archived-teslamateapi
1
0
Fork 0
mirror of https://github.com/tobiasehlert/teslamateapi.git synced 2026-02-27 09:54:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add energy consumption to drives and drive details (#349)

Browse Source
This commit is contained in:
Lukáš Stankovič
2025-09-22 09:41:43 +02:00
committed by GitHub
parent c4d7181dd8
commit 0d55424758
2 changed files with 71 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/v1_TeslaMateAPICarsDrives.go
View File

@@ -61,23 +61,25 @@ func TeslaMateAPICarsDrivesV1(c *gin.Context) {
}
// Drives struct - child of Data
type Drives struct {
DriveID int `json:"drive_id"` // int
StartDate string `json:"start_date"` // string
EndDate string `json:"end_date"` // string
StartAddress string `json:"start_address"` // string
EndAddress string `json:"end_address"` // string
OdometerDetails OdometerDetails `json:"odometer_details"` // OdometerDetails
DurationMin int `json:"duration_min"` // int
DurationStr string `json:"duration_str"` // string
SpeedMax int `json:"speed_max"` // int
SpeedAvg float64 `json:"speed_avg"` // float64
PowerMax int `json:"power_max"` // int
PowerMin int `json:"power_min"` // int
BatteryDetails BatteryDetails `json:"battery_details"` // BatteryDetails
RangeIdeal PreferredRange `json:"range_ideal"` // PreferredRange
RangeRated PreferredRange `json:"range_rated"` // PreferredRange
OutsideTempAvg float64 `json:"outside_temp_avg"` // float64
InsideTempAvg float64 `json:"inside_temp_avg"` // float64
DriveID int `json:"drive_id"` // int
StartDate string `json:"start_date"` // string
EndDate string `json:"end_date"` // string
StartAddress string `json:"start_address"` // string
EndAddress string `json:"end_address"` // string
OdometerDetails OdometerDetails `json:"odometer_details"` // OdometerDetails
DurationMin int `json:"duration_min"` // int
DurationStr string `json:"duration_str"` // string
SpeedMax int `json:"speed_max"` // int
SpeedAvg float64 `json:"speed_avg"` // float64
PowerMax int `json:"power_max"` // int
PowerMin int `json:"power_min"` // int
BatteryDetails BatteryDetails `json:"battery_details"` // BatteryDetails
RangeIdeal PreferredRange `json:"range_ideal"` // PreferredRange
RangeRated PreferredRange `json:"range_rated"` // PreferredRange
OutsideTempAvg float64 `json:"outside_temp_avg"` // float64
InsideTempAvg float64 `json:"inside_temp_avg"` // float64
EnergyConsumedNet *float64 `json:"energy_consumed_net"` // Energy consumed (net) in kWh
ConsumptionNet *float64 `json:"consumption_net"` // Ø Consumption (net) per distance unit
}
// TeslaMateUnits struct - child of Data
type TeslaMateUnits struct {
@@ -143,7 +145,17 @@ func TeslaMateAPICarsDrivesV1(c *gin.Context) {
inside_temp_avg,
(SELECT unit_of_length FROM settings LIMIT 1) as unit_of_length,
(SELECT unit_of_temperature FROM settings LIMIT 1) as unit_of_temperature,
cars.name
cars.name,
CASE
WHEN (start_rated_range_km - end_rated_range_km) > 0
THEN (start_rated_range_km - end_rated_range_km) * cars.efficiency
ELSE NULL
END as energy_consumed_net,
CASE
WHEN (duration_min > 1 AND distance > 1 AND ( start_position.usable_battery_level IS NULL OR end_position.usable_battery_level IS NULL OR ( end_position.battery_level - end_position.usable_battery_level ) = 0 )) AND NULLIF(distance, 0) IS NOT NULL
THEN (start_rated_range_km - end_rated_range_km) * cars.efficiency / NULLIF(distance, 0) * 1000
ELSE NULL
END as consumption_net
FROM drives
LEFT JOIN cars ON car_id = cars.id
LEFT JOIN addresses start_address ON start_address_id = start_address.id
@@ -227,6 +239,8 @@ func TeslaMateAPICarsDrivesV1(c *gin.Context) {
&UnitsLength,
&UnitsTemperature,
&CarName,
&drive.EnergyConsumedNet,
&drive.ConsumptionNet,
)
// converting values based of settings UnitsLength
@@ -242,6 +256,9 @@ func TeslaMateAPICarsDrivesV1(c *gin.Context) {
drive.RangeRated.StartRange = kilometersToMiles(drive.RangeRated.StartRange)
drive.RangeRated.EndRange = kilometersToMiles(drive.RangeRated.EndRange)
drive.RangeRated.RangeDiff = kilometersToMiles(drive.RangeRated.RangeDiff)
if drive.ConsumptionNet != nil {
*drive.ConsumptionNet = kilometersToMiles(*drive.ConsumptionNet)
}
}
// converting values based of settings UnitsTemperature
if UnitsTemperature == "F" {

55
src/v1_TeslaMateAPICarsDrivesDetails.go
View File

@@ -84,24 +84,26 @@ func TeslaMateAPICarsDrivesDetailsV1(c *gin.Context) {
}
// Drive struct - child of Data
type Drive struct {
DriveID int `json:"drive_id"` // int
StartDate string `json:"start_date"` // string
EndDate string `json:"end_date"` // string
StartAddress string `json:"start_address"` // string
EndAddress string `json:"end_address"` // string
OdometerDetails OdometerDetails `json:"odometer_details"` // OdometerDetails
DurationMin int `json:"duration_min"` // int
DurationStr string `json:"duration_str"` // string
SpeedMax int `json:"speed_max"` // int
SpeedAvg float64 `json:"speed_avg"` // float64
PowerMax int `json:"power_max"` // int
PowerMin int `json:"power_min"` // int
BatteryDetails BatteryDetails `json:"battery_details"` // BatteryDetails
RangeIdeal PreferredRange `json:"range_ideal"` // PreferredRange
RangeRated PreferredRange `json:"range_rated"` // PreferredRange
OutsideTempAvg float64 `json:"outside_temp_avg"` // float64
InsideTempAvg float64 `json:"inside_temp_avg"` // float64
DriveDetails []DriveDetails `json:"drive_details"` // struct
DriveID int `json:"drive_id"` // int
StartDate string `json:"start_date"` // string
EndDate string `json:"end_date"` // string
StartAddress string `json:"start_address"` // string
EndAddress string `json:"end_address"` // string
OdometerDetails OdometerDetails `json:"odometer_details"` // OdometerDetails
DurationMin int `json:"duration_min"` // int
DurationStr string `json:"duration_str"` // string
SpeedMax int `json:"speed_max"` // int
SpeedAvg float64 `json:"speed_avg"` // float64
PowerMax int `json:"power_max"` // int
PowerMin int `json:"power_min"` // int
BatteryDetails BatteryDetails `json:"battery_details"` // BatteryDetails
RangeIdeal PreferredRange `json:"range_ideal"` // PreferredRange
RangeRated PreferredRange `json:"range_rated"` // PreferredRange
OutsideTempAvg float64 `json:"outside_temp_avg"` // float64
InsideTempAvg float64 `json:"inside_temp_avg"` // float64
EnergyConsumedNet *float64 `json:"energy_consumed_net"` // Energy consumed (net) in kWh
ConsumptionNet *float64 `json:"consumption_net"` // Ø Consumption (net) per distance unit
DriveDetails []DriveDetails `json:"drive_details"` // struct
}
// TeslaMateUnits struct - child of Data
type TeslaMateUnits struct {
@@ -160,7 +162,17 @@ func TeslaMateAPICarsDrivesDetailsV1(c *gin.Context) {
inside_temp_avg,
(SELECT unit_of_length FROM settings LIMIT 1) as unit_of_length,
(SELECT unit_of_temperature FROM settings LIMIT 1) as unit_of_temperature,
cars.name
cars.name,
CASE
WHEN (start_rated_range_km - end_rated_range_km) > 0
THEN (start_rated_range_km - end_rated_range_km) * cars.efficiency
ELSE NULL
END as energy_consumed_net,
CASE
WHEN (duration_min > 1 AND distance > 1 AND ( start_position.usable_battery_level IS NULL OR end_position.usable_battery_level IS NULL OR ( end_position.battery_level - end_position.usable_battery_level ) = 0 )) AND NULLIF(distance, 0) IS NOT NULL
THEN (start_rated_range_km - end_rated_range_km) * cars.efficiency / NULLIF(distance, 0) * 1000
ELSE NULL
END as consumption_net
FROM drives
LEFT JOIN cars ON car_id = cars.id
LEFT JOIN addresses start_address ON start_address_id = start_address.id
@@ -205,6 +217,8 @@ func TeslaMateAPICarsDrivesDetailsV1(c *gin.Context) {
&UnitsLength,
&UnitsTemperature,
&CarName,
&drive.EnergyConsumedNet,
&drive.ConsumptionNet,
)
switch err {
@@ -232,6 +246,9 @@ func TeslaMateAPICarsDrivesDetailsV1(c *gin.Context) {
drive.RangeRated.StartRange = kilometersToMiles(drive.RangeRated.StartRange)
drive.RangeRated.EndRange = kilometersToMiles(drive.RangeRated.EndRange)
drive.RangeRated.RangeDiff = kilometersToMiles(drive.RangeRated.RangeDiff)
if drive.ConsumptionNet != nil {
*drive.ConsumptionNet = kilometersToMiles(*drive.ConsumptionNet)
}
}
// converting values based of settings UnitsTemperature
if UnitsTemperature == "F" {