Disable network resources by default, handle apparent power

custom_components/isy994/__init__.py

@@ -39,9 +39,7 @@
     CONF_ENABLE_VARIABLES,
     CONF_NETWORK,
     CONF_TLS_VER,
-    CONF_VAR_SENSOR_STRING,
     DEFAULT_TLS_VERSION,
-    DEFAULT_VAR_SENSOR_STRING,
     DOMAIN,
     MANUFACTURER,
     PLATFORMS,
@@ -82,13 +80,10 @@ async def async_setup_entry(
 
     # Optional
     tls_version = isy_config.get(CONF_TLS_VER)
-    variable_identifier = isy_options.get(
-        CONF_VAR_SENSOR_STRING, DEFAULT_VAR_SENSOR_STRING
-    )
     enable_variables = isy_options.get(CONF_ENABLE_VARIABLES, True)
     enable_nodeservers = isy_options.get(CONF_ENABLE_NODESERVERS, True)
     enable_programs = isy_options.get(CONF_ENABLE_PROGRAMS, True)
-    enable_networking = isy_options.get(CONF_ENABLE_NETWORKING, True)
+    enable_networking = isy_options.get(CONF_ENABLE_NETWORKING, False)
 
     if host.scheme == SCHEME_HTTP:
         session = aiohttp_client.async_create_clientsession(
@@ -151,7 +146,7 @@ async def async_setup_entry(
         _categorize_programs(isy_data, isy.programs)
 
     if enable_variables and isy.variables.entities:
-        _categorize_variables(isy_data, isy.variables, variable_identifier)
+        _categorize_variables(isy_data, isy.variables)
         isy_data.devices[CONF_VARIABLES] = _create_service_device_info(
             isy, name=CONF_VARIABLES.title(), unique_id=CONF_VARIABLES
         )

custom_components/isy994/config_flow.py

@@ -33,12 +33,10 @@
     CONF_RESTORE_LIGHT_STATE,
     CONF_SENSOR_STRING,
     CONF_TLS_VER,
-    CONF_VAR_SENSOR_STRING,
     DEFAULT_IGNORE_STRING,
     DEFAULT_RESTORE_LIGHT_STATE,
     DEFAULT_SENSOR_STRING,
     DEFAULT_TLS_VERSION,
-    DEFAULT_VAR_SENSOR_STRING,
     DOMAIN,
     HTTP_PORT,
     HTTPS_PORT,
@@ -321,19 +319,15 @@ async def async_step_init(
         )
         ignore_string = options.get(CONF_IGNORE_STRING, DEFAULT_IGNORE_STRING)
         sensor_string = options.get(CONF_SENSOR_STRING, DEFAULT_SENSOR_STRING)
-        var_sensor_string = options.get(
-            CONF_VAR_SENSOR_STRING, DEFAULT_VAR_SENSOR_STRING
-        )
         enable_variables = options.get(CONF_ENABLE_VARIABLES, True)
         enable_nodeservers = options.get(CONF_ENABLE_NODESERVERS, True)
         enable_programs = options.get(CONF_ENABLE_PROGRAMS, True)
-        enable_networking = options.get(CONF_ENABLE_NETWORKING, True)
+        enable_networking = options.get(CONF_ENABLE_NETWORKING, False)
 
         options_schema = vol.Schema(
             {
                 vol.Optional(CONF_IGNORE_STRING, default=ignore_string): str,
                 vol.Optional(CONF_SENSOR_STRING, default=sensor_string): str,
-                vol.Optional(CONF_VAR_SENSOR_STRING, default=var_sensor_string): str,
                 vol.Required(
                     CONF_RESTORE_LIGHT_STATE, default=restore_light_state
                 ): bool,

custom_components/isy994/const.py

@@ -78,14 +78,12 @@
 CONF_RESTORE_LIGHT_STATE = "restore_light_state"
 CONF_SENSOR_STRING = "sensor_string"
 CONF_TLS_VER = "tls"
-CONF_VAR_SENSOR_STRING = "variable_sensor_string"
 
 DEFAULT_IGNORE_STRING = "{IGNORE ME}"
 DEFAULT_SENSOR_STRING = "sensor"
 DEFAULT_RESTORE_LIGHT_STATE = False
 DEFAULT_TLS_VERSION = "Default"
 DEFAULT_PROGRAM_STRING = "HA."
-DEFAULT_VAR_SENSOR_STRING = "HA."
 
 KEY_ACTIONS = "actions"
 KEY_STATUS = "status"

custom_components/isy994/helpers.py

@@ -448,9 +448,7 @@ def _categorize_programs(isy_data: IsyData, programs: Programs) -> None:
             isy_data.programs[platform].append(entity)
 
 
-def _categorize_variables(
-    isy_data: IsyData, variables: Variables, identifier: str
-) -> None:
+def _categorize_variables(isy_data: IsyData, variables: Variables) -> None:
     """Gather the ISY Variables to be added as sensors."""
     try:
         if not (variables.loaded and variables.entities):

custom_components/isy994/manifest.json

@@ -32,5 +32,5 @@
       "manufacturer": "Universal Devices Inc."
     }
   ],
-  "version": "4.0.14"
+  "version": "4.0.15"
 }

custom_components/isy994/number.py

@@ -41,13 +41,7 @@
     ranged_value_to_percentage,
 )
 
-from .const import (
-    BACKLIGHT_MEMORY_FILTER,
-    CONF_VAR_SENSOR_STRING,
-    DEFAULT_VAR_SENSOR_STRING,
-    DOMAIN,
-    UOM_8_BIT_RANGE,
-)
+from .const import BACKLIGHT_MEMORY_FILTER, DOMAIN, UOM_8_BIT_RANGE
 from .entity import ISYNodeEntity
 
 ISY_MAX_SIZE = (2**32) / 2
@@ -83,15 +77,14 @@ async def async_setup_entry(
     entities: list[
         ISYVariableNumberEntity | ISYAuxControlNumberEntity | ISYBacklightNumberEntity
     ] = []
-    var_id = config_entry.options.get(CONF_VAR_SENSOR_STRING, DEFAULT_VAR_SENSOR_STRING)
 
     for node in isy_data.variables[Platform.NUMBER]:
         step = 10 ** (-1 * node.precision)
         min_max = ISY_MAX_SIZE / (10**node.precision)
         description = NumberEntityDescription(
             key=node.address,
             name=node.name,
-            entity_registry_enabled_default=var_id in node.name,
+            entity_registry_enabled_default=False,
             native_unit_of_measurement=None,
             native_step=step,
             native_min_value=-min_max,

custom_components/isy994/sensor.py

@@ -33,11 +33,13 @@
 from .const import (
     _LOGGER,
     DOMAIN,
+    POWER_VOLT_AMPERE_REACTIVE,
     UOM_DOUBLE_TEMP,
     UOM_FRIENDLY_NAME,
     UOM_INDEX,
     UOM_ON_OFF,
     UOM_TO_STATES,
+    UnitOfApparentPower,
 )
 from .entity import ISYNodeEntity
 from .helpers import convert_isy_value_to_hass
@@ -53,6 +55,9 @@
     PROP_STATUS,
 }
 
+PROP_CURRENT_POWER = "CPW"
+PROP_TOTAL_POWER = "TPW"
+
 # Reference pyisyox.constants.COMMAND_FRIENDLY_NAME for API details.
 #   Note: "LUMIN"/Illuminance removed, some devices use non-conformant "%" unit
 #         "VOCLVL"/VOC removed, uses qualitative UOM not ug/m^3
@@ -63,7 +68,7 @@
     "BARPRES": SensorDeviceClass.ATMOSPHERIC_PRESSURE,
     "CC": SensorDeviceClass.CURRENT,
     "CO2LVL": SensorDeviceClass.CO2,
-    "CPW": SensorDeviceClass.POWER,
+    PROP_CURRENT_POWER: SensorDeviceClass.POWER,
     "CV": SensorDeviceClass.VOLTAGE,
     "DEWPT": SensorDeviceClass.TEMPERATURE,
     "DISTANC": SensorDeviceClass.DISTANCE,
@@ -83,7 +88,7 @@
     "SPEED": SensorDeviceClass.SPEED,
     "TEMPEXH": SensorDeviceClass.TEMPERATURE,
     "TEMPOUT": SensorDeviceClass.TEMPERATURE,
-    "TPW": SensorDeviceClass.ENERGY,
+    PROP_TOTAL_POWER: SensorDeviceClass.ENERGY,
     "WATERP": SensorDeviceClass.PRESSURE,
     "WATERT": SensorDeviceClass.TEMPERATURE,
     "WATERTB": SensorDeviceClass.TEMPERATURE,
@@ -94,7 +99,7 @@
 ISY_CONTROL_TO_STATE_CLASS = {
     control: (
         SensorStateClass.MEASUREMENT
-        if control != "TPW"
+        if control != PROP_TOTAL_POWER
         else SensorStateClass.TOTAL_INCREASING
     )
     for control in ISY_CONTROL_TO_DEVICE_CLASS
@@ -166,6 +171,13 @@ def get_native_uom(
                 device_class = None
                 state_class = None
 
+            # QUIRK: ISY does not differentiate between real, apparent, or reactive power:
+            if control == PROP_CURRENT_POWER:
+                if native_uom == UnitOfApparentPower.VOLT_AMPERE:
+                    device_class = SensorDeviceClass.APPARENT_POWER
+                elif native_uom == POWER_VOLT_AMPERE_REACTIVE:
+                    device_class = SensorDeviceClass.REACTIVE_POWER
+
         description = SensorEntityDescription(
             key=f"{node}_{control}",
             device_class=device_class,