diff --git a/PCBs/AZDelivery_ESP32_NodeMCU/gerber/gerber_rev2.zip b/PCBs/AZDelivery_ESP32_NodeMCU/gerber/gerber_rev2.zip index 5c23c06..e7ceb29 100644 Binary files a/PCBs/AZDelivery_ESP32_NodeMCU/gerber/gerber_rev2.zip and b/PCBs/AZDelivery_ESP32_NodeMCU/gerber/gerber_rev2.zip differ diff --git a/PCBs/AZDelivery_ESP32_NodeMCU/pictures/3d-model-back.png b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/3d-model-back.png index e2ecbc6..08df7be 100644 Binary files a/PCBs/AZDelivery_ESP32_NodeMCU/pictures/3d-model-back.png and b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/3d-model-back.png differ diff --git a/PCBs/AZDelivery_ESP32_NodeMCU/pictures/3d-model_front.png b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/3d-model_front.png index 8cbd2f3..30eaab8 100644 Binary files a/PCBs/AZDelivery_ESP32_NodeMCU/pictures/3d-model_front.png and b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/3d-model_front.png differ diff --git a/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Schematics_rev2.pdf b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Schematics_rev2.pdf index 3c697ca..307619b 100644 Binary files a/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Schematics_rev2.pdf and b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Schematics_rev2.pdf differ diff --git a/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered.jpg b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered.jpg deleted file mode 100644 index c09d4bd..0000000 Binary files a/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered.jpg and /dev/null differ diff --git a/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered_with_peripherals.jpg b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered_with_peripherals.jpg index 1814b71..a522640 100644 Binary files a/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered_with_peripherals.jpg and b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered_with_peripherals.jpg differ diff --git a/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered_with_peripherals2.jpg b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered_with_peripherals2.jpg new file mode 100644 index 0000000..b1451c0 Binary files /dev/null and b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered_with_peripherals2.jpg differ diff --git a/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered_with_peripherals3.jpg b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered_with_peripherals3.jpg new file mode 100644 index 0000000..92ae880 Binary files /dev/null and b/PCBs/AZDelivery_ESP32_NodeMCU/pictures/Soldered_with_peripherals3.jpg differ diff --git a/platformio.ini b/platformio.ini index e1beff0..012a066 100644 --- a/platformio.ini +++ b/platformio.ini @@ -10,14 +10,15 @@ [env] platform = espressif32 +;platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream framework = arduino monitor_speed = 115200 extra_scripts = pre:processHtml.py lib_deps = SPI Wire - https://github.com/schreibfaul1/ESP32-audioI2S.git#5efe459 - https://github.com/madhephaestus/ESP32Encoder.git#bdfbdbc + https://github.com/schreibfaul1/ESP32-audioI2S.git#10e7eb6 + https://github.com/madhephaestus/ESP32Encoder.git#06fbeb3 https://github.com/knolleary/pubsubclient.git#2d228f2 https://github.com/biologist79/ESP32FTPServer https://github.com/FastLED/FastLED.git#3.4.0 @@ -31,9 +32,11 @@ lib_deps = https://github.com/tuniii/LogRingBuffer.git#89d7d3e https://github.com/tueddy/PN5180-Library.git#2d9ae3d platform_packages = + platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1.0.6 ;platformio/framework-arduinoespressif32 @ https://github.com/tuniii/arduino-esp32-v1.0.6-wt#v1.0.6-patched - + ;platformio/tool-esptoolpy @ ~1.30100 + ;framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.1-RC1 [env:esp32-a1s] board = esp-wrover-kit @@ -114,7 +117,7 @@ board = az-delivery-devkit-v4 board_build.partitions = custom_4mb_noota.csv upload_port = /dev/cu.SLAB_USBtoUART monitor_port = /dev/cu.SLAB_USBtoUART -build_flags = -DHAL=99 +build_flags = -DHAL=8 [env:ttgo_t8] @@ -134,8 +137,8 @@ build_flags = -DHAL=5 board = esp-wrover-kit ;board_build.partitions = huge_app.csv board_build.partitions = custom_16mb_ota.csv -upload_port = /dev/cu.SLAB_USBtoUART -monitor_port = /dev/cu.SLAB_USBtoUART +upload_port = /dev/tty.wchusbserial1410 +monitor_port = /dev/tty.wchusbserial1410 build_flags = -DHAL=6 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue diff --git a/src/settings-azdelivery_sdmmc.h b/src/settings-azdelivery_sdmmc.h index 94bdf0b..5d6936b 100644 --- a/src/settings-azdelivery_sdmmc.h +++ b/src/settings-azdelivery_sdmmc.h @@ -57,7 +57,7 @@ //#define GPIO_HP_EN 113 // To enable amp for headphones (GPIO or port-channel) // Control-buttons (set to 99 to DISABLE; 0->39 for GPIO; 100->115 for port-expander) - #define NEXT_BUTTON 4 // Button 0: GPIO to detect next + #define NEXT_BUTTON 13 // Button 0: GPIO to detect next #define PREVIOUS_BUTTON 39 // Button 1: GPIO to detect previous #define PAUSEPLAY_BUTTON 5 // Button 2: GPIO to detect pause/play #define BUTTON_4 99 // Button 4: unnamed optional button @@ -87,7 +87,7 @@ // (optinal) Headphone-detection #ifdef HEADPHONE_ADJUST_ENABLE //#define DETECT_HP_ON_HIGH // Per default headphones are supposed to be connected if HT_DETECT is LOW. DETECT_HP_ON_HIGH will change this behaviour to HIGH. - #define HP_DETECT 13 // GPIO that detects, if there's a plug in the headphone jack or not + #define HP_DETECT 4 // GPIO that detects, if there's a plug in the headphone jack or not #endif // (optional) Monitoring of battery-voltage via ADC