Merge branch 'feature/add_smart_device_plug' into 'master'

feature(example): add alink smart plug demo See merge request rd/esp-iot-solution!257
espressif · Mar 16, 2018 · b1e87e1 · b1e87e1
2 parents a0bce65 + 83152d3
commit b1e87e1
Show file tree

Hide file tree

Showing 32 changed files with 1,714 additions and 754 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -32,9 +32,10 @@ build:
     - cd ../oled_screen_module
     - make defconfig
     - make -j8
-    - cd ../smart_device
+    - cd ../smart_device/alink_smart_device_demo
     - make defconfig
     - make -j8
+    - cd ..
     - cd ../empty_project
     - make defconfig
     - make -j8

diff --git a/components/general/power_meter/power_meter/include/iot_power_meter.h b/components/general/power_meter/power_meter/include/iot_power_meter.h
@@ -45,7 +45,7 @@ typedef struct {
     pcnt_unit_t current_pcnt_unit;      /**< pulse count unit of current pin */
     uint32_t current_ref_param;         /**< reference value to calculate actual current value */
     uint8_t sel_io_num;                 /**< gpio number of mode select pin */
-    uint8_t sel_level;                  /**< the gpio level you wang to set to mode select pin */
+    uint8_t sel_level;                  /**< the gpio level you want to set to mode select pin */
     pm_mode_t pm_mode;                  /**< mode of power meter refer to struct pm_mode_t */
 } pm_config_t;