Skip to content

Skip battery entity creation when hasBattery is false #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
teh-hippo wants to merge 2 commits into
base: main
Choose a base branch
from
+81 −62
Open

Skip battery entity creation when hasBattery is false #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61c01e1
feat: conditional battery entities for solar-only inverters
teh-hippo Mar 3, 2026
c317b26
fix: set iot_class to cloud_polling
teh-hippo Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion custom_components/foxess/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"codeowners": ["@macxq","@r-amado","@fozzieuk"],
"dependencies": ["rest"],
"documentation": "https://github.com/macxq/foxess-ha",
"iot_class": "local_polling",
"iot_class": "cloud_polling",
"issue_tracker":"https://github.com/macxq/foxess-ha/issues",
"version": "v0.4"
}
141 changes: 80 additions & 61 deletions custom_components/foxess/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
CONF_GET_VARIABLES = "Restrict"
CONF_V1_API = "Use_V1_Api"
CONF_EVO = "Evo"
CONF_HAS_BATTERY = "hasBattery"
RETRY_NEXT_SLOT = -1
RETRY_IN_5_MINS = 25
DNS_ERROR = 101
Expand All @@ -103,6 +104,7 @@
vol.Optional(CONF_GET_VARIABLES): cv.boolean,
vol.Optional(CONF_V1_API): cv.boolean,
vol.Optional(CONF_EVO): cv.boolean,
vol.Optional(CONF_HAS_BATTERY): cv.boolean,
}
)

Expand All @@ -122,6 +124,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
RestrictGetVar = config.get(CONF_GET_VARIABLES)
V1_Api = config.get(CONF_V1_API)
Evo = config.get(CONF_EVO)
hasBatteryOverride = config.get(CONF_HAS_BATTERY)
_LOGGER.debug("API Key: %s", apiKey)
_LOGGER.debug("Device SN: %s", devicesn)
_LOGGER.debug("Device ID: %s", deviceID)
Expand Down Expand Up @@ -247,7 +250,11 @@ async def async_update_data():

if not allData["online"]:
if not geterror:
_LOGGER.warning("%s Inverter is off-line, waiting to retry", name)
hasBat = allData["addressbook"].get("hasBattery", True)
if not hasBat:
_LOGGER.debug("%s Inverter off-line, no battery fitted", name)
else:
_LOGGER.warning("%s Inverter is off-line, waiting to retry", name)
else:
_LOGGER.warning("%s Cloud timeout, retry in 1 minute", name)
else:
Expand Down Expand Up @@ -293,6 +300,12 @@ async def async_update_data():
)
return False

if hasBatteryOverride is not None:
hasBattery = hasBatteryOverride
else:
hasBattery = allData["addressbook"].get("hasBattery", True)
_LOGGER.debug("hasBattery: %s (override: %s)", hasBattery, hasBatteryOverride)

async_add_entities(
[
FoxESSCurrent(
Expand Down Expand Up @@ -366,22 +379,6 @@ async def async_update_data():
FoxESSVolt(coordinator, name, deviceID, "T Volt", "t-volt", "TVolt"),
FoxESSReactivePower(coordinator, name, deviceID),
FoxESSPowerFactor(coordinator, name, deviceID),
FoxESSTemp(
coordinator,
name,
deviceID,
"Bat Temperature",
"bat-temperature",
"batTemperature",
),
FoxESSTemp(
coordinator,
name,
deviceID,
"Bat Temperature2",
"bat-temperature2",
"batTemperature_2",
),
FoxESSTemp(
coordinator,
name,
Expand All @@ -406,30 +403,7 @@ async def async_update_data():
"inv-temperature",
"invTemperation",
),
FoxESSBatSoC(coordinator, name, deviceID, "Bat SoC", "bat-soc", "SoC"),
FoxESSBatSoC(coordinator, name, deviceID, "Bat SoC1", "bat-soc1", "SoC_1"),
FoxESSBatSoC(coordinator, name, deviceID, "Bat SoC2", "bat-soc2", "SoC_2"),
FoxESSBatSoC(coordinator, name, deviceID, "Bat SoH", "bat-soh", "SOH"),
FoxESSPower(
coordinator,
name,
deviceID,
"Inverter Bat Power",
"inv-Bat-Power",
"invBatPower",
),
FoxESSPower(
coordinator,
name,
deviceID,
"Inverter Bat Power2",
"inv-Bat-Power2",
"invBatPower_2",
),
FoxESSBatMinSoC(coordinator, name, deviceID),
FoxESSBatMinSoConGrid(coordinator, name, deviceID),
FoxESSSolarPower(coordinator, name, deviceID),
FoxESSEnergyThroughput(coordinator, name, deviceID),
FoxESSEnergySolar(coordinator, name, deviceID),
FoxESSInverter(coordinator, name, deviceID),
FoxESSPowerString(
Expand All @@ -456,22 +430,6 @@ async def async_update_data():
"feedIn-power",
"feedinPower",
),
FoxESSPowerString(
coordinator,
name,
deviceID,
"Bat Discharge Power",
"bat-discharge-power",
"batDischargePower",
),
FoxESSPowerString(
coordinator,
name,
deviceID,
"Bat Charge Power",
"bat-charge-power",
"batChargePower",
),
FoxESSPowerString(
coordinator, name, deviceID, "Load Power", "load-power", "loadsPower"
),
Expand Down Expand Up @@ -501,14 +459,9 @@ async def async_update_data():
),
FoxESSEnergyGridConsumption(coordinator, name, deviceID),
FoxESSEnergyFeedin(coordinator, name, deviceID),
FoxESSEnergyBatCharge(coordinator, name, deviceID),
FoxESSEnergyBatDischarge(coordinator, name, deviceID),
FoxESSEnergyLoad(coordinator, name, deviceID),
FoxESSPVEnergyTotal(coordinator, name, deviceID),
FoxESSResidualEnergy(coordinator, name, deviceID),
FoxESSResponseTime(coordinator, name, deviceID),
FoxESSMaxBatChargeCurrent(coordinator, name, deviceID),
FoxESSMaxBatDischargeCurrent(coordinator, name, deviceID),
FoxESSRunningState(
coordinator,
name,
Expand All @@ -520,6 +473,72 @@ async def async_update_data():
]
)

if hasBattery:
async_add_entities(
[
FoxESSTemp(
coordinator,
name,
deviceID,
"Bat Temperature",
"bat-temperature",
"batTemperature",
),
FoxESSTemp(
coordinator,
name,
deviceID,
"Bat Temperature2",
"bat-temperature2",
"batTemperature_2",
),
FoxESSBatSoC(coordinator, name, deviceID, "Bat SoC", "bat-soc", "SoC"),
FoxESSBatSoC(coordinator, name, deviceID, "Bat SoC1", "bat-soc1", "SoC_1"),
FoxESSBatSoC(coordinator, name, deviceID, "Bat SoC2", "bat-soc2", "SoC_2"),
FoxESSBatSoC(coordinator, name, deviceID, "Bat SoH", "bat-soh", "SOH"),
FoxESSPower(
coordinator,
name,
deviceID,
"Inverter Bat Power",
"inv-Bat-Power",
"invBatPower",
),
FoxESSPower(
coordinator,
name,
deviceID,
"Inverter Bat Power2",
"inv-Bat-Power2",
"invBatPower_2",
),
FoxESSBatMinSoC(coordinator, name, deviceID),
FoxESSBatMinSoConGrid(coordinator, name, deviceID),
FoxESSEnergyThroughput(coordinator, name, deviceID),
FoxESSPowerString(
coordinator,
name,
deviceID,
"Bat Discharge Power",
"bat-discharge-power",
"batDischargePower",
),
FoxESSPowerString(
coordinator,
name,
deviceID,
"Bat Charge Power",
"bat-charge-power",
"batChargePower",
),
FoxESSEnergyBatCharge(coordinator, name, deviceID),
FoxESSEnergyBatDischarge(coordinator, name, deviceID),
FoxESSResidualEnergy(coordinator, name, deviceID),
FoxESSMaxBatChargeCurrent(coordinator, name, deviceID),
FoxESSMaxBatDischargeCurrent(coordinator, name, deviceID),
]
)

if ExtPV:
async_add_entities(
[
Expand Down