From c77e45580977cce0cf77a2baba662101ad3ad61e Mon Sep 17 00:00:00 2001 From: andig Date: Sat, 21 Aug 2021 12:51:40 +0200 Subject: [PATCH] Update evcc repo uri --- .github/workflows/build.yml | 2 +- .goreleaser.yml | 2 +- Makefile | 12 ++++----- README.md | 8 +++--- api/api.go | 2 +- api/error.go | 2 +- assets/js/components/Version.stories.js | 2 +- assets/js/components/Version.vue | 2 +- assets/js/views/App.vue | 4 +-- assets/js/views/Main.vue | 4 +-- charger/abl.go | 8 +++--- charger/charger.go | 6 ++--- charger/config.go | 2 +- charger/config_test.go | 2 +- charger/easee.go | 12 ++++----- charger/easee/identity.go | 6 ++--- charger/eebus.go | 8 +++--- charger/evsewifi.go | 6 ++--- charger/evsewifi_decorators.go | 2 +- charger/evsewifi_test.go | 2 +- charger/fritzdect.go | 8 +++--- charger/go-e.go | 6 ++--- charger/go-e_test.go | 2 +- charger/heidelberg-ec.go | 8 +++--- charger/keba.go | 6 ++--- charger/keba/listener.go | 2 +- charger/keba/sender.go | 2 +- charger/keba_test.go | 2 +- charger/mcc.go | 6 ++--- charger/mcc_test.go | 6 ++--- charger/nrgble.go | 2 +- charger/nrgble_linux.go | 10 +++---- charger/nrgble_linux_test.go | 2 +- charger/nrgconnect.go | 6 ++--- charger/nrgconnect_test.go | 2 +- charger/openwb.go | 10 +++---- charger/openwb_decorators.go | 2 +- charger/openwb_test.go | 2 +- charger/phoenix-em-eth.go | 6 ++--- charger/phoenix-em-eth_decorators.go | 2 +- charger/phoenix-em-eth_test.go | 2 +- charger/phoenix-ev-eth.go | 6 ++--- charger/phoenix-ev-eth_decorators.go | 2 +- charger/phoenix-ev-eth_test.go | 2 +- charger/phoenix-ev-ser.go | 6 ++--- charger/shelly.go | 8 +++--- charger/simpleevse.go | 6 ++--- charger/tasmota.go | 8 +++--- charger/tplink.go | 6 ++--- charger/wallbe.go | 6 ++--- charger/wallbe_decorators.go | 2 +- charger/wallbe_test.go | 2 +- charger/warp.go | 8 +++--- charger/warp_decorators.go | 2 +- cmd/charger.go | 6 ++--- cmd/config.go | 14 +++++----- cmd/detect.go | 8 +++--- cmd/dump.go | 6 ++--- cmd/dumper.go | 2 +- cmd/eebus.go | 4 +-- cmd/health.go | 4 +-- cmd/meter.go | 6 ++--- cmd/root.go | 10 +++---- cmd/setup.go | 26 +++++++++---------- cmd/soc/main.go | 6 ++--- cmd/token.go | 4 +-- cmd/token_tesla.go | 2 +- cmd/token_tronity.go | 8 +++--- cmd/tools/decorate.go | 2 +- cmd/vehicle.go | 6 ++--- core/config.go | 2 +- core/coordinator.go | 4 +-- core/coordinator_test.go | 6 ++--- core/loadpoint.go | 14 +++++----- core/loadpoint_adapter.go | 2 +- core/loadpoint_api.go | 4 +-- core/loadpoint_test.go | 10 +++---- core/site.go | 8 +++--- core/site_api.go | 2 +- core/soc/estimator.go | 4 +-- core/soc/estimator_test.go | 6 ++--- core/soc/timer.go | 2 +- core/wrapper/chargerater.go | 4 +-- core/wrapper/chargerater_test.go | 6 ++--- detect/analyze.go | 2 +- detect/definitions.go | 2 +- detect/tasklist.go | 4 +-- detect/tasks/http.go | 4 +-- detect/tasks/keba.go | 4 +-- detect/tasks/modbus.go | 4 +-- detect/tasks/mqtt.go | 2 +- detect/tasks/ping.go | 2 +- detect/tasks/sma.go | 2 +- detect/tasks/tcp.go | 2 +- detect/tasks/types.go | 2 +- detect/work.go | 4 +-- ...{index.61734b83.css => index.dc3fd4c3.css} | 2 +- dist/index.html | 4 +-- dist/js/index.9033e567.js | 2 -- dist/js/index.9033e567.js.map | 1 - dist/js/index.a52119eb.js | 2 ++ dist/js/index.a52119eb.js.map | 1 + docker/bin/entrypoint.sh | 2 +- go.mod | 2 +- hems/config.go | 10 +++---- hems/ocpp/ocpp.go | 8 +++--- hems/ocpp/profile/core.go | 2 +- hems/ocpp/profile/smartcharging.go | 2 +- hems/semp/semp.go | 12 ++++----- main.go | 4 +-- meter/config.go | 2 +- meter/config_test.go | 2 +- meter/discovergy.go | 8 +++--- meter/meter.go | 6 ++--- meter/meter_average.go | 4 +-- meter/meter_decorators.go | 2 +- meter/modbus.go | 6 ++--- meter/modbus_decorators.go | 2 +- meter/openwb.go | 10 +++---- meter/sma.go | 6 ++--- meter/sma_decorators.go | 2 +- meter/tesla.go | 8 +++--- meter/tesla_decorators.go | 2 +- mock/mock_api.go | 4 +-- mock/mock_loadpoint.go | 2 +- provider/cache.go | 4 +-- provider/calc.go | 2 +- provider/helper.go | 2 +- provider/http.go | 6 ++--- provider/javascript.go | 4 +-- provider/javascript/init.go | 2 +- provider/modbus.go | 4 +-- provider/mqtt.go | 6 ++--- provider/mqtt/client.go | 4 +-- provider/mqtt/registry.go | 2 +- provider/openwb.go | 4 +-- provider/script.go | 4 +-- provider/sma.go | 4 +-- provider/sma/device.go | 2 +- provider/sma/discover.go | 2 +- provider/socket.go | 6 ++--- push/config.go | 2 +- push/hub.go | 4 +-- server/eebus.go | 2 +- server/http.go | 8 +++--- server/influxdb.go | 4 +-- server/log.go | 2 +- server/mqtt.go | 8 +++--- server/socket.go | 2 +- server/uds.go | 2 +- server/uds_windows.go | 2 +- server/updater/github.go | 2 +- server/updater/run.go | 4 +-- server/updater/run_gokrazy.go | 4 +-- server/updater/watch.go | 2 +- tariff/awattar.go | 8 +++--- tariff/config.go | 2 +- tariff/fixed.go | 4 +-- tariff/tibber.go | 8 +++--- util/modbus/modbus.go | 2 +- util/oauth/token.go | 2 +- util/pipe/limiter.go | 2 +- util/pipe/limiter_test.go | 2 +- util/request/helper.go | 2 +- util/request/roundtrip.go | 2 +- vehicle/audi.go | 8 +++--- vehicle/bluelink/api.go | 6 ++--- vehicle/bluelink/identity.go | 6 ++--- vehicle/bluelink/provider.go | 4 +-- vehicle/bluelink/stamps.go | 4 +-- vehicle/bmw.go | 6 ++--- vehicle/bmw/api.go | 4 +-- vehicle/bmw/identity.go | 6 ++--- vehicle/bmw/provider.go | 4 +-- vehicle/carwings.go | 8 +++--- vehicle/cloud.go | 12 ++++----- vehicle/config.go | 4 +-- vehicle/config_test.go | 2 +- vehicle/enyaq.go | 10 +++---- vehicle/fiat.go | 10 +++---- vehicle/fiat/identity.go | 4 +-- vehicle/ford.go | 10 +++---- vehicle/hyundai.go | 6 ++--- vehicle/id.go | 10 +++---- vehicle/id/api.go | 4 +-- vehicle/id/provider.go | 4 +-- vehicle/id/refresh.go | 6 ++--- vehicle/kia.go | 6 ++--- vehicle/nissan.go | 6 ++--- vehicle/nissan/api.go | 6 ++--- vehicle/nissan/identity.go | 6 ++--- vehicle/nissan/provider.go | 4 +-- vehicle/niu.go | 10 +++---- vehicle/ovms.go | 8 +++--- vehicle/porsche.go | 6 ++--- vehicle/porsche/identity.go | 4 +-- vehicle/porsche/provider.go | 8 +++--- vehicle/porsche/provider_emobility.go | 8 +++--- vehicle/psa.go | 6 ++--- vehicle/psa/api.go | 4 +-- vehicle/psa/identity.go | 4 +-- vehicle/psa/provider.go | 4 +-- vehicle/renault.go | 8 +++--- vehicle/seat.go | 8 +++--- vehicle/skoda.go | 8 +++--- vehicle/skoda/api.go | 4 +-- vehicle/skoda/provider.go | 4 +-- vehicle/skoda/refresh.go | 6 ++--- vehicle/tesla.go | 8 +++--- vehicle/tronity.go | 14 +++++----- vehicle/vehicle.go | 6 ++--- vehicle/vehicle_decorators.go | 2 +- vehicle/volvo.go | 8 +++--- vehicle/vw.go | 8 +++--- vehicle/vw/api.go | 4 +-- vehicle/vw/identity.go | 10 +++---- vehicle/vw/provider.go | 4 +-- vehicle/vw/refresh.go | 6 ++--- vehicle/wrapper/wrapper.go | 2 +- 219 files changed, 536 insertions(+), 536 deletions(-) rename dist/css/{index.61734b83.css => index.dc3fd4c3.css} (97%) delete mode 100644 dist/js/index.9033e567.js delete mode 100644 dist/js/index.9033e567.js.map create mode 100644 dist/js/index.a52119eb.js create mode 100644 dist/js/index.a52119eb.js.map diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9dedc41b5e..bfe6b5e985 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -170,7 +170,7 @@ jobs: - name: Prepare Image run: | make prepare-image - sed -i -e 's#-ld.*$#& -X github.com/andig/evcc/server/updater.Password=${{ secrets.IMAGE_PASS }}#' buildflags/github.com/andig/evcc/buildflags.txt + sed -i -e 's#-ld.*$#& -X github.com/evcc-io/evcc/server/updater.Password=${{ secrets.IMAGE_PASS }}#' buildflags/github.com/evcc-io/evcc/buildflags.txt mkdir /home/runner/.config/gokrazy echo ${{ secrets.IMAGE_PASS }}> /home/runner/.config/gokrazy/http-password.txt diff --git a/.goreleaser.yml b/.goreleaser.yml index e1b7b1ed7a..896ae3fe64 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -12,7 +12,7 @@ builds: flags: - -tags=release ldflags: - - -X github.com/andig/evcc/server.Version={{.Version}} -X github.com/andig/evcc/server.Commit={{.ShortCommit}} -s -w + - -X github.com/evcc-io/evcc/server.Version={{.Version}} -X github.com/evcc-io/evcc/server.Commit={{.ShortCommit}} -s -w env: - CGO_ENABLED=0 goos: diff --git a/Makefile b/Makefile index b6d421b725..91219c5f87 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ SHA := $(shell test -d .git && git rev-parse --short HEAD) VERSION := $(if $(TAG_NAME),$(TAG_NAME),$(SHA)) BUILD_DATE := $(shell date -u '+%Y-%m-%d_%H:%M:%S') BUILD_TAGS := -tags=release -LD_FLAGS := -X github.com/andig/evcc/server.Version=$(VERSION) -X github.com/andig/evcc/server.Commit=$(SHA) -s -w +LD_FLAGS := -X github.com/evcc-io/evcc/server.Version=$(VERSION) -X github.com/evcc-io/evcc/server.Commit=$(SHA) -s -w BUILD_ARGS := -ldflags='$(LD_FLAGS)' # docker @@ -20,7 +20,7 @@ TARGETS := arm.v6,arm.v8,amd64 # image IMAGE_FILE := evcc_$(TAG_NAME).image IMAGE_ROOTFS := evcc_$(TAG_NAME).rootfs -IMAGE_OPTIONS := -hostname evcc -http_port 8080 github.com/gokrazy/serial-busybox github.com/gokrazy/breakglass github.com/andig/evcc +IMAGE_OPTIONS := -hostname evcc -http_port 8080 github.com/gokrazy/serial-busybox github.com/gokrazy/breakglass github.com/evcc-io/evcc default: build @@ -87,9 +87,9 @@ prepare-image: go get github.com/gokrazy/tools/cmd/gokr-packer@latest mkdir -p flags/github.com/gokrazy/breakglass echo "-forward=private-network" > flags/github.com/gokrazy/breakglass/flags.txt - mkdir -p buildflags/github.com/andig/evcc - echo "$(BUILD_TAGS),gokrazy" > buildflags/github.com/andig/evcc/buildflags.txt - echo "-ldflags=$(LD_FLAGS)" >> buildflags/github.com/andig/evcc/buildflags.txt + mkdir -p buildflags/github.com/evcc-io/evcc + echo "$(BUILD_TAGS),gokrazy" > buildflags/github.com/evcc-io/evcc/buildflags.txt + echo "-ldflags=$(LD_FLAGS)" >> buildflags/github.com/evcc-io/evcc/buildflags.txt image: gokr-packer -overwrite=$(IMAGE_FILE) -target_storage_bytes=1258299392 $(IMAGE_OPTIONS) @@ -105,7 +105,7 @@ image-update: soc: @echo Version: $(VERSION) $(BUILD_DATE) - go build -o evcc-soc $(BUILD_TAGS) $(BUILD_ARGS) github.com/andig/evcc/cmd/soc + go build -o evcc-soc $(BUILD_TAGS) $(BUILD_ARGS) github.com/evcc-io/evcc/cmd/soc stamps: docker pull hacksore/hks diff --git a/README.md b/README.md index cf379519e2..2d29a8227b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # evcc [![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/andig/evcc) -[![Build Status](https://github.com/andig/evcc/workflows/Build/badge.svg)](https://github.com/andig/evcc/actions?query=workflow%3ABuild) -[![Code Quality](https://goreportcard.com/badge/github.com/andig/evcc)](https://goreportcard.com/report/github.com/andig/evcc) -[![Latest Version](https://img.shields.io/github/release/andig/evcc.svg)](https://github.com/andig/evcc/releases) +[![Build Status](https://github.com/evcc-io/evcc/workflows/Build/badge.svg)](https://github.com/evcc-io/evcc/actions?query=workflow%3ABuild) +[![Code Quality](https://goreportcard.com/badge/github.com/evcc-io/evcc)](https://goreportcard.com/report/github.com/evcc-io/evcc) +[![Latest Version](https://img.shields.io/github/release/andig/evcc.svg)](https://github.com/evcc-io/evcc/releases) [![Pulls from Docker Hub](https://img.shields.io/docker/pulls/andig/evcc.svg)](https://hub.docker.com/r/andig/evcc) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=48YVXXA7BDNC2) @@ -23,7 +23,7 @@ EVCC is an extensible EV Charge Controller with PV integration implemented in [G - status notifications using [Telegram](https://telegram.org), [PushOver](https://pushover.net) and [many more](https://containrrr.dev/shoutrrr/) - logging using [InfluxDB](https://www.influxdata.com) and [Grafana](https://grafana.com/grafana/) - granular charge power control down to mA steps with supported chargers (labeled by e.g. smartWB als [OLC](https://board.evse-wifi.de/viewtopic.php?f=16&t=187)) -- REST and MQTT [APIs](#api) for integration with home automation systems (e.g. [HomeAssistant](https://github.com/andig/evcc-hassio-addon)) +- REST and MQTT [APIs](#api) for integration with home automation systems (e.g. [HomeAssistant](https://github.com/evcc-io/evcc-hassio-addon)) ![Screenshot](docs/screenshot.png) diff --git a/api/api.go b/api/api.go index 8222644275..a7f749ff8f 100644 --- a/api/api.go +++ b/api/api.go @@ -2,7 +2,7 @@ package api import "time" -//go:generate mockgen -package mock -destination ../mock/mock_api.go github.com/andig/evcc/api Charger,ChargeState,ChargePhases,Identifier,Meter,MeterEnergy,Vehicle,ChargeRater,Battery +//go:generate mockgen -package mock -destination ../mock/mock_api.go github.com/evcc-io/evcc/api Charger,ChargeState,ChargePhases,Identifier,Meter,MeterEnergy,Vehicle,ChargeRater,Battery // ChargeMode are charge modes modeled after OpenWB type ChargeMode string diff --git a/api/error.go b/api/error.go index 97c17f81a8..58ba7670ea 100644 --- a/api/error.go +++ b/api/error.go @@ -9,7 +9,7 @@ var ErrNotAvailable = errors.New("not available") var ErrMustRetry = errors.New("must retry") // ErrSponsorRequired indicates that a sponsor token is required -var ErrSponsorRequired = errors.New("sponsorship required, see https://github.com/andig/evcc#sponsorship") +var ErrSponsorRequired = errors.New("sponsorship required, see https://github.com/evcc-io/evcc#sponsorship") // ErrTimeout is the error returned when a timeout happened. // Modeled after context.DeadlineError diff --git a/assets/js/components/Version.stories.js b/assets/js/components/Version.stories.js index 9df09ed1c2..e16e208bfd 100644 --- a/assets/js/components/Version.stories.js +++ b/assets/js/components/Version.stories.js @@ -15,7 +15,7 @@ const Template = (args, { argTypes }) => ({ }); const releaseNotes = - '

0.48

Bug fixes:

Enhancements:

'; + '

0.48

Bug fixes:

Enhancements:

'; export const AktuelleVersion = Template.bind({}); AktuelleVersion.args = { diff --git a/assets/js/components/Version.vue b/assets/js/components/Version.vue index 44f5721b7e..16b73757fa 100644 --- a/assets/js/components/Version.vue +++ b/assets/js/components/Version.vue @@ -129,7 +129,7 @@ export default { } }, releaseNotesUrl: function (version) { - return `https://github.com/andig/evcc/releases/tag/${version}`; + return `https://github.com/evcc-io/evcc/releases/tag/${version}`; }, }, computed: { diff --git a/assets/js/views/App.vue b/assets/js/views/App.vue index bf817efe23..fba1dcab39 100644 --- a/assets/js/views/App.vue +++ b/assets/js/views/App.vue @@ -3,7 +3,7 @@