Fully split EEbus

evcc-io · Nov 30, 2023 · f2dacda · f2dacda
1 parent e24e8c2
commit f2dacda
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 44 deletions.
diff --git a/charger/eebus/eebus.go b/charger/eebus/eebus.go
@@ -1,3 +1,5 @@
+//go:build !slim
+
 package eebus
 
 import (

diff --git a/cmd/configure/eebus.go b/cmd/configure/eebus.go
@@ -1,3 +1,5 @@
+//go:build !slim
+
 package configure
 
 import (

diff --git a/cmd/configure/helper.go b/cmd/configure/helper.go
@@ -155,35 +155,35 @@ func (c *CmdConfigure) processDeviceRequirements(templateItem templates.Template
 		}
 	}
 
-	// check if we need to setup an EEBUS HEMS
-	if slices.Contains(templateItem.Requirements.EVCC, templates.RequirementEEBUS) {
-		if c.configuration.config.EEBUS == "" {
-			fmt.Println()
-			fmt.Println("-- EEBUS -----------------------------------")
-			fmt.Println()
-			eebusConfig, err := c.eebusCertificate()
-			if err != nil {
-				return fmt.Errorf("%s: %s", c.localizedString("Requirements_EEBUS_Cert_Error"), err)
-			}
-
-			if err := c.configureEEBus(eebusConfig); err != nil {
-				return err
-			}
-
-			eebusYaml, err := yaml.Marshal(eebusConfig)
-			if err != nil {
-				return err
-			}
-
-			c.configuration.config.EEBUS = string(eebusYaml)
-			fmt.Println()
-			fmt.Println("--------------------------------------------")
-		}
-
-		fmt.Println()
-		fmt.Println(c.localizedString("Requirements_EEBUS_Pairing"))
-		fmt.Scanln()
-	}
+	// // check if we need to setup an EEBUS HEMS
+	// if slices.Contains(templateItem.Requirements.EVCC, templates.RequirementEEBUS) {
+	// 	if c.configuration.config.EEBUS == "" {
+	// 		fmt.Println()
+	// 		fmt.Println("-- EEBUS -----------------------------------")
+	// 		fmt.Println()
+	// 		eebusConfig, err := c.eebusCertificate()
+	// 		if err != nil {
+	// 			return fmt.Errorf("%s: %s", c.localizedString("Requirements_EEBUS_Cert_Error"), err)
+	// 		}
+
+	// 		if err := c.configureEEBus(eebusConfig); err != nil {
+	// 			return err
+	// 		}
+
+	// 		eebusYaml, err := yaml.Marshal(eebusConfig)
+	// 		if err != nil {
+	// 			return err
+	// 		}
+
+	// 		c.configuration.config.EEBUS = string(eebusYaml)
+	// 		fmt.Println()
+	// 		fmt.Println("--------------------------------------------")
+	// 	}
+
+	// 	fmt.Println()
+	// 	fmt.Println(c.localizedString("Requirements_EEBUS_Pairing"))
+	// 	fmt.Scanln()
+	// }
 
 	return nil
 }

diff --git a/cmd/eebus.go b/cmd/eebus.go
@@ -1,3 +1,5 @@
+//go:build !slim
+
 package cmd
 
 import (

diff --git a/cmd/setup.go b/cmd/setup.go
@@ -16,7 +16,6 @@ import (
 	paho "github.com/eclipse/paho.mqtt.golang"
 	"github.com/evcc-io/evcc/api"
 	"github.com/evcc-io/evcc/charger"
-	"github.com/evcc-io/evcc/charger/eebus"
 	"github.com/evcc-io/evcc/cmd/shutdown"
 	"github.com/evcc-io/evcc/core"
 	"github.com/evcc-io/evcc/core/site"
@@ -395,10 +394,10 @@ func configureEnvironment(cmd *cobra.Command, conf globalConfig) (err error) {
 	// 	err = configureGo(conf.Go)
 	// }
 
-	// setup EEBus server
-	if err == nil && conf.EEBus != nil {
-		err = configureEEBus(conf.EEBus)
-	}
+	// // setup EEBus server
+	// if err == nil && conf.EEBus != nil {
+	// 	err = configureEEBus(conf.EEBus)
+	// }
 
 	// setup config database
 	if err == nil {
@@ -523,18 +522,18 @@ func configureMDNS(conf networkConfig) error {
 	return nil
 }
 
-// setup EEBus
-func configureEEBus(conf map[string]interface{}) error {
-	var err error
-	if eebus.Instance, err = eebus.NewServer(conf); err != nil {
-		return fmt.Errorf("failed configuring eebus: %w", err)
-	}
+// // setup EEBus
+// func configureEEBus(conf map[string]interface{}) error {
+// 	var err error
+// 	if eebus.Instance, err = eebus.NewServer(conf); err != nil {
+// 		return fmt.Errorf("failed configuring eebus: %w", err)
+// 	}
 
-	eebus.Instance.Run()
-	shutdown.Register(eebus.Instance.Shutdown)
+// 	eebus.Instance.Run()
+// 	shutdown.Register(eebus.Instance.Shutdown)
 
-	return nil
-}
+// 	return nil
+// }
 
 // setup messaging
 func configureMessengers(conf messagingConfig, valueChan chan util.Param, cache *util.Cache) (chan push.Event, error) {