Merge branch 'refactor/integrated_power_measure_sensor' into 'master'

refactor: integrate power measure sensor

See merge request ae_group/esp-iot-solution!1375

Author: YuanMingfu-star

components/i2c_bus/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.4.3 - 2025-9-26
+
+### Bug Fix:
+
+- Synchronize the version information for cmake_utilities
+
 ## v1.4.2 - 2025-8-26
 
 ### Bug Fix:

components/i2c_bus/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.4.2"
+version: "1.5.0"
 description: The I2C Bus Driver supports both hardware and software I2C.
 url: https://github.com/espressif/esp-iot-solution/tree/master/components/i2c_bus
 repository: https://github.com/espressif/esp-iot-solution.git
@@ -7,7 +7,7 @@ issues: https://github.com/espressif/esp-iot-solution/issues
 
 dependencies:
   idf: ">=4.0"
-  cmake_utilities: "0.*"
+  cmake_utilities: "*"
 sbom:
   supplier: 'Organization: Espressif Systems (Shanghai) CO LTD'
   originator: 'Organization: Espressif Systems (Shanghai) CO LTD'

components/motor/esp_sensorless_bldc_control/include/bldc_control.h

@@ -22,7 +22,9 @@ extern "C" {
  * @brief using esp_event_handler_register() to register BLDC_CONTROL_EVENT
  *
  */
+/** @cond **/
 ESP_EVENT_DECLARE_BASE(BLDC_CONTROL_EVENT); /*!< esp event name */
+/** @endcond **/
 
 typedef enum {
     BLDC_CONTROL_START = 0,      /*!< BLDC control start event */

components/sensors/power_measure/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.2.0 - 2025-9-5
+
+### Improve:
+
+* Integrate power measurement equipment into a unified management component.
+
 ## v0.1.0 - 2024-11-5
 
 ### Enhancements:

components/sensors/power_measure/CMakeLists.txt

@@ -1,7 +1,22 @@
-idf_component_register(SRC_DIRS "."
-                       INCLUDE_DIRS "include"
-                       PRIV_INCLUDE_DIRS "priv_include"
-                       REQUIRES esp_timer driver esp_event
+set(srcs
+    src/power_measure_api.c
+    src/power_measure_bl0937.c
+    src/power_measure_ina236.c
+    drivers/ina236/ina236.c
+    drivers/bl0937/bl0937.c
+)
+
+set(incs "include")
+
+set(priv_incs
+    "drivers/bl0937"
+    "drivers/ina236"
+)
+
+idf_component_register(SRCS ${srcs}
+                       INCLUDE_DIRS ${incs}
+                       PRIV_INCLUDE_DIRS ${priv_incs}
+                       REQUIRES esp_timer driver i2c_bus
                        )
 
 include(package_manager)

components/sensors/power_measure/Kconfig

@@ -1,7 +1,100 @@
 menu "power_measure"
+    choice POWER_MEASURE_CHIP_TYPE
+        prompt "Power measurement chip type"
+        default POWER_MEASURE_CHIP_BL0937
+        help
+            Select the power measurement chip type to use
+
+        config POWER_MEASURE_CHIP_BL0937
+            bool "BL0937"
+            help
+                BL0937 is a single-phase power measurement IC with high accuracy
+                Features: Voltage, Current, Power, Power Factor, Energy measurement
+                Interface: GPIO (CF, CF1, SEL pins)
+
+        config POWER_MEASURE_CHIP_INA236
+            bool "INA236"
+            help
+                INA236 is a precision digital power monitor with I2C interface
+                Features: Voltage, Current, Power measurement
+                Interface: I2C
+                Note: Does not support energy measurement or power factor
+    endchoice
+
     config BL0937_IRAM_OPTIMIZED
-    bool "Enable IRAM optimization for BL0937"
-    default n
-    help
-        Enable IRAM optimization for BL0937
+        bool "Enable IRAM optimization for BL0937"
+        default n
+        depends on POWER_MEASURE_CHIP_BL0937
+        help
+            Enable IRAM optimization for BL0937
+
+    menu "BL0937 Hardware Configuration"
+        config BL0937_VREF_MV
+            int "Internal voltage reference (mV)"
+            default 1218
+            help
+                Internal voltage reference value for BL0937 in millivolts (1218 = 1.218V)
+
+        config BL0937_R_CURRENT_MOHM
+            int "Current sampling resistor (mOhm)"
+            default 1
+            help
+                Value of the current sampling resistor in milliohms (1 = 1mOhm for ~30A max measurement)
+
+        config BL0937_R_VOLTAGE
+            int "Voltage divider resistor (Ohm)"
+            default 2010
+            help
+                Value of the voltage divider resistor (typically 6x 470K upstream + 1K downstream = 2010)
+
+        config BL0937_F_OSC
+            int "Internal oscillator frequency (Hz)"
+            default 2000000
+            help
+                Frequency of the BL0937 internal clock
+
+        config BL0937_PULSE_TIMEOUT_US
+            int "Pulse timeout (microseconds)"
+            default 1000000
+            help
+                Timeout for pulse detection. Higher values allow better precision but reduce sampling rate.
+                Lower values increase sampling rate but reduce precision.
+                Values below 500000 (0.5s) are not recommended.
+    endmenu
+
+    menu "GPIO Pin Configuration"
+        menu "BL0937 GPIO Pins"
+            config BL0937_CF_GPIO
+                int "CF GPIO pin number"
+                default 3
+                help
+                    GPIO pin connected to BL0937 CF pin (current frequency output)
+
+            config BL0937_SEL_GPIO
+                int "SEL GPIO pin number"
+                default 4
+                help
+                    GPIO pin connected to BL0937 SEL pin (selection pin)
+
+            config BL0937_CF1_GPIO
+                int "CF1 GPIO pin number"
+                default 7
+                help
+                    GPIO pin connected to BL0937 CF1 pin (power frequency output)
+        endmenu
+
+        menu "INA236 I2C GPIO Pins"
+            config INA236_I2C_SCL_GPIO
+                int "I2C SCL GPIO pin number"
+                default 13
+                help
+                    GPIO pin for I2C clock line
+
+            config INA236_I2C_SDA_GPIO
+                int "I2C SDA GPIO pin number"
+                default 20
+                help
+                    GPIO pin for I2C data line
+        endmenu
+    endmenu
 endmenu