Match current PR in esphome (#4)

* Lots of cleanup

PR submitted to ESPHome. These are the first round of requested changes.
Lots of logging changes
move to static inline functions
model is now required. This allowed runtime validation to be removed in favor of compile time validation.
make actions consistent.

* pylint suggestion, move to mode in {set}

* Use static_cast instead

* Fix model logic error

* Test by defining enum with type

* Revert "Test by defining enum with type"

This reverts commit e683819.

* Keep the 5% increase but add 1ms

* Match current PR in ESPHome

* Remove BMP581 and TSL2591 components

* Match ESPHome PR

* Correcting id

* Still trying

* Update binary_sensor.py

* Fix syntax error

* More syntax errors

* Formatting

* CLANG formatting cleanup

* Correct mode values

* Use std::move in version setter methods

* Addin Restart and Factory Reset buttons and version text_sensors

* Fix errors

* Update dfrobot_c4001.h

* Fix more errors

* Fix missing reset button

* Fix hardware_version config variable

* Try again

* Increase command queue depth and logging cleanup

* Add Restart Action

* Fix check string after reset command

* Change config_load() for Factory Reset and Restart commands

* Support Blue LED control

* Update tfmini.cpp

* Update dfrobot_c4001.cpp

* Use const reference for version setters

Updated set_software_version and set_hardware_version to take const std::string& instead of std::string, improving efficiency by avoiding unnecessary string copies.

* Fix clang-format formatting error

* Fix compile error when using any text_sensor

Remove orphaned motion binary_sensor
Correct reported occupancy when VERBOSE logging is enabled
Remove state is changed logic around sensor and
binary_sensor reporting. Makes initial updates quicker
Corrected LED state not written to flash

* README changes due to new buttons and actions in dfrobot_c4001 component

* Fix syntax errors

* Remove debug code

* Add notes about ESPHome PRs

Author: mikelawrence

README.md

@@ -188,11 +188,15 @@ Using the STUSB4500 ESPHome component requires the following steps:
    [00:00:19][C][stusb4500:116]:   NVM matches settings
    [00:00:19][C][stusb4500:130]:   PDO3 negotiated 12.00V @ 3.00A, 36.00W
    ```
-4. The STUSB4500 comonent does check that the NVM is indeed different before flashing it but it is prudent to remove the ```flash_nvm: true``` after it is clear the STUSB4500 is working as configured.
+4. The STUSB4500 component does check that the NVM is indeed different before flashing it but it is prudent to remove the ```flash_nvm: true``` after it is clear the STUSB4500 is working as configured.
 
 
 ## ESPHome C4001 External Component
 
+> [!NOTE]
+> This component is in the process of being added to ESPHome. ESPHome [PR#9327](https://github.com/esphome/esphome/pull/9327).
+
+
 The DFRobot C4001 (SEN0609 or SEN0610) is a millimeter-wave presence detector. The C4001 millimeter-wave presence sensor has the advantage of being able to detect both static and moving objects. It also has a relatively strong anti-interference ability, making it less susceptible to factors such as temperature changes, variations in ambient light, and environmental noise. Whether a person is sitting, sleeping, or in motion, the sensor can quickly detect their presence.
 
 <p align="center">
@@ -267,16 +271,26 @@ switch:
     led_enable:
       name: Enable LED
 
+text_sensor:
+  - platform: dfrobot_c4001
+    dfrobot_c4001_id: mmwave_sensor
+    software_version:
+      name: Software Version
+    hardware_version:
+      name: Hardware Version
+
 ```
 
 ### Configuration Variables
 + **mode** (*Required*, enumeration): This sets the operation mode of the sensor. Options are ```PRESENCE``` and ```SPEED_AND_DISTANCE```.
 
 ### Buttons
 + **config_save** (*Optional*): When you click this button the current configuration will be saved. Keep in mind that these are writes to flash and there is a limited number of time you can do this before the flash wears out. All Options from [Button Component](https://esphome.io/components/button/index.html#base-button-configuration).
++ **factory_reset** (*Optional*): Clicking this button will perform a factory reset of the module and all configuration values will go back to default. All Options from [Button Component](https://esphome.io/components/button/index.html#base-button-configuration).
++ **restart** (*Optional*): When you click this button the module will restart and all configuration values will remains as previously set. All Options from [Button Component](https://esphome.io/components/button/index.html#base-button-configuration).
 
 ### Binary Sensors
-+ **config_changed** (*Optional*): When ```true`` the current sensor configuration has been changed but not saved to the sensor. All Options from [Binary Sensor Component](https://esphome.io/components/binary_sensor/#base-binary-sensor-configuration).
++ **config_changed** (*Optional*): When ```true``` the current sensor configuration has been changed but not saved to the sensor. All Options from [Binary Sensor Component](https://esphome.io/components/binary_sensor/#base-binary-sensor-configuration).
 + **occupancy** (*Optional*): In ```PRESENCE``` mode this indicates presence. In ```SPEED_AND_DISTANCE``` mode this indicates a target is being tracked. All Options from [Binary Sensor Component](https://esphome.io/components/binary_sensor/#base-binary-sensor-configuration).
 
 ### Numbers
@@ -299,10 +313,15 @@ switch:
 + **led_enable** (*Optional*): When turned on the green LED will flash when the sensor has been started. The blue LED cannot be disabled with this command. All Options from [Switch Component](https://esphome.io/components/switch/index.html#base-switch-configuration).
 + **micro_motion_enable** (*Optional*): Turns on micro motion mode. Available only in ```SPEED_AND_DISTANCE``` mode. All Options from [Switch Component](https://esphome.io/components/switch/index.html#base-switch-configuration).
 
+### Sensors
++ **target_distance** (*Optional*): When **occupancy** binary sensor is ```true``` this sensor indicates distance to target in meters (m). When **occupancy** binary sensor is ```false``` this sensor switches to 0.0 indicating invalid data. Available only in ```SPEED_AND_DISTANCE``` mode. All Options from [Sensor Component](https://esphome.io/components/sensor/index.html#base-sensor-configuration). 
++ **target_speed** (*Optional*): When **occupancy** binary sensor is ```true``` this sensor indicates target speed in meters per second (m/s). When **occupancy** binary sensor is ```false``` this sensor switches to 0.0 indicating invalid data. Available only in ```SPEED_AND_DISTANCE``` mode. All Options from [Sensor Component](https://esphome.io/components/sensor/index.html#base-sensor-configuration).
+
 ### Actions
-+ **dfrobot_c4001.factor_reset** Will perform a factory reset of the module and all configuration values will go back to default. The module will restart with these defaults. Keep in mind that these are writes to flash and there is a limited number of time you can do this before the flash wears out. This is much easier to do with a lambda that accidentally performs a factory reset every second.
++ **dfrobot_c4001.factory_reset** Will perform a factory reset of the module and all configuration values will go back to default. The module will restart with these defaults. Keep in mind that these are writes to flash and there is a limited number of time you can do this before the flash wears out. This is much easier to do with a lambda that accidentally performs a factory reset every second.
 
 Example using automations...
+
 ```yaml
 button:
   - platform: template
@@ -318,6 +337,25 @@ Example in lambdas...
   id(mmwave_sensor).factory_reset();
 ```
 
++ **dfrobot_c4001.restart** Will restart the module and all configuration values will remains as previously set.
+
+Example using automations...
+
+```yaml
+button:
+  - platform: template
+    name: Restart
+    on_press:
+      - dfrobot_c4001.restart: mmwave_sensor
+    entity_category: CONFIG
+
+```
+Example in lambdas...
+```
+- lambda: |-
+  id(mmwave_sensor).restart();
+```
+
 ## ESPHome LD2450 External Component
 
 This custom component adds some functionality to the built-in LD2450 Component. Only the differences are listed below.
@@ -349,6 +387,11 @@ number:
 
 ## SEN5X External Component
 
+
+> [!NOTE]
+> A Pull Request to change the sen5x component in ESPHome is in progress. ESPHome [PR#9254](https://github.com/esphome/esphome/pull/9254).
+
+
 This external component adds SEN60, SEN63C, SEN65, SEN66 and SEN68 support to the built-in sen5x component. This component extends [PR #8318](https://github.com/esphome/esphome/pull/8318). Only the differences from sen5x component are listed below.
 
 Temperature compensation is not working for the SEN6x models. Still waiting on the Sensirion Application Note.

components/dfrobot_c4001/__init__.py

@@ -1,32 +1,27 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
 from esphome import automation
 from esphome.automation import maybe_simple_id
+import esphome.codegen as cg
 from esphome.components import uart
-
-from esphome.const import (
-    CONF_FACTORY_RESET,
-    CONF_ID,
-    CONF_MODE,
-    CONF_SENSITIVITY,
-)
-
+import esphome.config_validation as cv
+from esphome.const import CONF_ID, CONF_MODE
 
 DEPENDENCIES = ["uart"]
 
 CODEOWNERS = ["@mikelawrence"]
 MULTI_CONF = True
 
-CONF_DFROBOT_C4001_HUB_ID = "dfrobot_c4001_id"
+CONF_DFROBOT_C4001_ID = "dfrobot_c4001_id"
 MODE = ""
 
 dfrobot_c4001_ns = cg.esphome_ns.namespace("dfrobot_c4001")
-DFRobotC4001Hub = dfrobot_c4001_ns.class_("DFRobotC4001Hub", cg.Component, uart.UARTDevice)
+DFRobotC4001Hub = dfrobot_c4001_ns.class_(
+    "DFRobotC4001Hub", cg.Component, uart.UARTDevice
+)
 ModeConfig = dfrobot_c4001_ns.enum("ModeConfig")
 
 CONF_MODE_SELECTS = {
-    "PRESENCE": ModeConfig.Mode_Presence,
-    "SPEED_AND_DISTANCE": ModeConfig.Mode_Speed_and_Distance,
+    "PRESENCE": ModeConfig.MODE_PRESENCE,
+    "SPEED_AND_DISTANCE": ModeConfig.MODE_SPEED_AND_DISTANCE,
 }
 
 
@@ -35,10 +30,13 @@
     "DFRobotC4001FactoryResetAction", automation.Action
 )
 
+DFRobotC4001RestartAction = dfrobot_c4001_ns.class_(
+    "DFRobotC4001RestartAction", automation.Action
+)
 
 HUB_CHILD_SCHEMA = cv.Schema(
     {
-        cv.GenerateID(CONF_DFROBOT_C4001_HUB_ID): cv.use_id(DFRobotC4001Hub),
+        cv.GenerateID(CONF_DFROBOT_C4001_ID): cv.use_id(DFRobotC4001Hub),
     }
 )
 
@@ -80,7 +78,22 @@ async def to_code(config):
         }
     ),
 )
-async def dfrobot_c4001_reset_to_code(config, action_id, template_arg, args):
+async def dfrobot_c4001_factory_reset_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+    return var
+
+
+@automation.register_action(
+    "dfrobot_c4001.restart",
+    DFRobotC4001RestartAction,
+    maybe_simple_id(
+        {
+            cv.GenerateID(): cv.use_id(DFRobotC4001Hub),
+        }
+    ),
+)
+async def dfrobot_c4001_restart_to_code(config, action_id, template_arg, args):
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var

components/dfrobot_c4001/automation.h

@@ -5,19 +5,15 @@
 
 #include "dfrobot_c4001.h"
 
-namespace esphome
-{
-    namespace dfrobot_c4001
-    {
-        template <typename... Ts>
-        class DFRobotC4001FactoryResetAction : public Action<Ts...>, public Parented<DFRobotC4001Hub>
-        {
-        public:
-            void play(Ts... x)
-            {
-                this->parent_->enqueue(make_unique<PowerCommand>(false));
-                this->parent_->enqueue(make_unique<FactoryResetCommand>());
-            }
-        };
-    } // namespace dfrobot_c4001
-} // namespace esphome
+namespace esphome {
+namespace dfrobot_c4001 {
+template<typename... Ts> class DFRobotC4001FactoryResetAction : public Action<Ts...>, public Parented<DFRobotC4001Hub> {
+ public:
+  void play(Ts... x) { this->parent_->factory_reset(); }
+};
+template<typename... Ts> class DFRobotC4001RestartAction : public Action<Ts...>, public Parented<DFRobotC4001Hub> {
+ public:
+  void play(Ts... x) { this->parent_->restart(); }
+};
+}  // namespace dfrobot_c4001
+}  // namespace esphome

components/dfrobot_c4001/binary_sensor.py

@@ -1,15 +1,13 @@
 import esphome.codegen as cg
-import esphome.config_validation as cv
 from esphome.components import binary_sensor
+import esphome.config_validation as cv
 from esphome.const import (
-    DEVICE_CLASS_MOTION,
     DEVICE_CLASS_OCCUPANCY,
     DEVICE_CLASS_UPDATE,
-    ENTITY_CATEGORY_CONFIG,
     ENTITY_CATEGORY_DIAGNOSTIC,
 )
 
-from . import HUB_CHILD_SCHEMA, CONF_DFROBOT_C4001_HUB_ID
+from . import CONF_DFROBOT_C4001_ID, HUB_CHILD_SCHEMA
 
 DEPENDENCIES = ["dfrobot_c4001"]
 
@@ -35,7 +33,7 @@
 
 
 async def to_code(config):
-    sens0609_hub = await cg.get_variable(config[CONF_DFROBOT_C4001_HUB_ID])
+    sens0609_hub = await cg.get_variable(config[CONF_DFROBOT_C4001_ID])
     if occupancy := config.get(CONF_OCCUPANCY):
         bs = await binary_sensor.new_binary_sensor(occupancy)
         cg.add(sens0609_hub.set_occupancy_binary_sensor(bs))

components/dfrobot_c4001/button/__init__.py

@@ -1,22 +1,23 @@
 import esphome.codegen as cg
-import esphome.config_validation as cv
 from esphome.components import button
+import esphome.config_validation as cv
 from esphome.const import (
     CONF_FACTORY_RESET,
     CONF_RESTART,
     DEVICE_CLASS_UPDATE,
+    DEVICE_CLASS_RESTART,
     ENTITY_CATEGORY_CONFIG,
-    ENTITY_CATEGORY_DIAGNOSTIC,
     ICON_RESTART,
     ICON_RESTART_ALERT,
 )
 
-from .. import HUB_CHILD_SCHEMA, CONF_DFROBOT_C4001_HUB_ID, dfrobot_c4001_ns
-
+from .. import CONF_DFROBOT_C4001_ID, HUB_CHILD_SCHEMA, dfrobot_c4001_ns
 
 CONF_CONFIG_SAVE = "config_save"
 
 ConfigSaveButton = dfrobot_c4001_ns.class_("ConfigSaveButton", button.Button)
+FactoryResetButton = dfrobot_c4001_ns.class_("FactoryResetButton", button.Button)
+RestartButton = dfrobot_c4001_ns.class_("RestartButton", button.Button)
 
 CONFIG_SCHEMA = (
     cv.Schema(
@@ -25,7 +26,18 @@
                 ConfigSaveButton,
                 device_class=DEVICE_CLASS_UPDATE,
                 entity_category=ENTITY_CATEGORY_CONFIG,
-                # icon=ICON_RESTART_ALERT,
+            ),
+            cv.Optional(CONF_FACTORY_RESET): button.button_schema(
+                FactoryResetButton,
+                device_class=DEVICE_CLASS_RESTART,
+                entity_category=ENTITY_CATEGORY_CONFIG,
+                icon=ICON_RESTART_ALERT,
+            ),
+            cv.Optional(CONF_RESTART): button.button_schema(
+                RestartButton,
+                device_class=DEVICE_CLASS_RESTART,
+                entity_category=ENTITY_CATEGORY_CONFIG,
+                icon=ICON_RESTART,
             ),
         }
     )
@@ -35,8 +47,16 @@
 
 
 async def to_code(config):
-    sens0609_hub = await cg.get_variable(config[CONF_DFROBOT_C4001_HUB_ID])
+    sens0609_hub = await cg.get_variable(config[CONF_DFROBOT_C4001_ID])
     if config_save := config.get(CONF_CONFIG_SAVE):
         b = await button.new_button(config_save)
-        await cg.register_parented(b, config[CONF_DFROBOT_C4001_HUB_ID])
+        await cg.register_parented(b, config[CONF_DFROBOT_C4001_ID])
         cg.add(sens0609_hub.set_config_save_button(b))
+    if factory_reset := config.get(CONF_FACTORY_RESET):
+        b = await button.new_button(factory_reset)
+        await cg.register_parented(b, config[CONF_DFROBOT_C4001_ID])
+        cg.add(sens0609_hub.set_factory_reset_button(b))
+    if restart := config.get(CONF_RESTART):
+        b = await button.new_button(restart)
+        await cg.register_parented(b, config[CONF_DFROBOT_C4001_ID])
+        cg.add(sens0609_hub.set_restart_button(b))

components/dfrobot_c4001/button/button.cpp

@@ -1,9 +1,9 @@
 #include "button.h"
 
-namespace esphome
-{
-    namespace dfrobot_c4001
-    {
-        void ConfigSaveButton::press_action() { this->parent_->config_save(); }
-    } // namespace dfrobot_c4001
-} // namespace esphome
+namespace esphome {
+namespace dfrobot_c4001 {
+void ConfigSaveButton::press_action() { this->parent_->config_save(); }
+void FactoryResetButton::press_action() { this->parent_->factory_reset(); }
+void RestartButton::press_action() { this->parent_->restart(); }
+}  // namespace dfrobot_c4001
+}  // namespace esphome

components/dfrobot_c4001/button/button.h

@@ -3,16 +3,23 @@
 #include "esphome/components/button/button.h"
 #include "../dfrobot_c4001.h"
 
-namespace esphome
-{
-    namespace dfrobot_c4001
-    {
+namespace esphome {
+namespace dfrobot_c4001 {
 
-        class ConfigSaveButton : public button::Button, public Parented<DFRobotC4001Hub>
-        {
-        protected:
-            void press_action() override;
-        };
+class ConfigSaveButton : public button::Button, public Parented<DFRobotC4001Hub> {
+ protected:
+  void press_action() override;
+};
 
-    } // namespace dfrobot_c4001
-} // namespace esphome
+class FactoryResetButton : public button::Button, public Parented<DFRobotC4001Hub> {
+ protected:
+  void press_action() override;
+};
+
+class RestartButton : public button::Button, public Parented<DFRobotC4001Hub> {
+ protected:
+  void press_action() override;
+};
+
+}  // namespace dfrobot_c4001
+}  // namespace esphome