Revert "AVM/FRITZ!: Rebranding + add FRITZ!Smart Energy 250 (#23040)"
This reverts commit f131713f90.
This commit is contained in:
andig
parent
f131713f90
commit
9e1addb6d5
6 changed files with 11 additions and 75 deletions
|
|
@ -22,11 +22,11 @@ Featured in [PV Magazine](https://www.pv-magazine.de/2022/01/14/mit-open-source-
|
|||
- **EEBus** support (Elli, PMCC)
|
||||
- **OCPP** support
|
||||
- **build-your-own:** Phoenix Contact (includes ESL Walli), EVSE DIN
|
||||
- **smart switches:** AVM, FRITZ!, Home Assistant, Homematic IP, HomeWizard, myStrom, Shelly, Tasmota, TP-Link. [Read more.](https://docs.evcc.io/en/docs/devices/smartswitches)
|
||||
- **smart switches:** AVM, Home Assistant, Homematic IP, HomeWizard, myStrom, Shelly, Tasmota, TP-Link. [Read more.](https://docs.evcc.io/en/docs/devices/smartswitches)
|
||||
- **heat pumps and electric heaters:** alpha innotec, Bosch, Buderus, Bösch, CTA All-In-One, Daikin, Elco, IDM, Junkers, Kermi, Lambda, my-PV, Nibe, Novelan, Roth, Stiebel Eltron, Tecalor, Vaillant, Viessmann, Wolf, Zewotherm. [Read more.](https://docs.evcc.io/en/docs/devices/heating)
|
||||
- support for many [energy meters](https://docs.evcc.io/en/docs/devices/meters):
|
||||
- **solar inverters and battery systems:** A-Tronix, Acrel, Ads-tec, Alpha ESS, Ampere, Anker, APsystems, AVM, Axitec, BGEtech, Bosch, Bosswerk, Carlo Gavazzi, Deye, E3/DC, Eastron, Enphase, FENECON, FRITZ!, FoxESS, Fronius, Ginlong, go-e, GoodWe, Growatt, Homematic IP, HomeWizard, Hoymiles, Huawei, IAMMETER, IGEN Tech, Kostal, LG, Loxone, M-TEC, Marstek, myStrom, OpenEMS, Powerfox, Qcells, RCT, SAJ, SAX, SENEC, Senergy, Shelly, Siemens, Sigenergy, SMA, Smartfox, SofarSolar, Solaranzeige, SolarEdge, SolarMax, Solarwatt, Solax, Solinteng, Sonnen, St-ems, Steca, Sungrow, Sunsynk, Sunway, Tasmota, Tesla, TP-Link, VARTA, Victron, Wattsonic, Youless, ZCS Azzurro, Zendure. [Read more.](https://docs.evcc.io/en/docs/devices/meters)
|
||||
- **general energy meters:** A-Tronix, ABB, Acrel, Alpha ESS, Ampere, AVM, Axitec, Bernecker Engineering, BGEtech, Bosch, Carlo Gavazzi, cFos, Deye, DSMR, DZG, E3/DC, Eastron, Enphase, ESPHome, FENECON, FoxESS, FRITZ!, Fronius, Ginlong, go-e, GoodWe, Growatt, Homematic IP, HomeWizard, Huawei, IAMMETER, inepro, IOmeter, Janitza, KEBA, Kostal, LG, Loxone, M-TEC, mhendriks, my-PV, myStrom, OpenEMS, ORNO, P1Monitor, Powerfox, Qcells, RCT, Saia-Burgess Controls (SBC), SAJ, SAX, Schneider Electric, SENEC, Shelly, Siemens, Sigenergy, SMA, Smartfox, SofarSolar, Solaranzeige, SolarEdge, SolarMax, Solarwatt, Solax, Solinteng, Sonnen, St-ems, Sungrow, Sunsynk, Sunway, Tasmota, Tesla, Tibber, TQ, VARTA, Victron, Volkszähler, Wago, Wattsonic, Weidmüller, Youless, ZCS Azzurro, Zuidwijk. [Read more.](https://docs.evcc.io/en/docs/devices/meters)
|
||||
- **solar inverters and battery systems:** A-Tronix, Acrel, Ads-tec, Alpha ESS, Ampere, Anker, APsystems, AVM, Axitec, BGEtech, Bosch, Bosswerk, Carlo Gavazzi, Deye, E3/DC, Eastron, Enphase, FENECON, FoxESS, Fronius, Ginlong, go-e, GoodWe, Growatt, Homematic IP, HomeWizard, Hoymiles, Huawei, IAMMETER, IGEN Tech, Kostal, LG, Loxone, M-TEC, Marstek, myStrom, OpenEMS, Powerfox, Qcells, RCT, SAJ, SAX, SENEC, Senergy, Shelly, Siemens, Sigenergy, SMA, Smartfox, SofarSolar, Solaranzeige, SolarEdge, SolarMax, Solarwatt, Solax, Solinteng, Sonnen, St-ems, Steca, Sungrow, Sunsynk, Sunway, Tasmota, Tesla, TP-Link, VARTA, Victron, Wattsonic, Youless, ZCS Azzurro, Zendure. [Read more.](https://docs.evcc.io/en/docs/devices/meters)
|
||||
- **general energy meters:** A-Tronix, ABB, Acrel, Alpha ESS, Ampere, AVM, Axitec, Bernecker Engineering, BGEtech, Bosch, Carlo Gavazzi, cFos, Deye, DSMR, DZG, E3/DC, Eastron, Enphase, ESPHome, FENECON, FoxESS, Fronius, Ginlong, go-e, GoodWe, Growatt, Homematic IP, HomeWizard, Huawei, IAMMETER, inepro, IOmeter, Janitza, KEBA, Kostal, LG, Loxone, M-TEC, mhendriks, my-PV, myStrom, OpenEMS, ORNO, P1Monitor, Powerfox, Qcells, RCT, Saia-Burgess Controls (SBC), SAJ, SAX, Schneider Electric, SENEC, Shelly, Siemens, Sigenergy, SMA, Smartfox, SofarSolar, Solaranzeige, SolarEdge, SolarMax, Solarwatt, Solax, Solinteng, Sonnen, St-ems, Sungrow, Sunsynk, Sunway, Tasmota, Tesla, Tibber, TQ, VARTA, Victron, Volkszähler, Wago, Wattsonic, Weidmüller, Youless, ZCS Azzurro, Zuidwijk. [Read more.](https://docs.evcc.io/en/docs/devices/meters)
|
||||
- **integrated systems**: SMA Sunny Home Manager and Energy Meter, KOSTAL Smart Energy Meter (KSEM, EMxx)
|
||||
- **sunspec**-compatible inverter or home battery devices
|
||||
- **mbmd**-compatible devices, see [volkszaehler/mbmd](https://github.com/volkszaehler/mbmd#supported-devices) for a complete list
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ import (
|
|||
"github.com/evcc-io/evcc/util"
|
||||
)
|
||||
|
||||
// FRITZ! FritzBox AHA interface specifications:
|
||||
// https://fritz.com/fileadmin/user_upload/Global/Service/Schnittstellen/AHA-HTTP-Interface.pdf
|
||||
// AVM FritzBox AHA interface specifications:
|
||||
// https://avm.de/fileadmin/user_upload/Global/Service/Schnittstellen/AHA-HTTP-Interface.pdf
|
||||
|
||||
// FritzDECT charger implementation
|
||||
type FritzDECT struct {
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@ import (
|
|||
"golang.org/x/text/encoding/unicode"
|
||||
)
|
||||
|
||||
// FRITZ! FritzBox AHA interface and authentication specifications:
|
||||
// https://fritz.com/fileadmin/user_upload/Global/Service/Schnittstellen/AHA-HTTP-Interface.pdf
|
||||
// https://fritz.com/fileadmin/user_upload/Global/Service/Schnittstellen/AVM_Technical_Note_-_Session_ID.pdf
|
||||
// AVM FritzBox AHA interface and authentication specifications:
|
||||
// https://avm.de/fileadmin/user_upload/Global/Service/Schnittstellen/AHA-HTTP-Interface.pdf
|
||||
// https://avm.de/fileadmin/user_upload/Global/Service/Schnittstellen/AVM_Technical_Note_-_Session_ID.pdf
|
||||
|
||||
// FritzDECT settings
|
||||
type Settings struct {
|
||||
|
|
@ -35,7 +35,7 @@ type Connection struct {
|
|||
updated time.Time
|
||||
}
|
||||
|
||||
// https://fritz.com/fileadmin/user_upload/Global/Service/Schnittstellen/AVM_Technical_Note_-_Session_ID_english_2021-05-03.pdf
|
||||
// https://avm.de/fileadmin/user_upload/Global/Service/Schnittstellen/AVM_Technical_Note_-_Session_ID_english_2021-05-03.pdf
|
||||
const sessionTimeout = 15 * time.Minute
|
||||
|
||||
// Devicestats structures getbasicdevicesstats command response (AHA-HTTP-Interface)
|
||||
|
|
|
|||
|
|
@ -2,19 +2,7 @@ template: fritzdect
|
|||
products:
|
||||
- brand: AVM
|
||||
description:
|
||||
generic: "FRITZ!DECT 200"
|
||||
- brand: AVM
|
||||
description:
|
||||
generic: "FRITZ!DECT 210"
|
||||
- brand: AVM
|
||||
description:
|
||||
generic: "FRITZ!Powerline 546E"
|
||||
- brand: "FRITZ!"
|
||||
description:
|
||||
generic: "FRITZ!Smart Energy 200"
|
||||
- brand: "FRITZ!"
|
||||
description:
|
||||
generic: "FRITZ!Smart Energy 210"
|
||||
generic: FritzDECT
|
||||
group: switchsockets
|
||||
params:
|
||||
- name: uri
|
||||
|
|
@ -25,12 +13,6 @@ params:
|
|||
required: true
|
||||
- name: ain
|
||||
required: true
|
||||
description:
|
||||
de: AIN auf dem Typenschild des Geräts.
|
||||
en: AIN on device type plate.
|
||||
help:
|
||||
de: Bei führenden Nullen bitte in doppelte Hochkommata setzen (bspw. "000XXXXXXXXX-1").
|
||||
en: Use quotations in case of leading zeros (e.g. "000XXXXXXXXX-1").
|
||||
- preset: switchsocket
|
||||
render: |
|
||||
type: fritzdect
|
||||
|
|
|
|||
|
|
@ -2,19 +2,7 @@ template: fritzdect
|
|||
products:
|
||||
- brand: AVM
|
||||
description:
|
||||
generic: "FRITZ!DECT 200"
|
||||
- brand: AVM
|
||||
description:
|
||||
generic: "FRITZ!DECT 210"
|
||||
- brand: AVM
|
||||
description:
|
||||
generic: "FRITZ!Powerline 546E"
|
||||
- brand: "FRITZ!"
|
||||
description:
|
||||
generic: "FRITZ!Smart Energy 200"
|
||||
- brand: "FRITZ!"
|
||||
description:
|
||||
generic: "FRITZ!Smart Energy 210"
|
||||
generic: FritzDECT
|
||||
group: switchsockets
|
||||
params:
|
||||
- name: usage
|
||||
|
|
@ -27,12 +15,6 @@ params:
|
|||
required: true
|
||||
- name: ain
|
||||
required: true
|
||||
description:
|
||||
de: AIN auf dem Typenschild des Geräts.
|
||||
en: AIN on device type plate.
|
||||
help:
|
||||
de: Bei führenden Nullen bitte in doppelte Hochkommata setzen (bspw. "000XXXXXXXXX-1").
|
||||
en: Use quotations in case of leading zeros (e.g."000XXXXXXXXX-1").
|
||||
render: |
|
||||
type: fritzdect
|
||||
uri: {{ .uri }}
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
template: fritzgrid
|
||||
products:
|
||||
- brand: "FRITZ!"
|
||||
description:
|
||||
generic: "FRITZ!Smart Energy 250"
|
||||
params:
|
||||
- name: usage
|
||||
choice: ["grid"]
|
||||
- name: uri
|
||||
default: https://fritz.box
|
||||
- name: user
|
||||
required: true
|
||||
- name: password
|
||||
required: true
|
||||
- name: ain
|
||||
required: true
|
||||
description:
|
||||
de: AIN auf dem Typenschild des Geräts.
|
||||
en: AIN on device type plate.
|
||||
help:
|
||||
de: Bei führenden Nullen bitte in doppelte Hochkommata setzen (bspw. "000XXXXXXXXX-1").
|
||||
en: Use quotations in case of leading zeros (e.g. "000XXXXXXXXX-1").
|
||||
render: |
|
||||
type: fritzdect
|
||||
uri: {{ .uri }}
|
||||
user: {{ .user }}
|
||||
password: {{ .password }}
|
||||
ain: {{ .ain }} # switch actor identification number without blanks (see AIN number on switch sticker)
|
||||
Loading…
Add table
Add a link
Reference in a new issue