Pre release 3.5.7

ezlopi-cloud/ezlopi-cloud-constants/ezlopi_cloud_keywords.c

@@ -13,6 +13,7 @@ const char* ezlopi_sender_str = "sender";
 const char* ezlopi_name_str = "name";
 const char* ezlopi_value_str = "value";
 const char* ezlopi_method_str = "method";
+const char* ezlopi_function_str = "function";
 const char* ezlopi_msg_id_str = "msg_id"; // message counter, number of data transferred to ezlopi-cloud
 const char* ezlopi_msg_subclass_str = "msg_subclass";
 const char* ezlopi_ui_broadcast_str = "ui_broadcast";

ezlopi-cloud/ezlopi-cloud-constants/ezlopi_cloud_keywords.h

@@ -14,6 +14,7 @@ extern const char* ezlopi_sender_str;
 extern const char* ezlopi_name_str;
 extern const char* ezlopi_value_str;
 extern const char* ezlopi_method_str;
+extern const char* ezlopi_function_str;
 extern const char* ezlopi_msg_id_str; // message counter, number of data transferred to ezlopi-cloud
 extern const char* ezlopi_msg_subclass_str;
 extern const char* ezlopi_ui_broadcast_str;

ezlopi-cloud/ezlopi-cloud-constants/ezlopi_cloud_methods_str.c

@@ -116,7 +116,7 @@ const char *method_hub_reboot = "hub.reboot";
 // const  char *method_hub_network_enabled_set = "hub.network.enabled.set";
 // const  char *method_hub_detection_devices_scan_start = "hub.detection.devices.scan.start";
 // const  char *method_hub_detection_devices_scans_top = "hub.detection.devices.scan.stop";
-const char *method_hub_scene_run_progress = "hub.scene.run.progress";
+const char *method_hub_scene_run_progress = "hub.scene.run.progress";   
 const char *ezlopi_rpc_method_notfound_str = "rpc.method.notfound";
 const char *ezlopi_hub_scene_changed_str = "hub.scene.changed";
 const char *ezlopi_hub_scene_added_str = "hub.scene.added";

ezlopi-cloud/ezlopi-cloud-info/ezlopi_cloud_info.c

@@ -4,7 +4,7 @@
 
 #include "freertos/FreeRTOS.h"
 
-#include "sdkconfig.h"
+#include "../../build/config/sdkconfig.h"
 #include "ezlopi_core_factory_info.h"
 #include "ezlopi_cloud_info.h"
 #include "ezlopi_util_trace.h"

ezlopi-cloud/ezlopi-cloud-items/ezlopi_cloud_items.c

@@ -4,7 +4,7 @@
 
 #include "ezlopi_cloud_items.h"
 #include "ezlopi_util_trace.h"
-#include "sdkconfig.h"
+#include "../../build/config/sdkconfig.h"
 
 #include "cjext.h"
 #include "ezlopi_core_cjson_macros.h"

ezlopi-cloud/ezlopi-cloud-scenes/CMakeLists.txt

@@ -20,7 +20,7 @@ set(EZLOPI_CLOUD_COMPONENTS
 )
 
 
-idf_component_register(SRCS "ezlopi_cloud_scenes.c" "ezlopi_cloud_scenes_block_list.c" "ezlopi_cloud_scenes_block_data_list.c" "${src_files}"
+idf_component_register(SRCS "ezlopi_cloud_scenes_scripts.c" "ezlopi_cloud_scenes.c" "ezlopi_cloud_scenes_block_list.c" "ezlopi_cloud_scenes_block_data_list.c" "${src_files}"
     INCLUDE_DIRS "."
     REQUIRES 
             ${ESP_COMPONENTS}       

ezlopi-cloud/ezlopi-cloud-scenes/ezlopi_cloud_scenes.c

@@ -13,6 +13,7 @@
 #include "ezlopi_cloud_constants.h"
 #include "ezlopi_core_scenes_operators.h"
 #include "ezlopi_core_scenes_notifications.h"
+#include "ezlopi_core_scenes_when_methods_helper_functions.h"
 
 void scenes_list(cJSON* cj_request, cJSON* cj_response)
 {
@@ -344,7 +345,40 @@ void scenes_notification_remove(cJSON* cj_request, cJSON* cj_response)
     }
 }
 
-/////////// updater for scene
+void scenes_block_status_reset(cJSON* cj_request, cJSON* cj_response)
+{
+    cJSON* cj_result = cJSON_AddObjectToObject(cj_response, ezlopi_result_str);
+    cJSON* cj_params = cJSON_GetObjectItem(cj_request, ezlopi_params_str);
+    if (cj_result && cj_params)
+    {
+        char* scene_id_str = NULL;
+        CJSON_GET_VALUE_STRING(cj_params, ezlopi_sceneId_str, scene_id_str);
+        if (scene_id_str)
+        {
+            uint32_t scene_id = strtoul(scene_id_str, NULL, 16);
+            if (scene_id)
+            {
+                l_scenes_list_v2_t* scene_node = ezlopi_scenes_get_scenes_head_v2();
+                while (scene_node)
+                {
+                    if (scene_node->_id == scene_id)
+                    {
+                        s_when_function_t* function_state = (s_when_function_t*)scene_node->when_block->fields->user_arg;
+                        if (function_state)
+                        {
+                            function_state->current_state = false;
+                        }
+                        break;
+                    }
+                    scene_node = scene_node->next;
+                }
+            }
+        }
+    }
+}
+
+
+////// updater for scene
 ////// useful for 'hub.scenes.enabled.set'
 void scene_changed(cJSON* cj_request, cJSON* cj_response)
 {

ezlopi-cloud/ezlopi-cloud-scenes/ezlopi_cloud_scenes.h

@@ -21,6 +21,7 @@ extern "C"
     void scenes_enable_set(cJSON* cj_request, cJSON* cj_response);
     void scenes_notification_add(cJSON* cj_request, cJSON* cj_response);
     void scenes_notification_remove(cJSON* cj_request, cJSON* cj_response);
+    void scenes_block_status_reset(cJSON* cj_request, cJSON* cj_response);
 
     ///////////// updaters
     void scene_changed(cJSON* cj_request, cJSON* cj_response);

ezlopi-cloud/ezlopi-cloud-scenes/ezlopi_cloud_scenes_block_list.c

@@ -169,16 +169,16 @@ static cJSON* __add_scenes_blocks_by_item_ids(e_scenes_block_type_v2_t block_typ
         l_scenes_list_v2_t* scene_node = ezlopi_scenes_get_scenes_head_v2();
         while (scene_node)
         {
-            TRACE_D("Here");
+            // TRACE_D("Here");
 
             switch (block_type)
             {
             case SCENE_BLOCK_TYPE_WHEN:
             {
-                TRACE_D("Here");
+                // TRACE_D("Here");
                 if (scene_node->when_block)
                 {
-                    TRACE_D("Here");
+                    // TRACE_D("Here");
                     if (__found_item_in_field(scene_node->when_block->fields, item_list->cloud_properties.item_id))
                     {
                         TRACE_D("Here");