Compare commits

...

8 Commits

Author SHA1 Message Date
GitHub Actions
ae87f025a3 Bump version to 2024.12.13 [skip-versioning] 2024-12-23 23:28:41 +00:00
Edward Firmo
303a3f1267 Merge pull request #64 from edwardtfn/speaker-with-ble-proxy
Add speaker to BLE Proxy add-on
2024-12-24 00:28:31 +01:00
Edward Firmo
a716e8e9cf Change media player fmt to msb 2024-12-24 00:22:52 +01:00
Edward Firmo
d77d761497 Add speaker to BLE Proxy add-on 2024-12-24 00:00:26 +01:00
GitHub Actions
ec528ec128 Bump version to 2024.12.12 [skip-versioning] 2024-12-23 17:52:46 +00:00
Edward Firmo
4ed98e533f Merge pull request #62 from edwardtfn/test-only-on-pull
Run test only on pull request or push to main
2024-12-23 18:52:35 +01:00
Edward Firmo
1ef73d5cd0 Remove paths-ignore 2024-12-23 18:49:50 +01:00
Edward Firmo
420225b6ba Run test only on pull request or push to main 2024-12-23 18:47:41 +01:00
7 changed files with 74 additions and 10 deletions

View File

@@ -1,8 +1,7 @@
--- ---
name: Validate ESPHome name: Validate ESPHome (Latest)
# yamllint disable-line rule:truthy on: # yamllint disable-line rule:truthy
on:
workflow_dispatch: workflow_dispatch:
concurrency: concurrency:
@@ -37,6 +36,7 @@ jobs:
uses: esphome/build-action@main uses: esphome/build-action@main
with: with:
yaml-file: ".test/esphome_ard_basic.yaml" yaml-file: ".test/esphome_ard_basic.yaml"
version: latest
build_bluetooth_proxy_4: build_bluetooth_proxy_4:
name: Bluetooth Proxy (IDF) name: Bluetooth Proxy (IDF)
@@ -47,6 +47,7 @@ jobs:
uses: esphome/build-action@main uses: esphome/build-action@main
with: with:
yaml-file: ".test/esphome_idf_bluetooth_proxy.yaml" yaml-file: ".test/esphome_idf_bluetooth_proxy.yaml"
version: latest
build_bluetooth_proxy_53: build_bluetooth_proxy_53:
name: Bluetooth Proxy (IDF v5.3) name: Bluetooth Proxy (IDF v5.3)
@@ -57,4 +58,5 @@ jobs:
uses: esphome/build-action@main uses: esphome/build-action@main
with: with:
yaml-file: ".test/esphome_idf53_bluetooth_proxy.yaml" yaml-file: ".test/esphome_idf53_bluetooth_proxy.yaml"
version: latest
... ...

View File

@@ -11,6 +11,8 @@ on: # yamllint disable-line rule:truthy
- "*.c" - "*.c"
- "*.cpp" - "*.cpp"
- "*.py" - "*.py"
branches:
- main
pull_request: pull_request:
paths: paths:
- "*.yaml" - "*.yaml"

View File

@@ -11,6 +11,27 @@
##### - For normal system use, modifications to this file are NOT required. ##### ##### - For normal system use, modifications to this file are NOT required. #####
#################################################################################################### ####################################################################################################
--- ---
substitutions:
# RTTTL format: name:d=duration,o=octave,b=tempo:notes
# d=32 (32nd note), o=5 (octave 5), b=100 (tempo 100)
tone_volume_change: "scale_up:d=32,o=5,b=100:c,c#,d#,e,f#,g#,a#,b" # Use "none" to disable sound
api:
actions:
- action: rtttl_play
variables:
# The RTTTL string for the melody to be played.
# It should follow the RTTTL format, including the melody's name,
# default settings, and a sequence of notes.
tone: string
then:
- lambda: |-
rtttl_speaker->stop();
if (rtttl_speaker_gain->state > 0) {
ESP_LOGI("api", "Play tone: '%s'", tone.c_str());
rtttl_speaker->play(tone.c_str());
}
bluetooth_proxy: bluetooth_proxy:
esp32: esp32:
@@ -33,17 +54,54 @@ esphome:
build_flags: build_flags:
- -D TX_ULTIMATE_EASY_ADDON_BLE_PROXY - -D TX_ULTIMATE_EASY_ADDON_BLE_PROXY
i2s_audio: !remove
light: light:
- id: !extend light_full - id: !extend light_full
platform: esp32_rmt_led_strip platform: esp32_rmt_led_strip
rgb_order: GRB rgb_order: GRB
rmt_channel: 0 rmt_channel: 1
chipset: ws2812 chipset: ws2812
type: !remove type: !remove
variant: !remove variant: !remove
max_refresh_rate: 33ms max_refresh_rate: 33ms
use_psram: true
media_player: !remove media_player: !remove
number:
- id: rtttl_speaker_gain
name: Sound - Volume
platform: template
max_value: 100
min_value: 0
step: 1
initial_value: 100
unit_of_measurement: "%"
internal: false
disabled_by_default: true
entity_category: config
device_class: sound_pressure
restore_value: true
optimistic: true
set_action:
then:
- lambda: |-
rtttl_speaker->set_gain((100-(x/10.0f))/100.0f);
std::string tone_volume_change = "${tone_volume_change}";
// Play sound if tone_volume_change is not "none"
if (x > 0 and !tone_volume_change.empty() and tone_volume_change != "none")
rtttl_speaker->play(tone_volume_change);
rtttl_speaker->dump_config();
rtttl:
- id: rtttl_speaker
speaker: mp_speaker
speaker:
- id: mp_speaker
platform: i2s_audio
dac_type: external
i2s_dout_pin: GPIO15
i2s_audio_id: if_i2s_audio
i2s_comm_fmt: stand_msb
channel: mono
... ...

View File

@@ -85,6 +85,8 @@ ota:
platform: esphome platform: esphome
psram: psram:
mode: octal
speed: 40MHz
script: script:
- id: api_send_ha_event_boot - id: api_send_ha_event_boot

View File

@@ -19,11 +19,11 @@ i2s_audio:
media_player: media_player:
- id: mp_speaker - id: mp_speaker
name: Speaker name: Speaker
internal: false
platform: i2s_audio platform: i2s_audio
i2s_dout_pin: GPIO15 i2s_dout_pin: GPIO15
i2s_audio_id: if_i2s_audio i2s_audio_id: if_i2s_audio
i2s_comm_fmt: lsb i2s_comm_fmt: msb # Experimental - It was 'lsb' until v2024.12.12
dac_type: external dac_type: external
mode: mono mode: mono
internal: false
... ...

View File

@@ -1 +1 @@
2024.12.11 2024.12.13

View File

@@ -1 +1 @@
version: 2024.12.11 version: 2024.12.13