Convert to cleaner hub format

No functionality changed.

Author: mikelawrence

components/stusb4500/__init__.py

@@ -41,11 +41,11 @@
 MULTI_CONF = True
 
 stusb4500_ns = cg.esphome_ns.namespace("stusb4500")
-STUSB4500Component = stusb4500_ns.class_(
-    "STUSB4500Component", cg.Component, i2c.I2CDevice
+STUSB4500Hub = stusb4500_ns.class_(
+    "STUSB4500Hub", cg.Component, i2c.I2CDevice
 )
 
-CONF_STUSB4500_ID = "stusb4500_id"
+CONF_STUSB4500_HUB_ID = "stusb4500_hub_id"
 
 PowerOkConfig = stusb4500_ns.enum("PowerOkConfig")
 POWER_OK_CONFIG = {
@@ -108,11 +108,16 @@ def validate_disch_time_pdo(value):
         raise cv.Invalid("VBUS Discharge time to PDO must be a multiple of 24 ms")
     return value
 
+HUB_CHILD_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_STUSB4500_HUB_ID): cv.use_id(STUSB4500Hub),
+    }
+)
 
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
-            cv.GenerateID(): cv.declare_id(STUSB4500Component),
+            cv.GenerateID(): cv.declare_id(STUSB4500Hub),
             cv.Optional(CONF_ALERT_PIN): pins.internal_gpio_input_pin_schema,
             cv.Optional(CONF_FLASH_NVM): cv.boolean,
             cv.Optional(CONF_DEFAULT_NVM): cv.boolean,
@@ -265,7 +270,7 @@ async def to_code(config):
 
 # STUSB4500_ACTION_SCHEMA = maybe_simple_id(
 #     {
-#         cv.Required(CONF_ID): cv.use_id(STUSB4500Component),
+#         cv.Required(CONF_ID): cv.use_id(STUSB4500Hub),
 #     }
 # )
 

components/stusb4500/automation.h

@@ -13,24 +13,24 @@ namespace esphome
         class TurnGpioOn : public Action<Ts...>
         {
         public:
-            explicit TurnGpioOn(STUSB4500Component *stusb4500) : stusb4500_(stusb4500) {}
+            explicit TurnGpioOn(STUSB4500Hub *stusb4500) : stusb4500_(stusb4500) {}
 
             void play(Ts... x) override { this->stusb4500_->turn_gpio_on(); }
 
         protected:
-            STUSB4500Component *stusb4500_;
+            STUSB4500Hub *stusb4500_;
         };
 
         template <typename... Ts>
         class TurnGpioOff : public Action<Ts...>
         {
         public:
-            explicit TurnGpioOff(STUSB4500Component *stusb4500) : stusb4500_(stusb4500) {}
+            explicit TurnGpioOff(STUSB4500Hub *stusb4500) : stusb4500_(stusb4500) {}
 
             void play(Ts... x) override { this->stusb4500_->turn_gpio_off(); }
 
         protected:
-            STUSB4500Component *stusb4500_;
+            STUSB4500Hub *stusb4500_;
         };
 
     } // namespace stusb4500_

components/stusb4500/sensor.py

@@ -8,28 +8,33 @@
     STATE_CLASS_MEASUREMENT,
 )
 
-from . import CONF_STUSB4500_ID, STUSB4500Component
+from . import HUB_CHILD_SCHEMA, CONF_STUSB4500_HUB_ID
 
 CONF_PD_STATE = "pd_state"
 ICON_USBC = "mdi:usb-c-port"
 
 DEPENDENCIES = ["stusb4500"]
 
-CONFIG_SCHEMA = {
-    cv.GenerateID(CONF_STUSB4500_ID): cv.use_id(STUSB4500Component),
-    cv.Optional(CONF_PD_STATE): sensor.sensor_schema(
-        icon=ICON_USBC,
-        accuracy_decimals=0,
-        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-        state_class=STATE_CLASS_MEASUREMENT,
-        device_class=DEVICE_CLASS_EMPTY,
-    ),
-}
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.Optional(CONF_PD_STATE): sensor.sensor_schema(
+                icon=ICON_USBC,
+                accuracy_decimals=0,
+                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                state_class=STATE_CLASS_MEASUREMENT,
+                device_class=DEVICE_CLASS_EMPTY,
+            ),
+        }
+    )
+    .extend(HUB_CHILD_SCHEMA)
+    .extend(cv.COMPONENT_SCHEMA)
+)
 
 
 async def to_code(config):
-    stusb4500_component = await cg.get_variable(config[CONF_STUSB4500_ID])
+    stusb4500_hub = await cg.get_variable(config[CONF_STUSB4500_HUB_ID])
 
     if pd_state_config := config.get(CONF_PD_STATE):
         sens = await sensor.new_sensor(pd_state_config)
-        cg.add(stusb4500_component.set_pd_state_sensor(sens))
+        cg.add(stusb4500_hub.set_pd_state_sensor(sens))