Restructure device tree and remove soc server (evcc-io#1060)

maku1604 · May 21, 2021 · 80177aa · 80177aa
1 parent 70da155
commit 80177aa
Show file tree

Hide file tree

Showing 160 changed files with 60 additions and 1,450 deletions.
diff --git a/Makefile b/Makefile
@@ -102,13 +102,4 @@ image-update:
 
 soc:
 	@echo Version: $(VERSION) $(BUILD_DATE)
-	go build -o evcc-soc $(BUILD_TAGS) $(BUILD_ARGS) github.com/andig/evcc/soc/client
-
-server:
-	@echo Version: $(VERSION) $(BUILD_DATE)
-	go build -o soc-server $(BUILD_TAGS) $(BUILD_ARGS) github.com/andig/evcc/soc/server
-
-publish-server:
-	GOOS=linux GOARCH=amd64 go build -o soc-server $(BUILD_TAGS) $(BUILD_ARGS) github.com/andig/evcc/soc/server
-	docker build -f soc/Dockerfile --platform linux/amd64 -t andig/evcc-cloud .
-	docker push andig/evcc-cloud
+	go build -o evcc-soc $(BUILD_TAGS) $(BUILD_ARGS) github.com/andig/evcc/cmd/soc
diff --git a/api/plugin.go b/api/plugin.go
@@ -0,0 +1,4 @@
+package api
+
+// Custom meter/charger/vehicle type
+const Custom = "custom"
diff --git a/soc/proto/auth.proto → api/proto/auth.proto b/soc/proto/auth.proto → api/proto/auth.proto
diff --git a/soc/proto/pb/auth.pb.go → api/proto/pb/auth.pb.go b/soc/proto/pb/auth.pb.go → api/proto/pb/auth.pb.go
diff --git a/soc/proto/pb/auth_grpc.pb.go → api/proto/pb/auth_grpc.pb.go b/soc/proto/pb/auth_grpc.pb.go → api/proto/pb/auth_grpc.pb.go
diff --git a/soc/proto/pb/vehicle.pb.go → api/proto/pb/vehicle.pb.go b/soc/proto/pb/vehicle.pb.go → api/proto/pb/vehicle.pb.go
diff --git a/soc/proto/pb/vehicle_grpc.pb.go → api/proto/pb/vehicle_grpc.pb.go b/soc/proto/pb/vehicle_grpc.pb.go → api/proto/pb/vehicle_grpc.pb.go
diff --git a/soc/proto/vehicle.proto → api/proto/vehicle.proto b/soc/proto/vehicle.proto → api/proto/vehicle.proto
diff --git a/internal/charger/charger.go → charger/charger.go b/internal/charger/charger.go → charger/charger.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/util"
 )
@@ -19,7 +18,7 @@ type Charger struct {
 
 func init() {
 	registry.Add("default", NewConfigurableFromConfig)
-	registry.Add(internal.Custom, NewConfigurableFromConfig)
+	registry.Add(api.Custom, NewConfigurableFromConfig)
 }
 
 // NewConfigurableFromConfig creates a new configurable charger

diff --git a/internal/charger/config.go → charger/config.go b/internal/charger/config.go → charger/config.go
diff --git a/internal/charger/config_test.go → charger/config_test.go b/internal/charger/config_test.go → charger/config_test.go
diff --git a/internal/charger/easee.go → charger/easee.go b/internal/charger/easee.go → charger/easee.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
+	"github.com/andig/evcc/charger/easee"
 	"github.com/andig/evcc/core"
-	"github.com/andig/evcc/internal/charger/easee"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
 	"github.com/andig/evcc/util/sponsor"

diff --git a/internal/charger/easee/LICENSE → charger/easee/LICENSE b/internal/charger/easee/LICENSE → charger/easee/LICENSE
diff --git a/internal/charger/easee/identity.go → charger/easee/identity.go b/internal/charger/easee/identity.go → charger/easee/identity.go
diff --git a/internal/charger/easee/message.go → charger/easee/message.go b/internal/charger/easee/message.go → charger/easee/message.go
diff --git a/internal/charger/evsewifi.go → charger/evsewifi.go b/internal/charger/evsewifi.go → charger/evsewifi.go
@@ -58,7 +58,7 @@ func init() {
 	registry.Add("evsewifi", NewEVSEWifiFromConfig)
 }
 
-//go:generate go run ../../cmd/tools/decorate.go -f decorateEVSE -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 -f decorateEVSE -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) {

diff --git a/internal/charger/evsewifi_decorators.go → charger/evsewifi_decorators.go b/internal/charger/evsewifi_decorators.go → charger/evsewifi_decorators.go
diff --git a/internal/charger/evsewifi_test.go → charger/evsewifi_test.go b/internal/charger/evsewifi_test.go → charger/evsewifi_test.go
diff --git a/internal/charger/fritzdect.go → charger/fritzdect.go b/internal/charger/fritzdect.go → charger/fritzdect.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal/charger/fritzdect"
+	"github.com/andig/evcc/charger/fritzdect"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
 	"golang.org/x/text/encoding/unicode"

diff --git a/internal/charger/fritzdect/types.go → charger/fritzdect/types.go b/internal/charger/fritzdect/types.go → charger/fritzdect/types.go
diff --git a/internal/charger/go-e.go → charger/go-e.go b/internal/charger/go-e.go → charger/go-e.go
diff --git a/internal/charger/go-e_test.go → charger/go-e_test.go b/internal/charger/go-e_test.go → charger/go-e_test.go
diff --git a/internal/charger/keba.go → charger/keba.go b/internal/charger/keba.go → charger/keba.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal/charger/keba"
+	"github.com/andig/evcc/charger/keba"
 	"github.com/andig/evcc/util"
 )
 

diff --git a/internal/charger/keba/listener.go → charger/keba/listener.go b/internal/charger/keba/listener.go → charger/keba/listener.go
diff --git a/internal/charger/keba/reports.go → charger/keba/reports.go b/internal/charger/keba/reports.go → charger/keba/reports.go
diff --git a/internal/charger/keba/sender.go → charger/keba/sender.go b/internal/charger/keba/sender.go → charger/keba/sender.go
diff --git a/internal/charger/keba_test.go → charger/keba_test.go b/internal/charger/keba_test.go → charger/keba_test.go
diff --git a/internal/charger/mcc.go → charger/mcc.go b/internal/charger/mcc.go → charger/mcc.go
diff --git a/internal/charger/mcc_test.go → charger/mcc_test.go b/internal/charger/mcc_test.go → charger/mcc_test.go
diff --git a/internal/charger/nrgble.go → charger/nrgble.go b/internal/charger/nrgble.go → charger/nrgble.go
diff --git a/internal/charger/nrgble/nrg_linux.go → charger/nrgble/nrg_linux.go b/internal/charger/nrgble/nrg_linux.go → charger/nrgble/nrg_linux.go
diff --git a/internal/charger/nrgble/service.go → charger/nrgble/service.go b/internal/charger/nrgble/service.go → charger/nrgble/service.go
diff --git a/internal/charger/nrgble_linux.go → charger/nrgble_linux.go b/internal/charger/nrgble_linux.go → charger/nrgble_linux.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal/charger/nrgble"
+	"github.com/andig/evcc/charger/nrgble"
 	"github.com/andig/evcc/util"
 	"github.com/godbus/dbus/v5"
 	"github.com/lunixbochs/struc"

diff --git a/internal/charger/nrgble_linux_test.go → charger/nrgble_linux_test.go b/internal/charger/nrgble_linux_test.go → charger/nrgble_linux_test.go
diff --git a/internal/charger/nrgconnect.go → charger/nrgconnect.go b/internal/charger/nrgconnect.go → charger/nrgconnect.go
diff --git a/internal/charger/nrgconnect_test.go → charger/nrgconnect_test.go b/internal/charger/nrgconnect_test.go → charger/nrgconnect_test.go
diff --git a/internal/charger/openwb.go → charger/openwb.go b/internal/charger/openwb.go → charger/openwb.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal/charger/openwb"
+	"github.com/andig/evcc/charger/openwb"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/provider/mqtt"
 	"github.com/andig/evcc/util"

diff --git a/internal/charger/openwb/topics.go → charger/openwb/topics.go b/internal/charger/openwb/topics.go → charger/openwb/topics.go
diff --git a/internal/charger/openwb_test.go → charger/openwb_test.go b/internal/charger/openwb_test.go → charger/openwb_test.go
diff --git a/internal/charger/phoenix-em-eth.go → charger/phoenix-em-eth.go b/internal/charger/phoenix-em-eth.go → 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 -f decoratePhoenixEMEth -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 -f decoratePhoenixEMEth -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) {

diff --git a/...rnal/charger/phoenix-em-eth_decorators.go → charger/phoenix-em-eth_decorators.go b/...rnal/charger/phoenix-em-eth_decorators.go → charger/phoenix-em-eth_decorators.go
diff --git a/internal/charger/phoenix-em-eth_test.go → charger/phoenix-em-eth_test.go b/internal/charger/phoenix-em-eth_test.go → charger/phoenix-em-eth_test.go
diff --git a/internal/charger/phoenix-ev-eth.go → charger/phoenix-ev-eth.go b/internal/charger/phoenix-ev-eth.go → charger/phoenix-ev-eth.go
@@ -33,7 +33,7 @@ func init() {
 	registry.Add("phoenix-ev-eth", NewPhoenixEVEthFromConfig)
 }
 
-//go:generate go run ../../cmd/tools/decorate.go -f decoratePhoenixEVEth -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 -f decoratePhoenixEVEth -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) {

diff --git a/...rnal/charger/phoenix-ev-eth_decorators.go → charger/phoenix-ev-eth_decorators.go b/...rnal/charger/phoenix-ev-eth_decorators.go → charger/phoenix-ev-eth_decorators.go
diff --git a/internal/charger/phoenix-ev-eth_test.go → charger/phoenix-ev-eth_test.go b/internal/charger/phoenix-ev-eth_test.go → charger/phoenix-ev-eth_test.go
diff --git a/internal/charger/phoenix-ev-ser.go → charger/phoenix-ev-ser.go b/internal/charger/phoenix-ev-ser.go → charger/phoenix-ev-ser.go
diff --git a/internal/charger/shelly.go → charger/shelly.go b/internal/charger/shelly.go → charger/shelly.go
diff --git a/internal/charger/simpleevse.go → charger/simpleevse.go b/internal/charger/simpleevse.go → charger/simpleevse.go
diff --git a/internal/charger/tasmota.go → charger/tasmota.go b/internal/charger/tasmota.go → charger/tasmota.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal/charger/tasmota"
+	"github.com/andig/evcc/charger/tasmota"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/request"
 )

diff --git a/internal/charger/tasmota/types.go → charger/tasmota/types.go b/internal/charger/tasmota/types.go → charger/tasmota/types.go
diff --git a/internal/charger/tplink.go → charger/tplink.go b/internal/charger/tplink.go → charger/tplink.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal/charger/tplink"
+	"github.com/andig/evcc/charger/tplink"
 	"github.com/andig/evcc/util"
 )
 

diff --git a/internal/charger/tplink/types.go → charger/tplink/types.go b/internal/charger/tplink/types.go → charger/tplink/types.go
diff --git a/internal/charger/tplink/types_test.go → charger/tplink/types_test.go b/internal/charger/tplink/types_test.go → charger/tplink/types_test.go
diff --git a/internal/charger/wallbe.go → charger/wallbe.go b/internal/charger/wallbe.go → charger/wallbe.go
diff --git a/internal/charger/wallbe_decorators.go → charger/wallbe_decorators.go b/internal/charger/wallbe_decorators.go → charger/wallbe_decorators.go
diff --git a/internal/charger/wallbe_test.go → charger/wallbe_test.go b/internal/charger/wallbe_test.go → charger/wallbe_test.go
diff --git a/internal/charger/warp.go → charger/warp.go b/internal/charger/warp.go → charger/warp.go
@@ -64,7 +64,7 @@ type Warp struct {
 	enabled     bool // cache
 }
 
-//go:generate go run ../../cmd/tools/decorate.go -f decorateWarp -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 -f decorateWarp -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) {

diff --git a/internal/charger/warp_decorators.go → charger/warp_decorators.go b/internal/charger/warp_decorators.go → charger/warp_decorators.go
diff --git a/cmd/config.go b/cmd/config.go
@@ -5,12 +5,12 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal/charger"
-	"github.com/andig/evcc/internal/meter"
-	"github.com/andig/evcc/internal/vehicle"
+	"github.com/andig/evcc/charger"
+	"github.com/andig/evcc/meter"
 	"github.com/andig/evcc/provider/mqtt"
 	"github.com/andig/evcc/push"
 	"github.com/andig/evcc/server"
+	"github.com/andig/evcc/vehicle"
 )
 
 type config struct {

diff --git a/cmd/setup.go b/cmd/setup.go
@@ -8,13 +8,13 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/andig/evcc/api/proto/pb"
 	"github.com/andig/evcc/core"
 	"github.com/andig/evcc/hems"
 	"github.com/andig/evcc/provider/javascript"
 	"github.com/andig/evcc/provider/mqtt"
 	"github.com/andig/evcc/push"
 	"github.com/andig/evcc/server"
-	"github.com/andig/evcc/soc/proto/pb"
 	"github.com/andig/evcc/util"
 	"github.com/andig/evcc/util/cloud"
 	"github.com/andig/evcc/util/pipe"

diff --git a/soc/client/main.go → cmd/soc/main.go b/soc/client/main.go → cmd/soc/main.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal/vehicle"
 	"github.com/andig/evcc/util"
+	"github.com/andig/evcc/vehicle"
 )
 
 func usage() {

diff --git a/detect/tasks/keba.go b/detect/tasks/keba.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/andig/evcc/internal/charger/keba"
+	"github.com/andig/evcc/charger/keba"
 	"github.com/andig/evcc/util"
 )
 

diff --git a/detect/tasks/sma.go b/detect/tasks/sma.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/andig/evcc/internal/meter/sma"
+	"github.com/andig/evcc/meter/sma"
 	"github.com/andig/evcc/util"
 )
 

diff --git a/go.mod b/go.mod
@@ -14,7 +14,6 @@ require (
 	github.com/containrrr/shoutrrr v0.4.4
 	github.com/deepmap/oapi-codegen v1.6.1 // indirect
 	github.com/denisbrodbeck/machineid v1.0.1
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/dylanmei/iso8601 v0.1.0
 	github.com/eclipse/paho.mqtt.golang v1.3.4
 	github.com/fatih/structs v1.1.0
@@ -61,8 +60,6 @@ require (
 	github.com/prometheus/common v0.23.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac
-	github.com/shurcooL/githubv4 v0.0.0-20201206200315-234843c633fa
-	github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cobra v1.1.3
@@ -72,7 +69,7 @@ require (
 	github.com/thoas/go-funk v0.8.0
 	github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c
 	github.com/volkszaehler/mbmd v0.0.0-20210117183837-59dcc46d62d4
-	golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf
+	golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf // indirect
 	golang.org/x/mod v0.4.2 // indirect
 	golang.org/x/net v0.0.0-20210508051633-16afe75a6701
 	golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c

diff --git a/go.sum b/go.sum
@@ -135,7 +135,6 @@ github.com/deepmap/oapi-codegen v1.6.1 h1:2BvsmRb6pogGNtr8Ann+esAbSKFXx2CZN18VpA
 github.com/deepmap/oapi-codegen v1.6.1/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M=
 github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMSRhl4D7AQ=
 github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -630,10 +629,6 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/shurcooL/githubv4 v0.0.0-20201206200315-234843c633fa h1:jozR3igKlnYCj9IVHOVump59bp07oIRoLQ/CcjMYIUA=
-github.com/shurcooL/githubv4 v0.0.0-20201206200315-234843c633fa/go.mod h1:hAF0iLZy4td2EX+/8Tw+4nodhlMrwN3HupfaXj3zkGo=
-github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a h1:KikTa6HtAK8cS1qjvUvvq4QO21QnwC+EfvB+OAuZ/ZU=
-github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a/go.mod h1:AuYgA5Kyo4c7HfUmvRGs/6rGlMMV/6B1bVnB9JxJEEg=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=

diff --git a/internal/const.go b/internal/const.go
diff --git a/internal/meter/config.go → meter/config.go b/internal/meter/config.go → meter/config.go
diff --git a/internal/meter/config_test.go → meter/config_test.go b/internal/meter/config_test.go → meter/config_test.go
diff --git a/internal/meter/discovergy.go → meter/discovergy.go b/internal/meter/discovergy.go → meter/discovergy.go
diff --git a/internal/meter/meter.go → meter/meter.go b/internal/meter/meter.go → meter/meter.go
@@ -5,17 +5,16 @@ import (
 	"fmt"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/util"
 )
 
 func init() {
 	registry.Add("default", NewConfigurableFromConfig)
-	registry.Add(internal.Custom, NewConfigurableFromConfig)
+	registry.Add(api.Custom, NewConfigurableFromConfig)
 }
 
-//go:generate go run ../../cmd/tools/decorate.go -f decorateMeter -b api.Meter -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 -f decorateMeter -b api.Meter -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) {

diff --git a/internal/meter/meter_decorators.go → meter/meter_decorators.go b/internal/meter/meter_decorators.go → meter/meter_decorators.go
diff --git a/internal/meter/modbus.go → meter/modbus.go b/internal/meter/modbus.go → meter/modbus.go
@@ -27,7 +27,7 @@ func init() {
 	registry.Add("modbus", NewModbusFromConfig)
 }
 
-//go:generate go run ../../cmd/tools/decorate.go -f decorateModbus -b api.Meter -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,SoC,func() (float64, error)"
+//go:generate go run ../cmd/tools/decorate.go -f decorateModbus -b api.Meter -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) {

diff --git a/internal/meter/modbus_decorators.go → meter/modbus_decorators.go b/internal/meter/modbus_decorators.go → meter/modbus_decorators.go
diff --git a/internal/meter/openwb.go → meter/openwb.go b/internal/meter/openwb.go → meter/openwb.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal/charger/openwb"
+	"github.com/andig/evcc/charger/openwb"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/provider/mqtt"
 	"github.com/andig/evcc/util"

diff --git a/internal/meter/powerwall/powerwall.go → meter/powerwall/powerwall.go b/internal/meter/powerwall/powerwall.go → meter/powerwall/powerwall.go
diff --git a/internal/meter/sma.go → meter/sma.go b/internal/meter/sma.go → meter/sma.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal/meter/sma"
+	"github.com/andig/evcc/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 -f decorateSMA -b api.Meter -t "api.MeterEnergy,TotalEnergy,func() (float64, error)"
+//go:generate go run ../cmd/tools/decorate.go -f decorateSMA -b api.Meter -t "api.MeterEnergy,TotalEnergy,func() (float64, error)"
 
 // NewSMAFromConfig creates a SMA Meter from generic config
 func NewSMAFromConfig(other map[string]interface{}) (api.Meter, error) {

diff --git a/internal/meter/sma/listener.go → meter/sma/listener.go b/internal/meter/sma/listener.go → meter/sma/listener.go
diff --git a/internal/meter/sma/listener_test.go → meter/sma/listener_test.go b/internal/meter/sma/listener_test.go → meter/sma/listener_test.go
diff --git a/internal/meter/sma_decorators.go → meter/sma_decorators.go b/internal/meter/sma_decorators.go → meter/sma_decorators.go
diff --git a/internal/meter/sma_test.go → meter/sma_test.go b/internal/meter/sma_test.go → meter/sma_test.go
@@ -3,7 +3,7 @@ package meter
 import (
 	"testing"
 
-	"github.com/andig/evcc/internal/meter/sma"
+	"github.com/andig/evcc/meter/sma"
 	"github.com/andig/evcc/util"
 )
 

diff --git a/internal/meter/tesla.go → meter/tesla.go b/internal/meter/tesla.go → meter/tesla.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/andig/evcc/api"
-	"github.com/andig/evcc/internal/meter/powerwall"
+	"github.com/andig/evcc/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 -f decorateTesla -b api.Meter -t "api.MeterEnergy,TotalEnergy,func() (float64, error)" -t "api.Battery,SoC,func() (float64, error)"
+//go:generate go run ../cmd/tools/decorate.go -f decorateTesla -b api.Meter -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) {

diff --git a/internal/meter/tesla_decorators.go → meter/tesla_decorators.go b/internal/meter/tesla_decorators.go → meter/tesla_decorators.go
diff --git a/soc/Dockerfile b/soc/Dockerfile
diff --git a/soc/cert/ca/ca-cert.pem b/soc/cert/ca/ca-cert.pem
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"sync"
     	"time"
-    	"github.com/andig/evcc/internal/charger/keba"
+    	"github.com/andig/evcc/charger/keba"
     	"github.com/andig/evcc/util"
     )
@@ Expand Down @@