Merge 67e3735bae into 58e909afed

.github/workflows/dev.actions.yml

@@ -16,7 +16,7 @@ jobs:
       with:
         arduino-board-fqbn: esp32:esp32:watchy:Revision=v20,PartitionScheme=min_spiffs,UploadSpeed=921600,DebugLevel=none,EraseFlash=none
         platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
-        arduino-platform: esp32:esp32@2.0.17
+        arduino-platform: esp32:esp32@3.0.3
         required-libraries: Adafruit GFX Library,Arduino_JSON,DS3232RTC,NTPClient,Rtc_Pcf8563,GxEPD2,WiFiManager
         set-build-path: true
     - uses: actions/upload-artifact@v3

.github/workflows/main.actions.yml

@@ -16,7 +16,7 @@ jobs:
       with:
         arduino-board-fqbn: esp32:esp32:watchy:Revision=${{ matrix.board-revisions }},PartitionScheme=huge_app,UploadSpeed=921600,DebugLevel=none,EraseFlash=none
         platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
-        arduino-platform: esp32:esp32@2.0.17
+        arduino-platform: esp32:esp32@3.0.3
         required-libraries: Adafruit GFX Library,Arduino_JSON,DS3232RTC,NTPClient,Rtc_Pcf8563,GxEPD2,WiFiManager
         set-build-path: true
     - name: Rename binaries with board revision

.github/workflows/test.actions.yml

@@ -1,28 +0,0 @@
-name: Build Example Watchfaces
-on:
-  push:
-    branches:
-      - "dev"
-  pull_request:
-    branches:
-      - "dev"
-jobs:
-  build:
-    name: Build Example Watchfaces
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-    - uses: ArminJo/arduino-test-compile@v3
-      with:
-        arduino-board-fqbn: espressif32:esp32:esp32:Revision=v20,PartitionScheme=min_spiffs,UploadSpeed=921600,DebugLevel=none,EraseFlash=none
-        platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
-        arduino-platform: espressif32:esp32:esp32
-        required-libraries: Adafruit GFX Library,Arduino_JSON,DS3232RTC,NTPClient,Rtc_Pcf8563,GxEPD2,WiFiManager
-        set-build-path: true
-    - uses: actions/upload-artifact@v3
-      with:
-        name: binaries
-        path: ${{ github.workspace }}/examples/WatchFaces/**/build/*.bin
-    - uses: actions/download-artifact@v3
-    - name: Display structure of downloaded files
-      run: ls -R

.github/workflows/v3.actions.yml

@@ -16,7 +16,7 @@ jobs:
       with:
         arduino-board-fqbn: esp32:esp32:esp32s3:FlashSize=8M,PartitionScheme=default_8MB,UploadSpeed=921600,DebugLevel=none,EraseFlash=none
         platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
-        arduino-platform: esp32:esp32@2.0.17
+        arduino-platform: esp32:esp32@3.0.3
         required-libraries: Adafruit GFX Library,Arduino_JSON,DS3232RTC,NTPClient,Rtc_Pcf8563,GxEPD2,WiFiManager
         set-build-path: true
     - name: Rename binaries with board revision

platformio.ini

@@ -13,20 +13,14 @@
 platform = espressif32@6.7.0
 framework = arduino
 ;CDC enabled on boot:
-build_flags =  -DCDC_ENABLED -DJTAG_ENABLED -DMSC_ENABLED
+build_flags = -DCDC_ENABLED
 ;erase flash before upload:
 ;upload_flags = --erase-all
 ;upload speed:
 upload_speed = 115200
-;build mode debug
-build_type = debug
 ;upload port (put yours here):
-;upload_port = COM7                     ;for windows
-;monitor_port = COM7                    ;for windows
-;upload_port = /dev/ttyACM0             ;for linux
-;monitor_port = /dev/ttyACM0            ;for linux
-;upload_port = /dev/cu.usbserial-0001   ;for mac
-;monitor_port = /dev/cu.usbserial-0001  ;for mac
+upload_port = COM7
+;upload_port = /dev/ttyACM0 for linux
 board_build.partitions = default_8MB.csv
 monitor_speed = 115200
 lib_deps = 
@@ -39,26 +33,15 @@ lib_deps =
     https://github.com/tzapu/WiFiManager.git#master
 
 
-[env:v3_0]
+[env:esp32-s3-devkitc-1]
 ; This is for v3
 extends = env:base
 board = esp32-s3-devkitc-1
-build_flags = -DARDUINO_ESP32S3_DEV
+board_build.mcu = esp32s3
+framework = arduino
 
-[env:v2_0]
-; This is for v3
+[env:esp32-pico-devkitm-2]
+; This is for v1, v1.5, v2
 extends = env:base
-board = watchy
-build_flags = -DARDUINO_WATCHY_V20
-
-[env:v1_5]
-; This is for v3
-extends = env:base
-board = watchy
-build_flags = -DARDUINO_WATCHY_V15
-
-[env:v1_0]
-; This is for v3
-extends = env:base
-board = watchy
-build_flags = -DARDUINO_WATCHY_V10
+board = esp32-pico-devkitm-2
+framework = arduino