Internalize all api implementations (#773)

cmd/config.go

@@ -5,12 +5,12 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/charger"
-	"github.com/andig/evcc/meter"
+	"github.com/andig/evcc/internal/charger"
+	"github.com/andig/evcc/internal/meter"
+	"github.com/andig/evcc/internal/vehicle"
 	"github.com/andig/evcc/provider/mqtt"
 	"github.com/andig/evcc/push"
 	"github.com/andig/evcc/server"
-	"github.com/andig/evcc/vehicle"
 )
 
 type config struct {

detect/keba.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/andig/evcc/charger/keba"
+	"github.com/andig/evcc/internal/charger/keba"
 	"github.com/andig/evcc/util"
 )
 

detect/sma.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/andig/evcc/meter/sma"
+	"github.com/andig/evcc/internal/meter/sma"
 	"github.com/andig/evcc/util"
 )
 

internal/charger/evsewifi.go

@@ -58,7 +58,7 @@ func init() {
 	registry.Add("evsewifi", NewEVSEWifiFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p charger -f decorateEVSE -o evsewifi_decorators -b *EVSEWifi -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p charger -f decorateEVSE -o evsewifi_decorators -b *EVSEWifi -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
 
 // NewEVSEWifiFromConfig creates a EVSEWifi charger from generic config
 func NewEVSEWifiFromConfig(other map[string]interface{}) (api.Charger, error) {

internal/charger/keba.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/charger/keba"
+	"github.com/andig/evcc/internal/charger/keba"
 	"github.com/andig/evcc/util"
 )
 

internal/charger/nrgble_linux.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/charger/nrgble"
+	"github.com/andig/evcc/internal/charger/nrgble"
 	"github.com/andig/evcc/util"
 	"github.com/godbus/dbus/v5"
 	"github.com/lunixbochs/struc"

internal/charger/openwb.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/charger/openwb"
+	"github.com/andig/evcc/internal/charger/openwb"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/provider/mqtt"
 	"github.com/andig/evcc/util"

internal/charger/phoenix-em-eth.go

@@ -32,7 +32,7 @@ func init() {
 	registry.Add("phoenix-em-eth", NewPhoenixEMEthFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p charger -f decoratePhoenixEMEth -o phoenix-em-eth_decorators -b *PhoenixEMEth -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p charger -f decoratePhoenixEMEth -o phoenix-em-eth_decorators -b *PhoenixEMEth -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
 
 // NewPhoenixEMEthFromConfig creates a Phoenix charger from generic config
 func NewPhoenixEMEthFromConfig(other map[string]interface{}) (api.Charger, error) {
@@ -172,7 +172,7 @@ func (wb *PhoenixEMEth) currents() (float64, float64, float64, error) {
 			return 0, 0, 0, err
 		}
 
-		currents = append(currents, rs485.RTUUint32ToFloat64Swapped(b) / 1000)
+		currents = append(currents, rs485.RTUUint32ToFloat64Swapped(b)/1000)
 	}
 
 	return currents[0], currents[1], currents[2], nil

internal/charger/phoenix-ev-eth.go

@@ -26,14 +26,14 @@ var phxEVEthRegCurrents = []uint16{114, 116, 118} // current readings
 // EV-CC-AC1-M3-CBC-RCM-ETH, EV-CC-AC1-M3-CBC-RCM-ETH-3G, EV-CC-AC1-M3-RCM-ETH-XP, EV-CC-AC1-M3-RCM-ETH-3G-XP
 // It uses Modbus TCP to communicate with the controller at modbus client id 255.
 type PhoenixEVEth struct {
-	conn         *modbus.Connection
+	conn *modbus.Connection
 }
 
 func init() {
 	registry.Add("phoenix-ev-eth", NewPhoenixEVEthFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p charger -f decoratePhoenixEVEth -o phoenix-ev-eth_decorators -b *PhoenixEVEth -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p charger -f decoratePhoenixEVEth -o phoenix-ev-eth_decorators -b *PhoenixEVEth -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)"
 
 // NewPhoenixEVEthFromConfig creates a Phoenix charger from generic config
 func NewPhoenixEVEthFromConfig(other map[string]interface{}) (api.Charger, error) {

internal/charger/warp.go

@@ -64,7 +64,7 @@ type Warp struct {
 	enabled     bool // cache
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p charger -f decorateWarp -o warp_decorators -b *Warp -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p charger -f decorateWarp -o warp_decorators -b *Warp -r api.Charger -t "api.Meter,CurrentPower,func() (float64, error)" -t "api.MeterEnergy,TotalEnergy,func() (float64, error)"
 
 // NewWarp creates a new configurable charger
 func NewWarp(mqttconf mqtt.Config, topic string, timeout time.Duration) (*Warp, error) {

internal/meter/meter.go

@@ -13,7 +13,7 @@ func init() {
 	registry.Add("default", NewConfigurableFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p meter -f decorateMeter -b api.Meter -o meter_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)" -t "api.Battery,SoC,func() (float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p meter -f decorateMeter -b api.Meter -o meter_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.MeterCurrent,Currents,func() (float64, float64, float64, error)" -t "api.Battery,SoC,func() (float64, error)"
 
 // NewConfigurableFromConfig creates api.Meter from config
 func NewConfigurableFromConfig(other map[string]interface{}) (api.Meter, error) {

internal/meter/modbus.go

@@ -27,7 +27,7 @@ func init() {
 	registry.Add("modbus", NewModbusFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p meter -f decorateModbus -b api.Meter -o modbus_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,SoC,func() (float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p meter -f decorateModbus -b api.Meter -o modbus_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,SoC,func() (float64, error)"
 
 // NewModbusFromConfig creates api.Meter from config
 func NewModbusFromConfig(other map[string]interface{}) (api.Meter, error) {

internal/meter/openwb.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/charger/openwb"
+	"github.com/andig/evcc/internal/charger/openwb"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/provider/mqtt"
 	"github.com/andig/evcc/util"

internal/meter/sma.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/meter/sma"
+	"github.com/andig/evcc/internal/meter/sma"
 	"github.com/andig/evcc/util"
 )
 
@@ -37,7 +37,7 @@ func init() {
 	registry.Add("sma", NewSMAFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p meter -f decorateSMA -b api.Meter -o sma_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p meter -f decorateSMA -b api.Meter -o sma_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)"
 
 // NewSMAFromConfig creates a SMA Meter from generic config
 func NewSMAFromConfig(other map[string]interface{}) (api.Meter, error) {

internal/meter/sma_test.go

@@ -3,7 +3,7 @@ package meter
 import (
 	"testing"
 
-	"github.com/andig/evcc/meter/sma"
+	"github.com/andig/evcc/internal/meter/sma"
 	"github.com/andig/evcc/util"
 )
 

internal/meter/tesla.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/meter/powerwall"
+	"github.com/andig/evcc/internal/meter/powerwall"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
 )
@@ -26,7 +26,7 @@ func init() {
 	registry.Add("tesla", NewTeslaFromConfig)
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p meter -f decorateTesla -b api.Meter -o tesla_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,SoC,func() (float64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p meter -f decorateTesla -b api.Meter -o tesla_decorators -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,SoC,func() (float64, error)"
 
 // NewTeslaFromConfig creates a Tesla Powerwall Meter from generic config
 func NewTeslaFromConfig(other map[string]interface{}) (api.Meter, error) {

internal/vehicle/audi.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/vw"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/vw"
 )
 
 // https://github.com/davidgiga1993/AudiAPI

internal/vehicle/ford.go

@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/oidc"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
-	"github.com/andig/evcc/vehicle/oidc"
 )
 
 const (

internal/vehicle/hyundai.go

@@ -4,8 +4,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/bluelink"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/bluelink"
 )
 
 // Hyundai is an api.Vehicle implementation

internal/vehicle/id.go

@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/id"
+	"github.com/andig/evcc/internal/vehicle/vw"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/id"
-	"github.com/andig/evcc/vehicle/vw"
 )
 
 // https://github.com/TA2k/ioBroker.vw-connect

internal/vehicle/kia.go

@@ -4,8 +4,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/bluelink"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/bluelink"
 )
 
 // Kia is an api.Vehicle implementation

internal/vehicle/nissan.go

@@ -11,11 +11,11 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/kamereon"
+	"github.com/andig/evcc/internal/vehicle/oidc"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
-	"github.com/andig/evcc/vehicle/kamereon"
-	"github.com/andig/evcc/vehicle/oidc"
 )
 
 // Credits to

internal/vehicle/psa.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/psa"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/psa"
 )
 
 // https://github.com/flobz/psa_car_controller

internal/vehicle/seat.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/vw"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/vw"
 )
 
 // https://github.com/trocotronic/weconnect

internal/vehicle/skoda.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/vw"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/vw"
 )
 
 // https://github.com/trocotronic/weconnect

internal/vehicle/vehicle.go

@@ -24,7 +24,7 @@ func (m *embed) Capacity() int64 {
 	return m.capacity
 }
 
-//go:generate go run ../cmd/tools/decorate.go -p vehicle -f decorateVehicle -b api.Vehicle -o vehicle_decorators -t "api.ChargeState,Status,func() (api.ChargeStatus, error)" -t "api.VehicleRange,Range,func() (int64, error)"
+//go:generate go run ../../cmd/tools/decorate.go -p vehicle -f decorateVehicle -b api.Vehicle -o vehicle_decorators -t "api.ChargeState,Status,func() (api.ChargeStatus, error)" -t "api.VehicleRange,Range,func() (int64, error)"
 
 // Vehicle is an api.Vehicle implementation with configurable getters and setters.
 type Vehicle struct {

internal/vehicle/vw.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/internal/vehicle/vw"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/vehicle/vw"
 )
 
 // https://github.com/trocotronic/weconnect

internal/vehicle/vw/identity.go

@@ -7,9 +7,9 @@ import (
 	"net/url"
 	"strings"
 
+	"github.com/andig/evcc/internal/vehicle/id"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
-	"github.com/andig/evcc/vehicle/id"
 	"golang.org/x/net/publicsuffix"
 	"golang.org/x/oauth2"
 )

internal/vehicle/vw/token.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/andig/evcc/internal/vehicle/oidc"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
-	"github.com/andig/evcc/vehicle/oidc"
 	"github.com/imdario/mergo"
 	"golang.org/x/oauth2"
 )