From 365132ae645850c504dae2704fb61df96b3217f3 Mon Sep 17 00:00:00 2001 From: andig Date: Thu, 14 Mar 2024 17:35:42 +0100 Subject: [PATCH] Revert "Mennekes: fix typo (#12932)" This reverts commit c1a3d11f9af7d4d3887e585ff6228f33e7664126. --- README.md | 2 +- .../{mennekes-hcc3.go => menneckes-hcc3.go} | 72 +++++++++---------- .../definition/charger/menneckes-hcc3.yaml | 4 +- 3 files changed, 39 insertions(+), 39 deletions(-) rename charger/{mennekes-hcc3.go => menneckes-hcc3.go} (60%) diff --git a/README.md b/README.md index 563cfd5b08..4af0c6e1d9 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ evcc is an extensible EV Charge Controller and home energy management system. Fe - simple and clean user interface - wide range of supported [chargers](https://docs.evcc.io/docs/devices/chargers): - - ABL eMH1, Alfen (Eve), Bender (CC612/613), cFos (PowerBrain), Daheimladen, Ebee (Wallbox), Ensto (Chago Wallbox), [EVSEWifi/ smartWB](https://www.evse-wifi.de), Garo (GLB, GLB+, LS4), go-eCharger, HardyBarth (eCB1, cPH1, cPH2), Heidelberg (Energy Control), Innogy (eBox), Juice (Charger Me), KEBA/BMW, Mennekes (Amedio, Amtron Premium/Xtra, Amtron ChargeConrol), older NRGkicks (before 2022/2023), [openWB (includes Pro)](https://openwb.de/), Optec (Mobility One), PC Electric (includes Garo), Siemens, TechniSat (Technivolt), [Tinkerforge Warp Charger](https://www.warp-charger.com), Ubitricity (Heinz), Vestel, Wallbe, Webasto (Live), Mobile Charger Connect and many more + - ABL eMH1, Alfen (Eve), Bender (CC612/613), cFos (PowerBrain), Daheimladen, Ebee (Wallbox), Ensto (Chago Wallbox), [EVSEWifi/ smartWB](https://www.evse-wifi.de), Garo (GLB, GLB+, LS4), go-eCharger, HardyBarth (eCB1, cPH1, cPH2), Heidelberg (Energy Control), Innogy (eBox), Juice (Charger Me), KEBA/BMW, Menneckes (Amedio, Amtron Premium/Xtra, Amtron ChargeConrol), older NRGkicks (before 2022/2023), [openWB (includes Pro)](https://openwb.de/), Optec (Mobility One), PC Electric (includes Garo), Siemens, TechniSat (Technivolt), [Tinkerforge Warp Charger](https://www.warp-charger.com), Ubitricity (Heinz), Vestel, Wallbe, Webasto (Live), Mobile Charger Connect and many more - experimental EEBus support (Elli, PMCC) - experimental OCPP support - Build-your-own: Phoenix Contact (includes ESL Walli), [EVSE DIN](http://evracing.cz/simple-evse-wallbox) diff --git a/charger/mennekes-hcc3.go b/charger/menneckes-hcc3.go similarity index 60% rename from charger/mennekes-hcc3.go rename to charger/menneckes-hcc3.go index 8b762540b0..bdda1b54b5 100644 --- a/charger/mennekes-hcc3.go +++ b/charger/menneckes-hcc3.go @@ -32,28 +32,28 @@ import ( // https://update.mennekes.de/hcc3/1.13/Description%20Modbus_AMTRON%20HCC3_v01_2021-06-25_en.pdf -// MennekesHcc3 Xtra/Premium charger implementation -type MennekesHcc3 struct { +// MenneckesHcc3 Xtra/Premium charger implementation +type MenneckesHcc3 struct { conn *modbus.Connection curr uint16 } const ( - mennekesHcc3RegStatus = 0x0302 - mennekesHcc3RegPhases = 0x0308 - mennekesHcc3RegSerial = 0x030B - mennekesHcc3RegEnergy = 0x030D - mennekesHcc3RegName = 0x0311 - mennekesHcc3RegPower = 0x030F - mennekesHcc3RegAmpsConfig = 0x0400 + menneckesHcc3RegStatus = 0x0302 + menneckesHcc3RegPhases = 0x0308 + menneckesHcc3RegSerial = 0x030B + menneckesHcc3RegEnergy = 0x030D + menneckesHcc3RegName = 0x0311 + menneckesHcc3RegPower = 0x030F + menneckesHcc3RegAmpsConfig = 0x0400 ) func init() { - registry.Add("mennekes-hcc3", NewMennekesHcc3FromConfig) + registry.Add("menneckes-hcc3", NewMenneckesHcc3FromConfig) } -// NewMennekesHcc3FromConfig creates a Mennekes mennekesHcc3 charger from generic config -func NewMennekesHcc3FromConfig(other map[string]interface{}) (api.Charger, error) { +// NewMenneckesHcc3FromConfig creates a Mennekes menneckesHcc3 charger from generic config +func NewMenneckesHcc3FromConfig(other map[string]interface{}) (api.Charger, error) { cc := modbus.TcpSettings{ ID: 255, } @@ -62,11 +62,11 @@ func NewMennekesHcc3FromConfig(other map[string]interface{}) (api.Charger, error return nil, err } - return NewMennekesHcc3(cc.URI, cc.ID) + return NewMenneckesHcc3(cc.URI, cc.ID) } -// NewMennekesHcc3 creates Mennekes HCC3 charger -func NewMennekesHcc3(uri string, slaveID uint8) (api.Charger, error) { +// NewMenneckesHcc3 creates Menneckes HCC3 charger +func NewMenneckesHcc3(uri string, slaveID uint8) (api.Charger, error) { uri = util.DefaultPort(uri, 502) conn, err := modbus.NewConnection(uri, "", "", 0, modbus.Tcp, slaveID) @@ -78,10 +78,10 @@ func NewMennekesHcc3(uri string, slaveID uint8) (api.Charger, error) { return nil, api.ErrSponsorRequired } - log := util.NewLogger("mennekes-hcc3") + log := util.NewLogger("menneckes-hcc3") conn.Logger(log.TRACE) - wb := &MennekesHcc3{ + wb := &MenneckesHcc3{ conn: conn, curr: 6, } @@ -90,8 +90,8 @@ func NewMennekesHcc3(uri string, slaveID uint8) (api.Charger, error) { } // Status implements the api.Charger interface -func (wb *MennekesHcc3) Status() (api.ChargeStatus, error) { - b, err := wb.conn.ReadInputRegisters(mennekesHcc3RegStatus, 1) +func (wb *MenneckesHcc3) Status() (api.ChargeStatus, error) { + b, err := wb.conn.ReadInputRegisters(menneckesHcc3RegStatus, 1) if err != nil { return api.StatusNone, err } @@ -111,8 +111,8 @@ func (wb *MennekesHcc3) Status() (api.ChargeStatus, error) { } // Enabled implements the api.Charger interface -func (wb *MennekesHcc3) Enabled() (bool, error) { - b, err := wb.conn.ReadHoldingRegisters(mennekesHcc3RegAmpsConfig, 1) +func (wb *MenneckesHcc3) Enabled() (bool, error) { + b, err := wb.conn.ReadHoldingRegisters(menneckesHcc3RegAmpsConfig, 1) if err != nil { return false, err } @@ -123,25 +123,25 @@ func (wb *MennekesHcc3) Enabled() (bool, error) { } // Enable implements the api.Charger interface -func (wb *MennekesHcc3) Enable(enable bool) error { +func (wb *MenneckesHcc3) Enable(enable bool) error { var u uint16 if enable { u = wb.curr } - _, err := wb.conn.WriteSingleRegister(mennekesHcc3RegAmpsConfig, u) + _, err := wb.conn.WriteSingleRegister(menneckesHcc3RegAmpsConfig, u) return err } // MaxCurrent implements the api.Charger interface -func (wb *MennekesHcc3) MaxCurrent(current int64) error { +func (wb *MenneckesHcc3) MaxCurrent(current int64) error { if current < 6 { return fmt.Errorf("invalid current %d", current) } cur := uint16(current) - _, err := wb.conn.WriteSingleRegister(mennekesHcc3RegAmpsConfig, cur) + _, err := wb.conn.WriteSingleRegister(menneckesHcc3RegAmpsConfig, cur) if err == nil { wb.curr = cur } @@ -149,11 +149,11 @@ func (wb *MennekesHcc3) MaxCurrent(current int64) error { return err } -var _ api.Meter = (*MennekesHcc3)(nil) +var _ api.Meter = (*MenneckesHcc3)(nil) // CurrentPower implements the api.Meter interface -func (wb *MennekesHcc3) CurrentPower() (float64, error) { - b, err := wb.conn.ReadInputRegisters(mennekesHcc3RegPower, 2) +func (wb *MenneckesHcc3) CurrentPower() (float64, error) { + b, err := wb.conn.ReadInputRegisters(menneckesHcc3RegPower, 2) if err != nil { return 0, err } @@ -161,11 +161,11 @@ func (wb *MennekesHcc3) CurrentPower() (float64, error) { return rs485.RTUUint32ToFloat64Swapped(b), nil } -var _ api.ChargeRater = (*MennekesHcc3)(nil) +var _ api.ChargeRater = (*MenneckesHcc3)(nil) // ChargedEnergy implements the api.MeterEnergy interface -func (wb *MennekesHcc3) ChargedEnergy() (float64, error) { - b, err := wb.conn.ReadInputRegisters(mennekesHcc3RegEnergy, 2) +func (wb *MenneckesHcc3) ChargedEnergy() (float64, error) { + b, err := wb.conn.ReadInputRegisters(menneckesHcc3RegEnergy, 2) if err != nil { return 0, err } @@ -173,19 +173,19 @@ func (wb *MennekesHcc3) ChargedEnergy() (float64, error) { return rs485.RTUUint32ToFloat64Swapped(b) / 1e3, nil } -var _ api.Diagnosis = (*MennekesHcc3)(nil) +var _ api.Diagnosis = (*MenneckesHcc3)(nil) // Diagnose implements the api.Diagnosis interface -func (wb *MennekesHcc3) Diagnose() { - if b, err := wb.conn.ReadInputRegisters(mennekesHcc3RegName, 11); err == nil { +func (wb *MenneckesHcc3) Diagnose() { + if b, err := wb.conn.ReadInputRegisters(menneckesHcc3RegName, 11); err == nil { fmt.Printf("Name: %s\n", encoding.StringLsbFirst(b)) } - if b, err := wb.conn.ReadInputRegisters(mennekesHcc3RegPhases, 1); err == nil { + if b, err := wb.conn.ReadInputRegisters(menneckesHcc3RegPhases, 1); err == nil { fmt.Printf("Phases: %d\n", binary.BigEndian.Uint16(b)) } - if b, err := wb.conn.ReadInputRegisters(mennekesHcc3RegSerial, 2); err == nil { + if b, err := wb.conn.ReadInputRegisters(menneckesHcc3RegSerial, 2); err == nil { fmt.Printf("Serial: %d\n", binary.LittleEndian.Uint32(b)) } } diff --git a/templates/definition/charger/menneckes-hcc3.yaml b/templates/definition/charger/menneckes-hcc3.yaml index 1f822b9da9..57fdaa79cc 100644 --- a/templates/definition/charger/menneckes-hcc3.yaml +++ b/templates/definition/charger/menneckes-hcc3.yaml @@ -1,4 +1,4 @@ -template: mennekes-hcc3 +template: menneckes-hcc3 covers: ["amtron"] products: - brand: Mennekes @@ -11,5 +11,5 @@ params: choice: ["tcpip"] id: 255 render: | - type: mennekes-hcc3 + type: menneckes-hcc3 {{- include "modbus" . }}