Skip to content

Commit 1e9112d

Browse files
committed
fix merge errors
1 parent 97bac88 commit 1e9112d

File tree

176 files changed

+2
-873
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+2
-873
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,7 @@ void emac_hal_start(emac_hal_context_t *hal);
225225
* @param hal EMAC HAL context infostructure
226226
* @return
227227
* - ESP_OK: succeed
228-
<<<<<<< HEAD
229-
* - ESP_ERR_INVALID_STATE: previous frame transmission is not completed. When this error occurs,
230-
=======
231228
* - ESP_ERR_INVALID_STATE: previous frame transmission/reception is not completed. When this error occurs,
232-
>>>>>>> orig_master_espressif
233229
* wait and reapeat the EMAC stop again.
234230
*/
235231
esp_err_t emac_hal_stop(emac_hal_context_t *hal);

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ typedef enum {
3535
RMAKER_MQTT_EVENT_CONNECTED,
3636
/** Disconnected from MQTT Broker */
3737
RMAKER_MQTT_EVENT_DISCONNECTED,
38-
<<<<<<< HEAD
39-
/** MQTT message published successfully */
40-
RMAKER_MQTT_EVENT_PUBLISHED,
41-
} esp_rmaker_mqtt_event_t;
42-
=======
4338
/** MQTT message published successfully.
4439
* Event data will contain the message ID (integer) of published message.
4540
*/
@@ -60,7 +55,6 @@ typedef enum {
6055
*/
6156
RMAKER_MQTT_EVENT_MSG_DELETED,
6257
} esp_rmaker_common_event_t;
63-
>>>>>>> orig_master_espressif
6458
#ifdef __cplusplus
6559
}
6660
#endif

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ typedef esp_rmaker_mqtt_conn_params_t *(*esp_rmaker_mqtt_get_conn_params_t)(void
5252
* @param[in] priv_data The private data passed during subscription
5353
*/
5454
typedef void (*esp_rmaker_mqtt_subscribe_cb_t)(const char *topic, void *payload, size_t payload_len, void *priv_data);
55-
<<<<<<< HEAD
56-
57-
=======
5855

59-
>>>>>>> orig_master_espressif
6056
/** MQTT Init function prototype
6157
*
6258
* @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,
6763
*/
6864
typedef esp_err_t (*esp_rmaker_mqtt_init_t)(esp_rmaker_mqtt_conn_params_t *conn_params);
6965

70-
<<<<<<< HEAD
71-
=======
7266
/** MQTT Deinit function prototype
7367
*
7468
* Call this function after MQTT has disconnected.
7569
*/
7670
typedef void (*esp_rmaker_mqtt_deinit_t)(void);
7771

78-
>>>>>>> orig_master_espressif
7972
/** MQTT Connect function prototype
8073
*
8174
* Starts the connection attempts to the MQTT broker.
@@ -137,11 +130,8 @@ typedef struct {
137130
esp_rmaker_mqtt_get_conn_params_t get_conn_params;
138131
/** Pointer to MQTT Init function. */
139132
esp_rmaker_mqtt_init_t init;
140-
<<<<<<< HEAD
141-
=======
142133
/** Pointer to MQTT Deinit function. */
143134
esp_rmaker_mqtt_deinit_t deinit;
144-
>>>>>>> orig_master_espressif
145135
/** Pointer to MQTT Connect function. */
146136
esp_rmaker_mqtt_connect_t connect;
147137
/** Pointer to MQTQ Disconnect function */

tools/sdk/esp32/lib/libapp_trace.a

0 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libbt.a

500 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libbutton.a

0 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libcoap.a

440 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libdriver.a

-104 Bytes
Binary file not shown.

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

460 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)