fix merge errors

Author: Jason2866

tools/sdk/esp32/include/hal/include/hal/emac_hal.h

@@ -225,11 +225,7 @@ void emac_hal_start(emac_hal_context_t *hal);
  * @param hal EMAC HAL context infostructure
  * @return
  *     - ESP_OK: succeed
-<<<<<<< HEAD
-  *    - ESP_ERR_INVALID_STATE: previous frame transmission is not completed. When this error occurs,
-=======
   *    - ESP_ERR_INVALID_STATE: previous frame transmission/reception is not completed. When this error occurs,
->>>>>>> orig_master_espressif
   *      wait and reapeat the EMAC stop again.
  */
 esp_err_t emac_hal_stop(emac_hal_context_t *hal);

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

@@ -35,11 +35,6 @@ typedef enum {
     RMAKER_MQTT_EVENT_CONNECTED,
     /** Disconnected from MQTT Broker */
     RMAKER_MQTT_EVENT_DISCONNECTED,
-<<<<<<< HEAD
-    /** MQTT message published successfully */
-    RMAKER_MQTT_EVENT_PUBLISHED,
-} esp_rmaker_mqtt_event_t;
-=======
     /** MQTT message published successfully.
      * Event data will contain the message ID (integer) of published message.
      */
@@ -60,7 +55,6 @@ typedef enum {
      */
     RMAKER_MQTT_EVENT_MSG_DELETED,
 } esp_rmaker_common_event_t;
->>>>>>> orig_master_espressif
 #ifdef __cplusplus
 }
 #endif

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

@@ -52,11 +52,7 @@ typedef esp_rmaker_mqtt_conn_params_t *(*esp_rmaker_mqtt_get_conn_params_t)(void
  * @param[in] priv_data The private data passed during subscription
  */
 typedef void (*esp_rmaker_mqtt_subscribe_cb_t)(const char *topic, void *payload, size_t payload_len, void *priv_data);
-<<<<<<< HEAD
-   
-=======
 
->>>>>>> orig_master_espressif
 /** MQTT Init function prototype
  *
  * @param[in] conn_params The MQTT connection parameters. If NULL is passed, it should internally use the
@@ -67,15 +63,12 @@ typedef void (*esp_rmaker_mqtt_subscribe_cb_t)(const char *topic, void *payload,
  */
 typedef esp_err_t (*esp_rmaker_mqtt_init_t)(esp_rmaker_mqtt_conn_params_t *conn_params);
 
-<<<<<<< HEAD
-=======
 /** MQTT Deinit function prototype
  *
  * Call this function after MQTT has disconnected.
  */
 typedef void (*esp_rmaker_mqtt_deinit_t)(void);
 
->>>>>>> orig_master_espressif
 /** MQTT Connect function prototype
  *
  * Starts the connection attempts to the MQTT broker.
@@ -137,11 +130,8 @@ typedef struct {
     esp_rmaker_mqtt_get_conn_params_t get_conn_params;
     /** Pointer to MQTT Init function. */
     esp_rmaker_mqtt_init_t init;
-<<<<<<< HEAD
-=======
     /** Pointer to MQTT Deinit function. */
     esp_rmaker_mqtt_deinit_t deinit;
->>>>>>> orig_master_espressif
     /** Pointer to MQTT Connect function. */
     esp_rmaker_mqtt_connect_t connect;
     /** Pointer to MQTQ Disconnect function */

tools/sdk/esp32/lib/libapp_trace.a

@@ -49,14 +49,8 @@ typedef enum {
     RMAKER_EVENT_USER_NODE_MAPPING_DONE,
     /** Local control started. Associated data is the NULL terminated Service Name */
     RMAKER_EVENT_LOCAL_CTRL_STARTED,
-<<<<<<< HEAD
-=======
-<<<<<<<< HEAD:tools/sdk/esp32c3/include/esp_rainmaker/include/esp_rmaker_core.h
     /* User reset request successfully sent to ESP RainMaker Cloud */
     RMAKER_EVENT_USER_NODE_MAPPING_RESET,
-========
->>>>>>>> orig_master_espressif:tools/sdk/esp32/include/esp_rainmaker/include/esp_rmaker_core.h
->>>>>>> orig_master_espressif
 } esp_rmaker_event_t;
 
 /** ESP RainMaker Node information */

tools/sdk/esp32/lib/libapp_update.a

@@ -19,8 +19,6 @@ extern "C"
 {
 #endif
 
-<<<<<<< HEAD
-=======
 /** User-Node Mapping states */
 typedef enum {
     /** Mapping does not exist or is not initialized */
@@ -40,7 +38,6 @@ typedef enum {
  */
 esp_rmaker_user_mapping_state_t esp_rmaker_user_node_mapping_get_state(void);
 
->>>>>>> orig_master_espressif
 /**
  * Create User Mapping Endpoint
  *

tools/sdk/esp32/lib/libbt.a

@@ -225,11 +225,7 @@ void emac_hal_start(emac_hal_context_t *hal);
  * @param hal EMAC HAL context infostructure
  * @return
  *     - ESP_OK: succeed
-<<<<<<< HEAD
-  *    - ESP_ERR_INVALID_STATE: previous frame transmission is not completed. When this error occurs,
-=======
   *    - ESP_ERR_INVALID_STATE: previous frame transmission/reception is not completed. When this error occurs,
->>>>>>> orig_master_espressif
   *      wait and reapeat the EMAC stop again.
  */
 esp_err_t emac_hal_stop(emac_hal_context_t *hal);

tools/sdk/esp32/lib/libbutton.a

@@ -35,11 +35,6 @@ typedef enum {
     RMAKER_MQTT_EVENT_CONNECTED,
     /** Disconnected from MQTT Broker */
     RMAKER_MQTT_EVENT_DISCONNECTED,
-<<<<<<< HEAD
-    /** MQTT message published successfully */
-    RMAKER_MQTT_EVENT_PUBLISHED,
-} esp_rmaker_mqtt_event_t;
-=======
     /** MQTT message published successfully.
      * Event data will contain the message ID (integer) of published message.
      */
@@ -60,7 +55,6 @@ typedef enum {
      */
     RMAKER_MQTT_EVENT_MSG_DELETED,
 } esp_rmaker_common_event_t;
->>>>>>> orig_master_espressif
 #ifdef __cplusplus
 }
 #endif

tools/sdk/esp32/lib/libcoap.a

@@ -52,11 +52,7 @@ typedef esp_rmaker_mqtt_conn_params_t *(*esp_rmaker_mqtt_get_conn_params_t)(void
  * @param[in] priv_data The private data passed during subscription
  */
 typedef void (*esp_rmaker_mqtt_subscribe_cb_t)(const char *topic, void *payload, size_t payload_len, void *priv_data);
-<<<<<<< HEAD
-   
-=======
 
->>>>>>> orig_master_espressif
 /** MQTT Init function prototype
  *
  * @param[in] conn_params The MQTT connection parameters. If NULL is passed, it should internally use the
@@ -67,15 +63,12 @@ typedef void (*esp_rmaker_mqtt_subscribe_cb_t)(const char *topic, void *payload,
  */
 typedef esp_err_t (*esp_rmaker_mqtt_init_t)(esp_rmaker_mqtt_conn_params_t *conn_params);
 
-<<<<<<< HEAD
-=======
 /** MQTT Deinit function prototype
  *
  * Call this function after MQTT has disconnected.
  */
 typedef void (*esp_rmaker_mqtt_deinit_t)(void);
 
->>>>>>> orig_master_espressif
 /** MQTT Connect function prototype
  *
  * Starts the connection attempts to the MQTT broker.
@@ -137,11 +130,8 @@ typedef struct {
     esp_rmaker_mqtt_get_conn_params_t get_conn_params;
     /** Pointer to MQTT Init function. */
     esp_rmaker_mqtt_init_t init;
-<<<<<<< HEAD
-=======
     /** Pointer to MQTT Deinit function. */
     esp_rmaker_mqtt_deinit_t deinit;
->>>>>>> orig_master_espressif
     /** Pointer to MQTT Connect function. */
     esp_rmaker_mqtt_connect_t connect;
     /** Pointer to MQTQ Disconnect function */

tools/sdk/esp32/lib/libdriver.a

@@ -15,19 +15,14 @@
 #include <stdint.h>
 #include <sntp.h>
 #include <esp_err.h>
-<<<<<<< HEAD
-=======
 #include <esp_heap_caps.h>
 #include <sdkconfig.h>
->>>>>>> orig_master_espressif
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-<<<<<<< HEAD
-=======
 #ifdef CONFIG_SPIRAM
 #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)
@@ -38,7 +33,6 @@ extern "C"
 #define MEM_REALLOC_EXTRAM(ptr, size)  realloc(ptr, size)
 #endif
 
->>>>>>> orig_master_espressif
 typedef struct esp_rmaker_time_config {
     /** If not specified, then 'CONFIG_ESP_RMAKER_SNTP_SERVER_NAME' is used as the SNTP server. */
     char *sntp_server_name;

tools/sdk/esp32/lib/libesp-tls.a

@@ -1067,7 +1067,6 @@ r_lld_con_tx_prog = 0x40001140;
 r_lld_conn_dynamic_pti_process = 0x40001144;
 r_lld_continue_scan_rx_isr_end_process = 0x40001148;
 r_lld_ext_scan_dynamic_pti_process = 0x4000114c;
-r_lld_ext_adv_dynamic_aux_pti_process = 0x40001b44;
 r_lld_hw_cca_end_isr = 0x40001150;
 r_lld_hw_cca_evt_handler = 0x40001154;
 r_lld_hw_cca_isr = 0x40001158;
@@ -1897,7 +1896,7 @@ rom_read_sar2_code = 0x40001aa4;
 rom_get_sar2_vol = 0x40001aa8;
 rom_get_pll_vol = 0x40001aac;
 rom_get_phy_target_power = 0x40001ab0;
-rom_temp_to_power = 0x40001ab4;
+/* rom_temp_to_power = 0x40001ab4; */
 rom_phy_track_pll_cap = 0x40001ab8;
 rom_phy_pwdet_always_en = 0x40001abc;
 rom_phy_pwdet_onetime_en = 0x40001ac0;

tools/sdk/esp32/lib/libesp_eth.a

@@ -51,10 +51,7 @@
 #define CONFIG_LIB_BUILDER_FLASHMODE "qio"
 #define CONFIG_LIB_BUILDER_FLASHFREQ "80m"
 #define CONFIG_ESP_RMAKER_ASSISTED_CLAIM 1
-<<<<<<< HEAD:tools/sdk/esp32c3/qspi_qspi/include/sdkconfig.h
-=======
 #define CONFIG_ESP_RMAKER_CLAIM_TYPE 2
->>>>>>> orig_master_espressif:tools/sdk/esp32c3/include/config/sdkconfig.h
 #define CONFIG_ESP_RMAKER_MQTT_HOST "a1p72mufdu6064-ats.iot.us-east-1.amazonaws.com"
 #define CONFIG_ESP_RMAKER_MAX_PARAM_DATA_SIZE 1024
 #define CONFIG_ESP_RMAKER_CONSOLE_UART_NUM_0 1

tools/sdk/esp32/lib/libesp_http_client.a

@@ -144,14 +144,10 @@ CONFIG_LIB_BUILDER_FLASHFREQ="80m"
 #
 # ESP RainMaker Config
 #
-<<<<<<< HEAD
-CONFIG_ESP_RMAKER_ASSISTED_CLAIM=y
-=======
 # CONFIG_ESP_RMAKER_NO_CLAIM is not set
 # CONFIG_ESP_RMAKER_SELF_CLAIM is not set
 CONFIG_ESP_RMAKER_ASSISTED_CLAIM=y
 CONFIG_ESP_RMAKER_CLAIM_TYPE=2
->>>>>>> orig_master_espressif
 CONFIG_ESP_RMAKER_MQTT_HOST="a1p72mufdu6064-ats.iot.us-east-1.amazonaws.com"
 CONFIG_ESP_RMAKER_MAX_PARAM_DATA_SIZE=1024
 # CONFIG_ESP_RMAKER_DISABLE_USER_MAPPING_PROV is not set

tools/sdk/esp32/lib/libesp_http_server.a

@@ -255,141 +255,6 @@ TU_ATTR_ALWAYS_INLINE static inline void     tu_unaligned_write16 (void* mem, ui
             + TU_BIN8(dlsb))
 #endif
 
-<<<<<<< HEAD
-//--------------------------------------------------------------------+
-// Debug Function
-//--------------------------------------------------------------------+
-
-// CFG_TUSB_DEBUG for debugging
-// 0 : no debug
-// 1 : print error
-// 2 : print warning
-// 3 : print info
-#if CFG_TUSB_DEBUG
-
-void tu_print_mem(void const *buf, uint32_t count, uint8_t indent);
-
-#ifdef CFG_TUSB_DEBUG_PRINTF
-  extern int CFG_TUSB_DEBUG_PRINTF(const char *format, ...);
-  #define tu_printf    CFG_TUSB_DEBUG_PRINTF
-#else
-  #define tu_printf    printf
-#endif
-
-static inline
-void tu_print_var(uint8_t const* buf, uint32_t bufsize)
-{
-  for(uint32_t i=0; i<bufsize; i++) tu_printf("%02X ", buf[i]);
-}
-
-// Log with Level
-#define TU_LOG(n, ...)        TU_XSTRCAT(TU_LOG, n)(__VA_ARGS__)
-#define TU_LOG_MEM(n, ...)    TU_XSTRCAT3(TU_LOG, n, _MEM)(__VA_ARGS__)
-#define TU_LOG_VAR(n, ...)    TU_XSTRCAT3(TU_LOG, n, _VAR)(__VA_ARGS__)
-#define TU_LOG_INT(n, ...)    TU_XSTRCAT3(TU_LOG, n, _INT)(__VA_ARGS__)
-#define TU_LOG_HEX(n, ...)    TU_XSTRCAT3(TU_LOG, n, _HEX)(__VA_ARGS__)
-#define TU_LOG_LOCATION()     tu_printf("%s: %d:\r\n", __PRETTY_FUNCTION__, __LINE__)
-#define TU_LOG_FAILED()       tu_printf("%s: %d: Failed\r\n", __PRETTY_FUNCTION__, __LINE__)
-
-// Log Level 1: Error
-#define TU_LOG1               tu_printf
-#define TU_LOG1_MEM           tu_print_mem
-#define TU_LOG1_VAR(_x)       tu_print_var((uint8_t const*)(_x), sizeof(*(_x)))
-#define TU_LOG1_INT(_x)       tu_printf(#_x " = %ld\r\n", (unsigned long) (_x) )
-#define TU_LOG1_HEX(_x)       tu_printf(#_x " = %lX\r\n", (unsigned long) (_x) )
-
-// Log Level 2: Warn
-#if CFG_TUSB_DEBUG >= 2
-  #define TU_LOG2             TU_LOG1
-  #define TU_LOG2_MEM         TU_LOG1_MEM
-  #define TU_LOG2_VAR         TU_LOG1_VAR
-  #define TU_LOG2_INT         TU_LOG1_INT
-  #define TU_LOG2_HEX         TU_LOG1_HEX
-#endif
-
-// Log Level 3: Info
-#if CFG_TUSB_DEBUG >= 3
-  #define TU_LOG3             TU_LOG1
-  #define TU_LOG3_MEM         TU_LOG1_MEM
-  #define TU_LOG3_VAR         TU_LOG1_VAR
-  #define TU_LOG3_INT         TU_LOG1_INT
-  #define TU_LOG3_HEX         TU_LOG1_HEX
-#endif
-
-typedef struct
-{
-  uint32_t key;
-  const char* data;
-} tu_lookup_entry_t;
-
-typedef struct
-{
-  uint16_t count;
-  tu_lookup_entry_t const* items;
-} tu_lookup_table_t;
-
-static inline const char* tu_lookup_find(tu_lookup_table_t const* p_table, uint32_t key)
-{
-  static char not_found[11];
-
-  for(uint16_t i=0; i<p_table->count; i++)
-  {
-    if (p_table->items[i].key == key) return p_table->items[i].data;
-  }
-
-  // not found return the key value in hex
-  snprintf(not_found, sizeof(not_found), "0x%08lX", (unsigned long) key);
-
-  return not_found;
-}
-
-#endif // CFG_TUSB_DEBUG
-
-#ifndef TU_LOG
-#define TU_LOG(n, ...)
-#define TU_LOG_MEM(n, ...)
-#define TU_LOG_VAR(n, ...)
-#define TU_LOG_INT(n, ...)
-#define TU_LOG_HEX(n, ...)
-#define TU_LOG_LOCATION()
-#define TU_LOG_FAILED()
-#endif
-
-// TODO replace all TU_LOGn with TU_LOG(n)
-
-#define TU_LOG0(...)
-#define TU_LOG0_MEM(...)
-#define TU_LOG0_VAR(...)
-#define TU_LOG0_INT(...)
-#define TU_LOG0_HEX(...)
-
-
-#ifndef TU_LOG1
-  #define TU_LOG1(...)
-  #define TU_LOG1_MEM(...)
-  #define TU_LOG1_VAR(...)
-  #define TU_LOG1_INT(...)
-  #define TU_LOG1_HEX(...)
-#endif
-
-#ifndef TU_LOG2
-  #define TU_LOG2(...)
-  #define TU_LOG2_MEM(...)
-  #define TU_LOG2_VAR(...)
-  #define TU_LOG2_INT(...)
-  #define TU_LOG2_HEX(...)
-#endif
-
-#ifndef TU_LOG3
-  #define TU_LOG3(...)
-  #define TU_LOG3_MEM(...)
-  #define TU_LOG3_VAR(...)
-  #define TU_LOG3_INT(...)
-  #define TU_LOG3_HEX(...)
-#endif
-
-=======
->>>>>>> orig_master_espressif
 #ifdef __cplusplus
  }
 #endif