merge conflict #5 and #6 resolved

This commit is contained in:
Jens Wagner
2024-05-13 13:53:02 +02:00
6 changed files with 229 additions and 1 deletions

View File

@ -135,6 +135,7 @@ For instance, in `src/Dezibot.h`, to include `src/motion/Motion.h`, you should w
* Upload Mode: "UART0 / Hardware CDC"
* USB Mode: "Hardware CDC and JTAG"
* Programmer: "Esptool"
* USB CDC on Boot: Enabled
Using `arduino-cli` to compile and upload:
`arduino-cli upload /Users/jo/Documents/Arduino/theSketch -p /dev/cu.usbmodem101 -b esp32:esp32:nora_w10`