Merge branch 'bugfix/idf5.x' into 'master'

Fixes for idf v5.0

See merge request app-frameworks/esp-rainmaker!289

Author: shahpiyushv

.gitlab-ci.yml

@@ -47,9 +47,8 @@ before_script:
 - ls
 - cd $CI_PROJECT_DIR/examples/switch
 - echo Building for esp32
-- idf.py build
 - idf.py set-target esp32
-- echo Running make
+- idf.py build
 - rm -rf build/ sdkconfig
 - echo Building for esp32s2
 - idf.py set-target esp32s2
@@ -62,10 +61,6 @@ before_script:
 - echo Building for esp32s3
 - idf.py set-target esp32s3
 - idf.py build
-- rm -rf build/ sdkconfig
-- echo Running make
-- make defconfig
-- make $MAKEFLAGS
 - echo Building switch app - Done
 # Building switch app - Done
 # Copying switch.bin to esp-rainmaker-bins-${CI_JOB_ID}/
@@ -78,10 +73,6 @@ before_script:
 - echo Running idf.py
 - cd $CI_PROJECT_DIR/examples/led_light
 - idf.py build
-- echo Running make
-- rm -rf build/ sdkconfig
-- make defconfig
-- make $MAKEFLAGS
 - echo Building led_light app - Done
 # Building led_light app - Done
 # Copying led_light.bin to esp-rainmaker-bins-${CI_JOB_ID}/
@@ -94,10 +85,6 @@ before_script:
 - echo Running idf.py
 - cd $CI_PROJECT_DIR/examples/fan
 - idf.py build
-- echo Running make
-- rm -rf build/ sdkconfig
-- make defconfig
-- make $MAKEFLAGS
 - echo Building fan app - Done
 # Building fan app - Done
 # Copying fan.bin to esp-rainmaker-bins-${CI_JOB_ID}/
@@ -110,10 +97,6 @@ before_script:
 - echo Running idf.py
 - cd $CI_PROJECT_DIR/examples/temperature_sensor
 - idf.py build
-- echo Running make
-- rm -rf build/ sdkconfig
-- make defconfig
-- make $MAKEFLAGS
 - echo Building temperature_sensor app - Done
 # Building temperature_sensor app - Done
 # Copying temperature_sensor.bin to esp-rainmaker-bins-${CI_JOB_ID}/
@@ -126,10 +109,6 @@ before_script:
 - echo Running idf.py
 - cd $CI_PROJECT_DIR/examples/multi_device
 - idf.py build
-- echo Running make
-- rm -rf build/ sdkconfig
-- make defconfig
-- make $MAKEFLAGS
 - echo Building multi_device app - Done
 # Building multi_device app - Done
 # Copying multi_device.bin to esp-rainmaker-bins-${CI_JOB_ID}/
@@ -142,10 +121,6 @@ before_script:
 - echo Running idf.py
 - cd $CI_PROJECT_DIR/examples/gpio
 - idf.py build
-- echo Running make
-- rm -rf build/ sdkconfig
-- make defconfig
-- make $MAKEFLAGS
 - echo Building gpio app - Done
 # Building gpio app - Done
 # Copying gpio.bin to esp-rainmaker-bins-${CI_JOB_ID}/
@@ -163,10 +138,6 @@ before_script:
 - echo Building homekit_switch app - Started
 - echo Running idf.py
 - idf.py build
-# - echo Running make
-# - rm -rf build/ sdkconfig
-# - make defconfig
-# - make $MAKEFLAGS
 - echo Building homekit_switch app - Done
 # Building homekit_switch app - Done
 # Copying homekit_switch.bin to esp-rainmaker-bins-${CI_JOB_ID}/

components/button/CMakeLists.txt

@@ -1,5 +1,3 @@
-set(COMPONENT_ADD_INCLUDEDIRS button/include)
-set(COMPONENT_SRCS  "button/button.c"
-					"button/button_obj.cpp")
-
-register_component()
+idf_component_register(SRCS "button/button.c" "button/button_obj.cpp"
+                    INCLUDE_DIRS "button/include"
+                    REQUIRES "driver")

components/button/button/button.c

@@ -65,7 +65,7 @@ struct button_dev{
 #define BUTTON_GLITCH_FILTER_TIME_MS   CONFIG_IO_GLITCH_FILTER_TIME_MS
 static const char* TAG = "button";
 
-static void button_press_cb(xTimerHandle tmr)
+static void button_press_cb(TimerHandle_t tmr)
 {
     button_cb_t* btn_cb = (button_cb_t*) pvTimerGetTimerID(tmr);
     button_dev_t* btn = btn_cb->pbtn;
@@ -82,7 +82,7 @@ static void button_press_cb(xTimerHandle tmr)
     }
 }
 
-static void button_tap_psh_cb(xTimerHandle tmr)
+static void button_tap_psh_cb(TimerHandle_t tmr)
 {
     button_cb_t* btn_cb = (button_cb_t*) pvTimerGetTimerID(tmr);
     button_dev_t* btn = btn_cb->pbtn;
@@ -108,7 +108,7 @@ static void button_tap_psh_cb(xTimerHandle tmr)
     }
 }
 
-static void button_tap_rls_cb(xTimerHandle tmr)
+static void button_tap_rls_cb(TimerHandle_t tmr)
 {
     button_cb_t* btn_cb = (button_cb_t*) pvTimerGetTimerID(tmr);
     button_dev_t* btn = btn_cb->pbtn;
@@ -144,7 +144,7 @@ static void button_tap_rls_cb(xTimerHandle tmr)
     }
 }
 
-static void button_press_serial_cb(xTimerHandle tmr)
+static void button_press_serial_cb(TimerHandle_t tmr)
 {
     button_dev_t* btn = (button_dev_t*) pvTimerGetTimerID(tmr);
     if (btn->press_serial_cb.cb) {
@@ -185,7 +185,7 @@ static void button_gpio_isr_handler(void* arg)
     }
 }
 
-static void button_free_tmr(xTimerHandle* tmr)
+static void button_free_tmr(TimerHandle_t* tmr)
 {
     if (tmr && *tmr) {
         xTimerStop(*tmr, portMAX_DELAY);
@@ -295,22 +295,22 @@ esp_err_t iot_button_set_evt_cb(button_handle_t btn_handle, button_cb_type_t typ
     if (type == BUTTON_CB_PUSH) {
         btn->tap_psh_cb.arg = arg;
         btn->tap_psh_cb.cb = cb;
-        btn->tap_psh_cb.interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_RATE_MS;
+        btn->tap_psh_cb.interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_PERIOD_MS;
         btn->tap_psh_cb.pbtn = btn;
         xTimerChangePeriod(btn->tap_psh_cb.tmr, btn->tap_psh_cb.interval, portMAX_DELAY);
     } else if (type == BUTTON_CB_RELEASE) {
         btn->tap_rls_cb.arg = arg;
         btn->tap_rls_cb.cb = cb;
-        btn->tap_rls_cb.interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_RATE_MS;
+        btn->tap_rls_cb.interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_PERIOD_MS;
         btn->tap_rls_cb.pbtn = btn;
         xTimerChangePeriod(btn->tap_rls_cb.tmr, btn->tap_psh_cb.interval, portMAX_DELAY);
     } else if (type == BUTTON_CB_TAP) {
         btn->tap_short_cb.arg = arg;
         btn->tap_short_cb.cb = cb;
-        btn->tap_short_cb.interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_RATE_MS;
+        btn->tap_short_cb.interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_PERIOD_MS;
         btn->tap_short_cb.pbtn = btn;
     } else if (type == BUTTON_CB_SERIAL) {
-        iot_button_set_serial_cb(btn_handle, 1, 1000 / portTICK_RATE_MS, cb, arg);
+        iot_button_set_serial_cb(btn_handle, 1, 1000 / portTICK_PERIOD_MS, cb, arg);
     }
     return ESP_OK;
 }

components/esp-insights

@@ -57,7 +57,7 @@ static void scli_task(void *arg)
         memset(linebuf, 0, sizeof(linebuf));
         i = 0;
         do {
-            ret = xQueueReceive(uart_queue, (void * )&event, (portTickType)portMAX_DELAY);
+            ret = xQueueReceive(uart_queue, (void * )&event, (TickType_t)portMAX_DELAY);
             if (ret != pdPASS) {
                 if(stop == 1) {
                     break;

components/esp_rainmaker/src/console/esp_rmaker_console.c

@@ -12,8 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <mbedtls/version.h>
+/* Keep forward-compatibility with Mbed TLS 3.x */
+#if (MBEDTLS_VERSION_NUMBER < 0x03000000)
+#define MBEDTLS_2_X_COMPAT
+#else /* !(MBEDTLS_VERSION_NUMBER < 0x03000000) */
+/* Macro wrapper for struct's private members */
+#ifndef MBEDTLS_ALLOW_PRIVATE_ACCESS
+#define MBEDTLS_ALLOW_PRIVATE_ACCESS
+#endif /* MBEDTLS_ALLOW_PRIVATE_ACCESS */
+#endif /* !(MBEDTLS_VERSION_NUMBER < 0x03000000) */
 
-#include "mbedtls/config.h"
 #include "mbedtls/platform.h"
 #include "mbedtls/pk.h"
 #include "mbedtls/rsa.h"
@@ -45,6 +54,7 @@
 #include "esp_rmaker_client_data.h"
 #include "esp_rmaker_claim.h"
 
+
 static const char *TAG = "esp_claim";
 
 #define ESP_RMAKER_RANDOM_NUMBER_LEN    64
@@ -796,7 +806,12 @@ esp_err_t __esp_rmaker_claim_init(esp_rmaker_claim_data_t *claim_data)
     if (key) {
         mbedtls_pk_free(&claim_data->key);
         mbedtls_pk_init(&claim_data->key);
-        if (mbedtls_pk_parse_key(&claim_data->key, (uint8_t *)key, strlen(key) + 1, NULL, 0) == 0) {
+#ifdef MBEDTLS_2_X_COMPAT
+        int ret = mbedtls_pk_parse_key(&claim_data->key, (uint8_t *)key, strlen(key) + 1, NULL, 0);
+#else
+        int ret = mbedtls_pk_parse_key(&claim_data->key, (uint8_t *)key, strlen(key) + 1, NULL, 0, mbedtls_ctr_drbg_random, NULL);
+#endif
+        if (ret == 0) {
             ESP_LOGI(TAG, "Private key already exists. No need to re-initialise it.");
             claim_data->state = RMAKER_CLAIM_STATE_PK_GENERATED;
         }

components/esp_rainmaker/src/core/esp_rmaker_claim.c

@@ -327,7 +327,7 @@ static esp_err_t __esp_rmaker_start_local_ctrl_service(const char *serv_name)
 
     /* update the global status */
     g_local_ctrl_is_started = true;
-    esp_rmaker_post_event(RMAKER_EVENT_LOCAL_CTRL_STARTED, serv_name, strlen(serv_name) + 1);
+    esp_rmaker_post_event(RMAKER_EVENT_LOCAL_CTRL_STARTED, (void *)serv_name, strlen(serv_name) + 1);
     return ESP_OK;
 }
 

components/esp_rainmaker/src/core/esp_rmaker_local_ctrl.c

@@ -12,7 +12,7 @@
 #include <esp_insights.h>
 #include <string.h>
 #include <esp_rmaker_core.h>
-#include <esp_rmaker_factory.h>
+#include <esp_rmaker_common_events.h>
 
 #if CONFIG_APP_INSIGHTS_ENABLE_LOG_TYPE_ALL
 #define APP_INSIGHTS_LOG_TYPE               ESP_DIAG_LOG_TYPE_ERROR \
@@ -24,6 +24,48 @@
 
 esp_err_t esp_insights_enable(esp_insights_config_t *config);
 
+#define INSIGHTS_TOPIC_SUFFIX       "diagnostics/from-node"
+
+static int app_insights_data_send(void *data, size_t len)
+{
+    char topic[128];
+    int msg_id = -1;
+    if (data == NULL) {
+        return 0;
+    }
+    char *node_id = esp_rmaker_get_node_id();
+    if (!node_id) {
+        return -1;
+    }
+    snprintf(topic, sizeof(topic), "node/%s/%s", node_id, INSIGHTS_TOPIC_SUFFIX);
+    esp_rmaker_mqtt_publish(topic, data, len, RMAKER_MQTT_QOS1, &msg_id);
+    return msg_id;
+}
+
+static void rmaker_common_event_handler(void* arg, esp_event_base_t event_base,
+                                        int32_t event_id, void* event_data)
+{
+    if (event_base != RMAKER_COMMON_EVENT) {
+        return;
+    }
+    esp_insights_transport_event_data_t data;
+    switch(event_id) {
+        case RMAKER_MQTT_EVENT_PUBLISHED:
+            memset(&data, 0, sizeof(data));
+            data.msg_id = *(int *)event_data;
+            esp_event_post(INSIGHTS_EVENT, INSIGHTS_EVENT_TRANSPORT_SEND_SUCCESS, &data, sizeof(data), portMAX_DELAY);
+            break;
+#ifdef CONFIG_MQTT_REPORT_DELETED_MESSAGES
+        case RMAKER_MQTT_EVENT_MSG_DELETED:
+            memset(&data, 0, sizeof(data));
+            data.msg_id = *(int *)event_data;
+            esp_event_post(INSIGHTS_EVENT, INSIGHTS_EVENT_TRANSPORT_SEND_FAILED, &data, sizeof(data), portMAX_DELAY);
+            break;
+#endif /* CONFIG_MQTT_REPORT_DELETED_MESSAGES */
+        default:
+            break;
+    }
+}
 #endif /* CONFIG_ESP_INSIGHTS_ENABLED */
 
 #define TAG "app_insights"
@@ -33,26 +75,19 @@ esp_err_t app_insights_enable(void)
 #ifdef CONFIG_ESP_INSIGHTS_ENABLED
 #ifdef CONFIG_ESP_RMAKER_SELF_CLAIM
     ESP_LOGW(TAG, "Nodes with Self Claiming may not be accessible for Insights.");
-    /* This is required so that the esp insights component will get correct
-     * node id from NVS
-     */
-    char *node_id = esp_rmaker_get_node_id();
-    if (node_id) {
-        esp_rmaker_factory_set("node_id", node_id, strlen(node_id));
-    }
 #endif
-    esp_rmaker_mqtt_config_t mqtt_config = {
-        .init           = NULL,
-        .connect        = NULL,
-        .disconnect     = NULL,
-        .publish        = esp_rmaker_mqtt_publish,
-        .subscribe      = esp_rmaker_mqtt_subscribe,
-        .unsubscribe    = esp_rmaker_mqtt_unsubscribe,
+    char *node_id = esp_rmaker_get_node_id();
+
+    esp_insights_transport_config_t transport = {
+        .callbacks.data_send  = app_insights_data_send,
     };
-    esp_insights_mqtt_setup(mqtt_config);
+    esp_insights_transport_register(&transport);
+
+    esp_event_handler_register(RMAKER_COMMON_EVENT, ESP_EVENT_ANY_ID, rmaker_common_event_handler, NULL);
 
     esp_insights_config_t config = {
         .log_type = APP_INSIGHTS_LOG_TYPE,
+        .node_id  = node_id,
     };
     esp_insights_enable(&config);
 #else

components/rmaker_common

@@ -11,7 +11,7 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
 #include <esp_log.h>
-
+#include <esp_netif_types.h>
 #include <esp_rmaker_core.h>
 #include <esp_rmaker_standard_params.h>