espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-03 00:21:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/multiple_prs_from_github' into 'master'

Browse Source 
Feature/multiple PRs from github

Closes IDFGH-3877, IDFGH-4090, IDFGH-4641, IDFGH-4666, and IDFGH-4854

See merge request espressif/esp-idf!12858
This commit is contained in:
Mahavir Jain
2021-03-24 03:29:28 +00:00
parent 04652619aa 1da8dd5816
commit b603a0bea0
6 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_hid/src/esp_hid_common.c
View File

@@ -19,7 +19,7 @@
#if (CONFIG_GATTS_ENABLE || CONFIG_GATTC_ENABLE)
#include "esp_gatt_defs.h"
#endif
const char *TAG = "hid_parser";
static const char *TAG = "hid_parser";
typedef struct {
uint16_t appearance;

8
components/tinyusb/additions/include/tusb_console.h
View File

@@ -14,6 +14,10 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "esp_err.h"
/**
@@ -31,3 +35,7 @@ esp_err_t esp_tusb_init_console(int cdc_intf);
* @return esp_err_t
*/
esp_err_t esp_tusb_deinit_console(int cdc_intf);
#ifdef __cplusplus
}
#endif