fix(version)

Makefile

@@ -1,4 +1,4 @@
-VERSION=$(shell git describe --tags --abbrev=0 --always)
+VERSION=$(shell git describe --tags --always)
 COMMIT=$(shell git rev-parse --short HEAD)
 DATE=$(shell date)
 
@@ -8,4 +8,4 @@ test:
 	go test ./...
 
 build: test
-	CGO_ENABLED=0 go build -ldflags="-X 'main.version=$(VERSION)' -X 'main.commit=$(COMMIT)' -X 'main.date=$(DATE)'" -o bin/ha-fronius-bm
+	CGO_ENABLED=0 go build -ldflags="-X 'main.version=$(VERSION)' -X 'main.commit=$(COMMIT)' -X 'main.date=$(DATE)'" -o bin/ha-fronius-bm

main.go

@@ -4,8 +4,14 @@ import (
 	"ha-fronius-bm/pkg/cmd"
 )
 
-func main() {
+var (
+	version = "dev"
+	commit  = "HEAD"
+	date    = "today"
+)
 
+func main() {
+	cmd.SetVersionInfo(version, commit, date)
 	cmd.Execute()
 
 }

pkg/cmd/root.go

@@ -8,17 +8,10 @@ import (
 	"github.com/spf13/viper"
 )
 
-var (
-	version = "dev"
-	commit  = "HEAD"
-	date    = "today"
-)
-
 var rootCmd = &cobra.Command{
-	Use:     "ha-fronius-bm",
-	Short:   "ha-fronius-bm handles battery charge using weather forecast",
-	Long:    `initiate parameters from command line, env variables or config.yaml file.`,
-	Version: fmt.Sprintf("Version: %s\nCommit: %s\nDate: %s\n", version, commit, date),
+	Use:   "ha-fronius-bm",
+	Short: "ha-fronius-bm handles battery charge using weather forecast",
+	Long:  `initiate parameters from command line, env variables or config.yaml file.`,
 }
 
 func Execute() {
@@ -47,3 +40,7 @@ func init() {
 		fmt.Printf("Error reading config, %s", err)
 	}
 }
+
+func SetVersionInfo(version, commit, date string) {
+	rootCmd.Version = fmt.Sprintf("%s (Built on %s from Git SHA %s)", version, date, commit)
+}

pkg/fronius/configure.go

@@ -68,16 +68,16 @@ func Setdefaults(modbus_ip string) error {
 	regList := mdsc
 	OpenModbusClient(modbus_ip)
 
-	WriteFroniusModbusRegisters(regList)
 	ReadFroniusModbusRegisters(regList)
+	WriteFroniusModbusRegisters(regList)
 
 	ClosemodbusClient()
 	u.Log.Info("Setting Fronius Modbus Defaults done.")
 	return nil
 }
 
 func ForceCharge(modbus_ip string, power_prc int16) error {
-	u.Log.Infof("Setting Fronius Storage Force Charge at %d% start...", power_prc)
+	u.Log.Infof("Setting Fronius Storage Force Charge at %d%", power_prc)
 	if power_prc > 0 {
 		regList := mdsc
 
@@ -86,8 +86,8 @@ func ForceCharge(modbus_ip string, power_prc int16) error {
 
 		OpenModbusClient(modbus_ip)
 
-		WriteFroniusModbusRegisters(regList)
 		ReadFroniusModbusRegisters(regList)
+		WriteFroniusModbusRegisters(regList)
 
 		ClosemodbusClient()
 	} else if power_prc == 0 {