alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-12-15 19:34:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into driver_merge_tmp/merge_uart

Browse Source 
# Conflicts:
#	components/esp32/include/esp_err.h
This commit is contained in:
Wangjialin
2016-11-10 11:57:19 +08:00
parent e452278194 fcba7e278d
commit 6fb2515a5d
135 changed files with 21606 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp32/include/soc/rmt_struct.h
View File

@@ -231,11 +231,10 @@ typedef volatile struct {
struct {
union {
struct {
uint32_t level1: 1;
uint32_t duration1: 15;
uint32_t level0: 1;
uint32_t duration0: 15;
uint32_t level0: 1;
uint32_t duration1: 15;
uint32_t level1: 1;
};
uint32_t val;
} data[64];