Skip to content

Commit f5a065b

Browse files
authored
Merge branch 'main' into s3-box-simple-media-player
2 parents 5a05703 + 56aeca3 commit f5a065b

File tree

5 files changed

+49
-41
lines changed

5 files changed

+49
-41
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313
jobs:
1414
build-firmware:
1515
name: Build Firmware
16-
uses: esphome/workflows/.github/workflows/build.yml@2024.12.0
16+
uses: esphome/workflows/.github/workflows/build.yml@2025.1.0
1717
with:
1818
files: |
1919
esp32-s3-box/esp32-s3-box.factory.yaml
@@ -30,15 +30,15 @@ jobs:
3030
name: Upload to R2
3131
needs:
3232
- build-firmware
33-
uses: esphome/workflows/.github/workflows/upload-to-r2.yml@2024.12.0
33+
uses: esphome/workflows/.github/workflows/upload-to-r2.yml@2025.1.0
3434
with:
3535
directory: wake-word-voice-assistant
3636
secrets: inherit
3737

3838
upload-to-release:
3939
name: Upload to Release
4040
if: github.event_name == 'release'
41-
uses: esphome/workflows/.github/workflows/upload-to-gh-release.yml@2024.12.0
41+
uses: esphome/workflows/.github/workflows/upload-to-gh-release.yml@2025.1.0
4242
needs:
4343
- build-firmware
4444
with:
@@ -47,7 +47,7 @@ jobs:
4747
promote-beta:
4848
name: Promote to Beta
4949
if: github.event_name == 'release'
50-
uses: esphome/workflows/.github/workflows/promote-r2.yml@2024.12.0
50+
uses: esphome/workflows/.github/workflows/promote-r2.yml@2025.1.0
5151
needs:
5252
- upload-to-r2
5353
with:
@@ -60,7 +60,7 @@ jobs:
6060
promote-prod:
6161
name: Promote to Production
6262
if: github.event_name == 'release' && github.event.release.prerelease == false
63-
uses: esphome/workflows/.github/workflows/promote-r2.yml@2024.12.0
63+
uses: esphome/workflows/.github/workflows/promote-r2.yml@2025.1.0
6464
needs:
6565
- upload-to-r2
6666
with:

esp32-s3-box-3/esp32-s3-box-3.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ esp32:
5555
flash_size: 16MB
5656
framework:
5757
type: esp-idf
58+
version: 4.4.8
59+
platform_version: 5.4.0
5860
sdkconfig_options:
5961
CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240: "y"
6062
CONFIG_ESP32S3_DATA_CACHE_64KB: "y"

esp32-s3-box-lite/esp32-s3-box-lite.yaml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ esp32:
5757
flash_size: 16MB
5858
framework:
5959
type: esp-idf
60+
version: 4.4.8
61+
platform_version: 5.4.0
6062
sdkconfig_options:
6163
CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240: "y"
6264
CONFIG_ESP32S3_DATA_CACHE_64KB: "y"
@@ -636,48 +638,48 @@ image:
636638
- file: ${error_illustration_file}
637639
id: casita_error
638640
resize: 320x240
639-
type: RGB24
640-
use_transparency: true
641+
type: RGB
642+
transparency: alpha_channel
641643
- file: ${idle_illustration_file}
642644
id: casita_idle
643645
resize: 320x240
644-
type: RGB24
645-
use_transparency: true
646+
type: RGB
647+
transparency: alpha_channel
646648
- file: ${listening_illustration_file}
647649
id: casita_listening
648650
resize: 320x240
649-
type: RGB24
650-
use_transparency: true
651+
type: RGB
652+
transparency: alpha_channel
651653
- file: ${thinking_illustration_file}
652654
id: casita_thinking
653655
resize: 320x240
654-
type: RGB24
655-
use_transparency: true
656+
type: RGB
657+
transparency: alpha_channel
656658
- file: ${replying_illustration_file}
657659
id: casita_replying
658660
resize: 320x240
659-
type: RGB24
660-
use_transparency: true
661+
type: RGB
662+
transparency: alpha_channel
661663
- file: ${timer_finished_illustration_file}
662664
id: casita_timer_finished
663665
resize: 320x240
664-
type: RGB24
665-
use_transparency: true
666+
type: RGB
667+
transparency: alpha_channel
666668
- file: ${loading_illustration_file}
667669
id: casita_initializing
668670
resize: 320x240
669-
type: RGB24
670-
use_transparency: true
671+
type: RGB
672+
transparency: alpha_channel
671673
- file: https://github.com/esphome/wake-word-voice-assistants/raw/main/error_box_illustrations/error-no-wifi.png
672674
id: error_no_wifi
673675
resize: 320x240
674-
type: RGB24
675-
use_transparency: true
676+
type: RGB
677+
transparency: alpha_channel
676678
- file: https://github.com/esphome/wake-word-voice-assistants/raw/main/error_box_illustrations/error-no-ha.png
677679
id: error_no_ha
678680
resize: 320x240
679-
type: RGB24
680-
use_transparency: true
681+
type: RGB
682+
transparency: alpha_channel
681683

682684
font:
683685
- file:

esp32-s3-box/esp32-s3-box.yaml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ esp32:
5757
flash_size: 16MB
5858
framework:
5959
type: esp-idf
60+
version: 4.4.8
61+
platform_version: 5.4.0
6062
sdkconfig_options:
6163
CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240: "y"
6264
CONFIG_ESP32S3_DATA_CACHE_64KB: "y"
@@ -564,48 +566,48 @@ image:
564566
- file: ${error_illustration_file}
565567
id: casita_error
566568
resize: 320x240
567-
type: RGB24
568-
use_transparency: true
569+
type: RGB
570+
transparency: alpha_channel
569571
- file: ${idle_illustration_file}
570572
id: casita_idle
571573
resize: 320x240
572-
type: RGB24
573-
use_transparency: true
574+
type: RGB
575+
transparency: alpha_channel
574576
- file: ${listening_illustration_file}
575577
id: casita_listening
576578
resize: 320x240
577-
type: RGB24
578-
use_transparency: true
579+
type: RGB
580+
transparency: alpha_channel
579581
- file: ${thinking_illustration_file}
580582
id: casita_thinking
581583
resize: 320x240
582-
type: RGB24
583-
use_transparency: true
584+
type: RGB
585+
transparency: alpha_channel
584586
- file: ${replying_illustration_file}
585587
id: casita_replying
586588
resize: 320x240
587-
type: RGB24
588-
use_transparency: true
589+
type: RGB
590+
transparency: alpha_channel
589591
- file: ${timer_finished_illustration_file}
590592
id: casita_timer_finished
591593
resize: 320x240
592-
type: RGB24
593-
use_transparency: true
594+
type: RGB
595+
transparency: alpha_channel
594596
- file: ${loading_illustration_file}
595597
id: casita_initializing
596598
resize: 320x240
597-
type: RGB24
598-
use_transparency: true
599+
type: RGB
600+
transparency: alpha_channel
599601
- file: https://github.com/esphome/wake-word-voice-assistants/raw/main/error_box_illustrations/error-no-wifi.png
600602
id: error_no_wifi
601603
resize: 320x240
602-
type: RGB24
603-
use_transparency: true
604+
type: RGB
605+
transparency: alpha_channel
604606
- file: https://github.com/esphome/wake-word-voice-assistants/raw/main/error_box_illustrations/error-no-ha.png
605607
id: error_no_ha
606608
resize: 320x240
607-
type: RGB24
608-
use_transparency: true
609+
type: RGB
610+
transparency: alpha_channel
609611

610612
font:
611613
- file:

m5stack-atom-echo/m5stack-atom-echo.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ esp32:
1313
board: m5stack-atom
1414
framework:
1515
type: esp-idf
16+
version: 4.4.8
17+
platform_version: 5.4.0
1618

1719
logger:
1820
api:

0 commit comments

Comments
 (0)