IDF release/v4.4 f0a3ccc732

Author: me-no-dev

platform.txt

@@ -323,7 +323,7 @@
         "UNITY_INCLUDE_CONFIG_H",
         "WITH_POSIX",
         "_GNU_SOURCE",
-        ("IDF_VER", '\\"v4.4.1-581-gee2029c38a\\"'),
+        ("IDF_VER", '\\"v4.4.1-583-gf0a3ccc732\\"'),
         "ESP_PLATFORM",
         "_POSIX_READER_WRITER_LOCKS",
         "ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32.py

@@ -318,7 +318,7 @@
         "UNITY_INCLUDE_CONFIG_H",
         "WITH_POSIX",
         "_GNU_SOURCE",
-        ("IDF_VER", '\\"v4.4.1-581-gee2029c38a\\"'),
+        ("IDF_VER", '\\"v4.4.1-583-gf0a3ccc732\\"'),
         "ESP_PLATFORM",
         "_POSIX_READER_WRITER_LOCKS",
         "ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32c3.py

@@ -306,7 +306,7 @@
         "UNITY_INCLUDE_CONFIG_H",
         "WITH_POSIX",
         "_GNU_SOURCE",
-        ("IDF_VER", '\\"v4.4.1-581-gee2029c38a\\"'),
+        ("IDF_VER", '\\"v4.4.1-583-gf0a3ccc732\\"'),
         "ESP_PLATFORM",
         "_POSIX_READER_WRITER_LOCKS",
         "ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32s2.py

@@ -322,7 +322,7 @@
         "UNITY_INCLUDE_CONFIG_H",
         "WITH_POSIX",
         "_GNU_SOURCE",
-        ("IDF_VER", '\\"v4.4.1-581-gee2029c38a\\"'),
+        ("IDF_VER", '\\"v4.4.1-583-gf0a3ccc732\\"'),
         "ESP_PLATFORM",
         "_POSIX_READER_WRITER_LOCKS",
         "ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32s3.py

@@ -63,6 +63,7 @@
 #define CONFIG_ESP_RMAKER_OTA_ROLLBACK_WAIT_PERIOD 90
 #define CONFIG_ESP_RMAKER_SCHEDULING_MAX_SCHEDULES 10
 #define CONFIG_ESP_RMAKER_SCENES_MAX_SCENES 10
+#define CONFIG_ESP_RMAKER_CMD_RESP_ENABLE 1
 #define CONFIG_ENABLE_ARDUINO_DEPENDS 1
 #define CONFIG_AUTOSTART_ARDUINO 1
 #define CONFIG_ARDUINO_RUN_CORE1 1
@@ -601,6 +602,7 @@
 #define CONFIG_ESP_RMAKER_FACTORY_NAMESPACE "rmaker_creds"
 #define CONFIG_ESP_RMAKER_DEF_TIMEZONE "Asia/Shanghai"
 #define CONFIG_ESP_RMAKER_SNTP_SERVER_NAME "pool.ntp.org"
+#define CONFIG_ESP_RMAKER_MAX_COMMANDS 10
 #define CONFIG_DSP_OPTIMIZATIONS_SUPPORTED 1
 #define CONFIG_DSP_OPTIMIZED 1
 #define CONFIG_DSP_OPTIMIZATION 1
@@ -748,5 +750,5 @@
 #define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
 #define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
 #define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
-#define CONFIG_ARDUINO_IDF_COMMIT "ee2029c38a"
+#define CONFIG_ARDUINO_IDF_COMMIT "f0a3ccc732"
 #define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/dio_qspi/include/sdkconfig.h

@@ -63,6 +63,7 @@
 #define CONFIG_ESP_RMAKER_OTA_ROLLBACK_WAIT_PERIOD 90
 #define CONFIG_ESP_RMAKER_SCHEDULING_MAX_SCHEDULES 10
 #define CONFIG_ESP_RMAKER_SCENES_MAX_SCENES 10
+#define CONFIG_ESP_RMAKER_CMD_RESP_ENABLE 1
 #define CONFIG_ENABLE_ARDUINO_DEPENDS 1
 #define CONFIG_AUTOSTART_ARDUINO 1
 #define CONFIG_ARDUINO_RUN_CORE1 1
@@ -601,6 +602,7 @@
 #define CONFIG_ESP_RMAKER_FACTORY_NAMESPACE "rmaker_creds"
 #define CONFIG_ESP_RMAKER_DEF_TIMEZONE "Asia/Shanghai"
 #define CONFIG_ESP_RMAKER_SNTP_SERVER_NAME "pool.ntp.org"
+#define CONFIG_ESP_RMAKER_MAX_COMMANDS 10
 #define CONFIG_DSP_OPTIMIZATIONS_SUPPORTED 1
 #define CONFIG_DSP_OPTIMIZED 1
 #define CONFIG_DSP_OPTIMIZATION 1
@@ -748,5 +750,5 @@
 #define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
 #define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
 #define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
-#define CONFIG_ARDUINO_IDF_COMMIT "ee2029c38a"
+#define CONFIG_ARDUINO_IDF_COMMIT "f0a3ccc732"
 #define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/dout_qspi/include/sdkconfig.h

@@ -931,6 +931,20 @@ bool esp_rmaker_local_ctrl_service_started(void);
  * @return error on failure
  */
 esp_err_t esp_rmaker_ota_enable_default(void);
+
+/*
+ * Send a command to self (TESTING only)
+ *
+ * This is to be passed as an argument to esp_rmaker_cmd_resp_test_send().
+ *
+ * @param[in] cmd The TLV encoded command data.
+ * @param[in] cmd_len Length of the command data.
+ * @param[in] priv_data Private data passed to esp_rmaker_cmd_resp_test_send().
+ *
+ * @return ESP_OK on success
+ * @return error on failure
+ */
+esp_err_t esp_rmaker_test_cmd_resp(const void *cmd, size_t cmd_len, void *priv_data);
 #ifdef __cplusplus
 }
 #endif

tools/sdk/esp32/include/esp_rainmaker/include/esp_rmaker_core.h

@@ -0,0 +1,171 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <esp_err.h>
+#include <esp_event.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/* Super Admin User Flag*/
+#define ESP_RMAKER_USER_ROLE_SUPER_ADMIN    (1 << 0)
+
+/** Primary User Flag */
+#define ESP_RMAKER_USER_ROLE_PRIMARY_USER   (1 << 1)
+
+/** Secondary User Flag */
+#define ESP_RMAKER_USER_ROLE_SECONDARY_USER (1 << 2)
+
+
+/** RainMaker Command Response TLV8 Types */
+typedef enum {
+    /** Request Id : Variable length string, max 32 characters*/
+    ESP_RMAKER_TLV_TYPE_REQ_ID = 1,
+    /** User Role : 1 byte */
+    ESP_RMAKER_TLV_TYPE_USER_ROLE,
+    /** Status : 1 byte */
+    ESP_RMAKER_TLV_TYPE_STATUS,
+    /** Timestamp : TBD */
+    ESP_RMAKER_TLV_TYPE_TIMESTAMP,
+    /** Command : 2 bytes*/
+    ESP_RMAKER_TLV_TYPE_CMD,
+    /** Data : Variable length */
+    ESP_RMAKER_TLV_TYPE_DATA
+} esp_rmaker_tlv_type_t;
+
+/* RainMaker Command Response Status */
+typedef enum {
+    /** Success */
+    ESP_RMAKER_CMD_STATUS_SUCCESS = 0,
+    /** Generic Failure */
+    ESP_RMAKER_CMD_STATUS_FAILED,
+    /** Invalid Command */
+    ESP_RMAKER_CMD_STATUS_CMD_INVALID,
+    /** Authentication Failed */
+    ESP_RMAKER_CMD_STATUS_AUTH_FAIL,
+    /** Command not found */
+    ESP_RMAKER_CMD_STATUS_NOT_FOUND,
+    /** Last status value */
+    ESP_RMAKER_CMD_STATUS_MAX,
+} esp_rmaker_cmd_status_t;
+
+#define REQ_ID_LEN  32
+typedef struct {
+    /** Command id */
+    uint16_t cmd;
+    /** Request id */
+    char req_id[REQ_ID_LEN];
+    /** User Role */
+    uint8_t user_role;
+} esp_rmaker_cmd_ctx_t;
+
+typedef enum {
+    /** Standard command: Set Parameters */
+    ESP_RMAKER_CMD_TYPE_SET_PARAMS = 1,
+    /** Last Standard command */
+    ESP_RMAKER_CMD_STANDARD_LAST = 0xfff,
+    /** Custom commands can start from here */
+    ESP_RMAKER_CMD_CUSTOM_START = 0x1000
+} esp_rmaker_cmd_t;
+
+/** Command Response Handler
+ *
+ * If any command data is received from any of the supported transports (which are outside the scope of this core framework),
+ * this function should be called to handle it and fill in the response.
+ *
+ * @param[in] input Pointer to input data.
+ * @param[in] input_len data len.
+ * @param[in] output Pointer to output data which should be set by the handler.
+ * @param[out] output_len Length of output generated.
+ *
+ * @return ESP_OK on success.
+ * @return error on failure.
+ */
+esp_err_t esp_rmaker_cmd_response_handler(const void *input, size_t input_len, void **output, size_t *output_len);
+
+/** Prototype for Command Handler
+ *
+ * The handler to be invoked when a given command is received.
+ *
+ * @param[in] in_data Pointer to input data.
+ * @param[in] in_len data len.
+ * @param[in] out_data Pointer to output data which should be set by the handler.
+ * @param[out] out_len Length of output generated.
+ * @param[in] ctx Command Context.
+ * @param[in] priv Private data, if specified while registering command.
+ *
+ * @return ESP_OK on success.
+ * @return error on failure.
+ */
+typedef esp_err_t (*esp_rmaker_cmd_handler_t)(const void *in_data, size_t in_len, void **out_data, size_t *out_len, esp_rmaker_cmd_ctx_t *ctx, void *priv);
+
+/** Register a new command
+ *
+ * @param[in] cmd Command Identifier. Custom commands should start beyond ESP_RMAKER_CMD_STANDARD_LAST
+ * @param[in] access User Access for the command. Can be an OR of the various user role flags like ESP_RMAKER_USER_ROLE_SUPER_ADMIN,
+ * ESP_RMAKER_USER_ROLE_PRIMARY_USER and ESP_RMAKER_USER_ROLE_SECONDARY_USER
+ * @param[in] handler The handler to be invoked when the given command is received.
+ * @param[in] free_on_return Flag to indicate of the framework should free the output after it has been sent as response.
+ * @paramp[in] priv Optional private data to be passed to the handler.
+ *
+ * @return ESP_OK on success.
+ * @return error on failure.
+ */
+esp_err_t esp_rmaker_cmd_register(uint16_t cmd, uint8_t access, esp_rmaker_cmd_handler_t handler, bool free_on_return, void *priv);
+
+/** De-register a command
+ *
+ * @param[in] cmd Command Identifier. Custom commands should start beyond ESP_RMAKER_CMD_STANDARD_LAST
+ *
+ * @return ESP_OK on success.
+ * @return error on failure.
+ */
+esp_err_t esp_rmaker_cmd_deregister(uint16_t cmd);
+
+/** Prototype for Command sending function (TESTING only)
+ *
+ * @param[in] data Pointer to the data to be sent.
+ * @param[in[ data_len Size of data to be sent.
+ * @param[in] priv Private data, if applicable.
+ *
+ * @return ESP_OK on success.
+ * @return error on failure.
+ */
+typedef esp_err_t (*esp_rmaker_cmd_send_t)(const void *data, size_t data_len, void *priv);
+
+/** Send Test command (TESTING only)
+ *
+ * @param[in] req_id NULL terminated request id of max 32 characters.
+ * @param[in] role User Role flag.
+ * @param[in] cmd Command Identifier.
+ * @param[in] data Pointer to data for the command.
+ * @param[in] data_size Size of the data.
+ * @param[in] cmd_send Transport specific function to send the command data.
+ * @param[in] priv Private data (if any) to be sent to cmd_send.
+ *
+ * @return ESP_OK on success.
+ * @return error on failure.
+ */
+esp_err_t esp_rmaker_cmd_resp_test_send(const char *req_id, uint8_t role, uint16_t cmd, const void *data, size_t data_size, esp_rmaker_cmd_send_t cmd_send, void *priv);
+
+/** Parse response (TESTING only)
+ *
+ * @param[in] response Pointer to the response received
+ * @param[in] response_len Length of the response
+ * @param[in] priv Private data, if any. Can be NULL.
+ *
+ * @return ESP_OK on success.
+ * @return error on failure.
+ */
+esp_err_t esp_rmaker_cmd_resp_parse_response(const void *response, size_t response_len, void *priv);
+#ifdef __cplusplus
+}
+#endif

tools/sdk/esp32/include/rmaker_common/include/esp_rmaker_cmd_resp.h

@@ -23,7 +23,7 @@ extern "C"
 {
 #endif
 
-#ifdef CONFIG_SPIRAM
+#if (CONFIG_SPIRAM_SUPPORT && (CONFIG_SPIRAM_USE_CAPS_ALLOC || CONFIG_SPIRAM_USE_MALLOC))
 #define MEM_ALLOC_EXTRAM(size)         heap_caps_malloc(size, MALLOC_CAP_SPIRAM)
 #define MEM_CALLOC_EXTRAM(num, size)   heap_caps_calloc(num, size, MALLOC_CAP_SPIRAM)
 #define MEM_REALLOC_EXTRAM(ptr, size)  heap_caps_realloc(ptr, size, MALLOC_CAP_SPIRAM)