diff --git a/README.md b/README.md index 264c99963..cf379519e 100644 --- a/README.md +++ b/README.md @@ -211,7 +211,7 @@ Smart-Home outlet charger implementations: - `tasmota`: Tasmota outlets - `tplink`: TP-Link HSXXX series outlets -Configuration examples are documented at [andig/evcc-config#chargers](https://github.com/andig/evcc-config#chargers) +Configuration examples are documented at [evcc-io/config#chargers](https://github.com/evcc-io/config#chargers) #### EEBUS (experimental) preparation @@ -274,7 +274,7 @@ Available meter implementations are: - `tesla`: Tesla PowerWall meter. Use `usage` to choose meter type: `grid`/`pv`/`battery`. - `custom`: default meter implementation where meter readings- `power`, `energy`, per-phase `currents` and battery `soc` are configured using [plugins](#plugins) -Configuration examples are documented at [andig/evcc-config#meters](https://github.com/andig/evcc-config#meters) +Configuration examples are documented at [evcc-io/config#meters](https://github.com/evcc-io/config#meters) ### Vehicle @@ -306,7 +306,7 @@ Available vehicle remote interface implementations are: - `tronity`: Tronity ([sponsors only](#sponsorship)) - `custom`: default vehicle implementation using configurable [plugins](#plugins) for integrating any type of vehicle -Configuration examples are documented at [andig/evcc-config#vehicles](https://github.com/andig/evcc-config#vehicles) +Configuration examples are documented at [evcc-io/config#vehicles](https://github.com/evcc-io/config#vehicles) ### Home Energy Management System diff --git a/evcc.dist.yaml b/evcc.dist.yaml index dab1b2a1c..7709d790b 100644 --- a/evcc.dist.yaml +++ b/evcc.dist.yaml @@ -13,7 +13,7 @@ levels: # meter definitions # name can be freely chosen and is used as reference when assigning meters to site and loadpoints -# for examples see https://github.com/andig/evcc-config#meters +# for examples see https://github.com/evcc-io/config#meters meters: - name: grid type: modbus @@ -32,7 +32,7 @@ meters: # charger definitions # name can be freely chosen and is used as reference when assigning charger to vehicle -# for examples see https://github.com/andig/evcc-config#chargers +# for examples see https://github.com/evcc-io/config#chargers chargers: - name: wallbe type: wallbe # Wallbe charger @@ -42,7 +42,7 @@ chargers: # vehicle definitions # name can be freely chosen and is used as reference when assigning vehicle to loadpoint -# for examples see https://github.com/andig/evcc-config#vehicles +# for examples see https://github.com/evcc-io/config#vehicles vehicles: - name: renault type: renault diff --git a/go.mod b/go.mod index c949dd808..4c0e36302 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.16 require ( github.com/Masterminds/sprig/v3 v3.2.2 github.com/PuerkitoBio/goquery v1.7.1 - github.com/andig/evcc-config v0.0.0-20210516083211-8b5c1c7bd5b0 github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef github.com/avast/retry-go/v3 v3.1.1 github.com/aws/aws-sdk-go v1.40.7 @@ -16,6 +15,7 @@ require ( github.com/dustin/go-humanize v1.0.0 github.com/dylanmei/iso8601 v0.1.0 github.com/eclipse/paho.mqtt.golang v1.3.5 + github.com/evcc-io/config v0.0.0-20210821100131-47523461441a github.com/evcc-io/eebus v0.0.0-20210820160836-f112bdfd2960 github.com/fatih/color v1.12.0 // indirect github.com/fatih/structs v1.1.0 diff --git a/go.sum b/go.sum index f52d8a05b..4a4718380 100644 --- a/go.sum +++ b/go.sum @@ -58,8 +58,6 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alvaroloes/enumer v1.1.2/go.mod h1:FxrjvuXoDAx9isTJrv4c+T410zFi0DtXIT0m65DJ+Wo= github.com/andig/evcc v0.0.0-20200727161511-d58eb15f2dc9/go.mod h1:8HONEC6cC2s4k0u3QL7GIjrYOZYTOKiiXybw0FIJL0A= -github.com/andig/evcc-config v0.0.0-20210516083211-8b5c1c7bd5b0 h1:O59zm5Zsr+MNEPRIb0TENTKNc0/yho1ClTAdwwNEmS4= -github.com/andig/evcc-config v0.0.0-20210516083211-8b5c1c7bd5b0/go.mod h1:nsZ9UY8liEWaNZV5MFdp7TCAHP6de3RUIsBBPk5ixsA= github.com/andig/gosunspec v0.0.0-20200429133549-3cf6a82fed9c/go.mod h1:YkshK8WMzYn1iXAZzHUO75gIqhMSan2ctgBVtBkRIyA= github.com/andig/gosunspec v0.0.0-20210511114617-aa30cf9b7a3f h1:X0eQydQuoC/R1ALXgDs9v+1UKWlgGbuMg+h8flc2BJk= github.com/andig/gosunspec v0.0.0-20210511114617-aa30cf9b7a3f/go.mod h1:YkshK8WMzYn1iXAZzHUO75gIqhMSan2ctgBVtBkRIyA= @@ -157,6 +155,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evcc-io/config v0.0.0-20210821100131-47523461441a h1:0M3bEilYf3Ns9QLzXsFXWRMCySptggaQVMVn/NoLT7E= +github.com/evcc-io/config v0.0.0-20210821100131-47523461441a/go.mod h1:9JePxOisXuzfzlTlThm2eFd0xtIf2l0MSYENv6PnizU= github.com/evcc-io/eebus v0.0.0-20210820160836-f112bdfd2960 h1:zq1vblI2P6LN9vs8tQ9mFvFWEyytp49IE8ZPtr0vPas= github.com/evcc-io/eebus v0.0.0-20210820160836-f112bdfd2960/go.mod h1:AeXkioPy1hPdVuo5ESEPBcOHyzHJBl/gd5X/P7qlAQs= github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw= diff --git a/util/test/registry.go b/util/test/registry.go index 2bdffc515..ce3cdc336 100644 --- a/util/test/registry.go +++ b/util/test/registry.go @@ -1,12 +1,12 @@ package test import ( - "github.com/andig/evcc-config/registry" - _ "github.com/andig/evcc-config/templates" // import all config templates + "github.com/evcc-io/config/registry" + _ "github.com/evcc-io/config/templates" // import all config templates "gopkg.in/yaml.v3" ) -// ConfigTemplate is a configuration template from https://github.com/andig/evcc-config +// ConfigTemplate is a configuration template from https://github.com/evcc-io/config type ConfigTemplate struct { registry.Template Config map[string]interface{}