Fix some evcc issues

.chglog/CHANGELOG.tpl.md

@@ -0,0 +1,57 @@
+{{- $url := .Info.RepositoryURL }}
+{{ if .Versions -}}
+<a name="unreleased"></a>
+## [Unreleased]
+
+{{ if .Unreleased.CommitGroups -}}
+{{ range .Unreleased.CommitGroups -}}
+### {{ .Title }}
+{{ range .Commits -}}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ end }}
+{{ end -}}
+{{ end -}}
+{{ end -}}
+
+{{ range .Versions }}
+<a name="{{ .Tag.Name }}"></a>
+## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
+{{ range .CommitGroups -}}
+### {{ .Title }}
+{{ range .Commits -}}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ end }}
+{{ end -}}
+
+{{- if .RevertCommits -}}
+### Reverts
+{{ range .RevertCommits -}}
+- {{ .Revert.Header }}
+{{ end }}
+{{ end -}}
+
+{{- if .MergeCommits -}}
+### Pull Requests
+{{ range .MergeCommits -}}
+- {{ .Header }}
+{{ end }}
+{{ end -}}
+
+{{- if .NoteGroups -}}
+{{ range .NoteGroups -}}
+### {{ .Title }}
+{{ range .Notes }}
+{{ .Body }}
+{{ end }}
+{{ end -}}
+{{ end -}}
+{{ end -}}
+
+{{- if .Versions }}
+[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD
+{{ range .Versions -}}
+{{ if .Tag.Previous -}}
+[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
+{{ end -}}
+{{ end -}}
+{{ end -}}

.chglog/config.yml

@@ -0,0 +1,54 @@
+---
+style: github
+template: CHANGELOG.tpl.md
+info:
+  title: CHANGELOG
+  repository_url: https://github.com/happytobi/warp
+options:
+  tag_filter_pattern: '^v[0-9]+\.[0-9]+\.[0-9]+$'
+  sort: "date"
+
+  commits:
+    filters:
+      Type:
+        - feat
+        - fix
+        - perf
+        - refactor
+        - chore
+        - ci
+        - docs
+
+  commit_groups:
+    title_maps:
+      chore: Chores
+      ci: Continous Integration
+      docs: Documentation
+      feat: Features
+      fix: Bug Fixes
+      perf: Performance Improvements
+      refactor: Code Refactoring
+
+  header:
+    pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$"
+    pattern_maps:
+      - Type
+      - Scope
+      - Subject
+
+  refs:
+    actions:
+      - Closes
+      - closes
+      - Fixes
+      - fixes
+      - Resolves
+      - resolves
+
+  issues:
+    prefix:
+      - #
+
+  notes:
+    keywords:
+      - BREAKING CHANGE

.github/workflows/release.yml

@@ -33,24 +33,41 @@ jobs:
   release:
     name: Create Release
     runs-on: 'ubuntu-latest'
-    needs: test
+    needs:
+    env:
+      GITCHGLOG_VERSION: "0.15.4"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          fetch-tags: true
       - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
       - name: Build
         run: |
           export VERSION="${GITHUB_REF##*/}"
           make release
+
+      - name: Install git-chglog
+        shell: bash
+        run: |
+          mkdir -p tmpdir
+          ( cd tmpdir ;
+          wget https://github.com/git-chglog/git-chglog/releases/download/v${GITCHGLOG_VERSION}/git-chglog_${GITCHGLOG_VERSION}_linux_amd64.tar.gz
+          tar -tf git-chglog_*
+          tar -xvf git-chglog_* git-chglog
+          )
+          mkdir -p ~/.local/bin/
+          mv tmpdir/git-chglog ~/.local/bin/git-chglog
+          rm -rf tmpdir
+
       - name: Release Notes
         run: |
-          git log $(git describe HEAD~ --tags --abbrev=0)..HEAD --pretty='format:* %h %s%n  * %an <%ae>' --no-merges >> ".github/RELEASE-TEMPLATE.md"
-          ls -alitr
+          ~/.local/bin/git-chglog --template ./.chglog/RELEASE.tpl.md -o .github/RELEASE-TEMPLATE.md
           cat .github/RELEASE-TEMPLATE.md
+
       - name: Release with Notes
         uses: softprops/action-gh-release@v2
         with:

pkg/cmd/evcc/evcc.go

@@ -92,10 +92,11 @@ func Enable(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	//validate passed user
+	// validate passed user
 	userFilter, _ := cmd.Flags().GetString("user")
 	if len(userFilter) == 0 {
-		userFilter, _ = cmd.InheritedFlags().GetString("username")
+		//use fallback from middleware
+		userFilter = request.Username
 	}
 
 	userTag := nfc.UserTag{}
@@ -116,17 +117,23 @@ func Enable(cmd *cobra.Command, args []string) error {
 
 	evseService := evse.NewEvseService(request)
 
-	current := 0
 	if strings.EqualFold(enable, "true") {
-		current = 6000
-	}
+		current, err := evseService.CurrentChargePower()
+		if err != nil {
+			return err
+		}
 
-	if err := evseService.SetExternalCurrent(current); err != nil {
-		return err
-	}
+		if err := evseService.SetExternalCurrent(current.Current); err != nil {
+			return err
+		}
 
-	if err := nfcTagService.StartCharging(userTag); err != nil {
-		return err
+		if err := nfcTagService.StartCharging(userTag); err != nil {
+			return err
+		}
+	} else {
+		if err := nfcTagService.StopCharging(); err != nil {
+			return err
+		}
 	}
 
 	fmt.Print(enable)
@@ -144,11 +151,11 @@ func MaxCurrent(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	fmt.Print(currentAmpere)
+
 	//change 16 -> 16000
 	currentAmpere = (currentAmpere * 1e3)
 
-	fmt.Print(currentAmpere)
-
 	evseService := evse.NewEvseService(request)
 	return evseService.SetExternalCurrent(currentAmpere)
 }