Resolve confict manually#2

DogushC wants to merge 2 commits intocezer-io:Developmentcezer-io/cezerio-devkits-arduino:Developmentfrom

espressif:masterespressif/arduino-esp32:masterCopy head branch name to clipboard