From 5c2b740dea83e6001aac5e8fde4fa1aaa25f460b Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 14:14:02 +1300 Subject: [PATCH 01/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 0ed25612..59e30ece 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -25,8 +25,7 @@ substitutions: voice_assist_muted_phase_id: "12" # These unqiue characters have been extracted from every test file of every language available on https://github.com/home-assistant/intents (14 March 2024) - allowed_characters: " !#%""'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？" - + allowed_characters: ' !#%"''()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？' micro_wake_word_model: okay_nabu starting_up: "Starting up..." From 01fdb6ce147ac18580dde8008a029a5a7c68f373 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 14:18:47 +1300 Subject: [PATCH 02/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 59e30ece..5a078d95 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -469,7 +469,7 @@ switch: on_turn_on: - script.execute: draw_display -- platform: template + - platform: template name: Display text id: display_text optimistic: true From b2c954b6d3cb3b276b1a288599adec3c53a06bb4 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 14:19:55 +1300 Subject: [PATCH 03/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 5a078d95..c7b77d76 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -25,7 +25,7 @@ substitutions: voice_assist_muted_phase_id: "12" # These unqiue characters have been extracted from every test file of every language available on https://github.com/home-assistant/intents (14 March 2024) - allowed_characters: ' !#%"''()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？' + allowed_characters: " !#%""'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？" micro_wake_word_model: okay_nabu starting_up: "Starting up..." From 92a35cdc1b7321c9edb62c4f930c955fc233af4a Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 14:23:32 +1300 Subject: [PATCH 04/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index c7b77d76..dcbd0e6f 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -25,7 +25,8 @@ substitutions: voice_assist_muted_phase_id: "12" # These unqiue characters have been extracted from every test file of every language available on https://github.com/home-assistant/intents (14 March 2024) - allowed_characters: " !#%""'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？" + allowed_characters: " !#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？" + micro_wake_word_model: okay_nabu starting_up: "Starting up..." From 1aa32af98b94da11dd0af347d85db93ee34db5ca Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 14:26:29 +1300 Subject: [PATCH 05/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index dcbd0e6f..b5e94486 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -25,7 +25,7 @@ substitutions: voice_assist_muted_phase_id: "12" # These unqiue characters have been extracted from every test file of every language available on https://github.com/home-assistant/intents (14 March 2024) - allowed_characters: " !#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？" + allowed_characters: ' !#%"''()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？' micro_wake_word_model: okay_nabu From 5f3c27da910b12d3c923ec372b7a61226129342d Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 14:54:41 +1300 Subject: [PATCH 06/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index b5e94486..46b1850b 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -25,7 +25,7 @@ substitutions: voice_assist_muted_phase_id: "12" # These unqiue characters have been extracted from every test file of every language available on https://github.com/home-assistant/intents (14 March 2024) - allowed_characters: ' !#%"''()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？' + allowed_characters: " !#%\\\"'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？" micro_wake_word_model: okay_nabu From 19869de9ddd9a1e08a1871e3ebbb1ea88341864c Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 15:07:09 +1300 Subject: [PATCH 07/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 46b1850b..bbbf7232 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -25,7 +25,7 @@ substitutions: voice_assist_muted_phase_id: "12" # These unqiue characters have been extracted from every test file of every language available on https://github.com/home-assistant/intents (14 March 2024) - allowed_characters: " !#%\\\"'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？" + allowed_characters: " !#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}，？" micro_wake_word_model: okay_nabu @@ -698,7 +698,8 @@ font: type: gfonts family: Figtree weight: 300 - glyphs: ${allowed_characters} + glyphs: + '&@!"''%()+=,-_.:°/$€£¥?0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz' id: font_text size: 15 - file: From 70d93eaa38c3d424b5fe9223e251d7be9489677c Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 15:09:40 +1300 Subject: [PATCH 08/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index bbbf7232..8f259ebf 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -25,7 +25,7 @@ substitutions: voice_assist_muted_phase_id: "12" # These unqiue characters have been extracted from every test file of every language available on https://github.com/home-assistant/intents (14 March 2024) - allowed_characters: " !#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}，？" + allowed_characters: " !"#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}，？" micro_wake_word_model: okay_nabu From 4c8dccef7b46aca4c58b2e8fc0c205e2fb795df0 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 15:11:06 +1300 Subject: [PATCH 09/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 8f259ebf..d8060923 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -25,7 +25,7 @@ substitutions: voice_assist_muted_phase_id: "12" # These unqiue characters have been extracted from every test file of every language available on https://github.com/home-assistant/intents (14 March 2024) - allowed_characters: " !"#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}，？" + allowed_characters: " !""#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}，？" micro_wake_word_model: okay_nabu From 7c63d53a749171004acd6549af2ca7d51ac05b77 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 15:11:43 +1300 Subject: [PATCH 10/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index d8060923..ffca4a11 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -25,7 +25,7 @@ substitutions: voice_assist_muted_phase_id: "12" # These unqiue characters have been extracted from every test file of every language available on https://github.com/home-assistant/intents (14 March 2024) - allowed_characters: " !""#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}，？" + allowed_characters: " !"""#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}，？" micro_wake_word_model: okay_nabu From 45955c419a740334e01f5a36d13efdbc4365b980 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 15:12:31 +1300 Subject: [PATCH 11/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index ffca4a11..7571f170 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -25,7 +25,7 @@ substitutions: voice_assist_muted_phase_id: "12" # These unqiue characters have been extracted from every test file of every language available on https://github.com/home-assistant/intents (14 March 2024) - allowed_characters: " !"""#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}，？" + allowed_characters: " !\"#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}，？" micro_wake_word_model: okay_nabu From a0d846a0b129f79819715296f7dd3e4387e81e61 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 15:41:37 +1300 Subject: [PATCH 12/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 7571f170..5cab68b6 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -701,7 +701,7 @@ font: glyphs: '&@!"''%()+=,-_.:°/$€£¥?0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz' id: font_text - size: 15 + size: 16 - file: type: gfonts family: Figtree From 261506b174b6f4e6fe9b52717e3e848a575c423b Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 15:44:47 +1300 Subject: [PATCH 13/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 5cab68b6..8de3a9b2 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -696,10 +696,9 @@ image: font: - file: type: gfonts - family: Figtree + family: Roboto weight: 300 - glyphs: - '&@!"''%()+=,-_.:°/$€£¥?0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz' + glyphs: ${allowed_characters} id: font_text size: 16 - file: From e0cf43ca74b5c79ef0f516e5f5f66559d79a8ab9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 16:04:26 +1300 Subject: [PATCH 14/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 8de3a9b2..622d1120 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -795,7 +795,10 @@ display: it.fill(id(idle_color)); it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_idle), ImageAlign::CENTER); if ( id(display_text).state ) { - it.print( 10, 10, id(font_text), Color::WHITE, "${wake_word_prompt}" ); + auto width = id(my_font).get_string_width("${wake_word_prompt}"); // Estimate the width + it.filled_rectangle(20 , 20 , width + 20 , 30 , Color::BLACK ); + it.rectangle(20 , 20 , 280 , 30 , Color::WHITE ); + it.print( 30, 25, id(font_text), Color::WHITE, "${wake_word_prompt}" ); } if ( std::string(id(date_format_string).c_str()) != "" or std::string(id(time_format_string).c_str()) != "" ) { From d18dfa90285a358b6da26a1db903e621ec185954 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 16:06:35 +1300 Subject: [PATCH 15/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 622d1120..ddb77b1a 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -795,7 +795,7 @@ display: it.fill(id(idle_color)); it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_idle), ImageAlign::CENTER); if ( id(display_text).state ) { - auto width = id(my_font).get_string_width("${wake_word_prompt}"); // Estimate the width + auto width = id(font_text).get_string_width("${wake_word_prompt}"); // Estimate the width it.filled_rectangle(20 , 20 , width + 20 , 30 , Color::BLACK ); it.rectangle(20 , 20 , 280 , 30 , Color::WHITE ); it.print( 30, 25, id(font_text), Color::WHITE, "${wake_word_prompt}" ); From 4347cfbedfc921b03421805a2babc976fee22b7e Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 16:15:19 +1300 Subject: [PATCH 16/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index ddb77b1a..2d29a7fb 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -795,7 +795,12 @@ display: it.fill(id(idle_color)); it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_idle), ImageAlign::CENTER); if ( id(display_text).state ) { - auto width = id(font_text).get_string_width("${wake_word_prompt}"); // Estimate the width + + auto font = id(font_text).get_font(); + int16_t x1, y1, x2, y2; + gfx::glyph_bounds(font, "${wake_word_prompt}", &x1, &y1, &x2, &y2); + int width = x2 - x1 + 1; // Estimate the width + it.filled_rectangle(20 , 20 , width + 20 , 30 , Color::BLACK ); it.rectangle(20 , 20 , 280 , 30 , Color::WHITE ); it.print( 30, 25, id(font_text), Color::WHITE, "${wake_word_prompt}" ); From 9125b74f01271ec7ef9b60dc6a6b4599dabbc197 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 16:21:06 +1300 Subject: [PATCH 17/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 2d29a7fb..f910eb7a 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -795,11 +795,13 @@ display: it.fill(id(idle_color)); it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_idle), ImageAlign::CENTER); if ( id(display_text).state ) { - - auto font = id(font_text).get_font(); - int16_t x1, y1, x2, y2; - gfx::glyph_bounds(font, "${wake_word_prompt}", &x1, &y1, &x2, &y2); - int width = x2 - x1 + 1; // Estimate the width + + auto *font = &id(font_text); + std::string wake_word_prompt = "${wake_word_prompt}"; + int width = 0; + for (char c : wake_word_prompt) { + width += font->get_glyph_width(c); + } it.filled_rectangle(20 , 20 , width + 20 , 30 , Color::BLACK ); it.rectangle(20 , 20 , 280 , 30 , Color::WHITE ); From f9943bad91e8e6a4aebebfdbc50e63c17d1a16ad Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 16:39:47 +1300 Subject: [PATCH 18/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index f910eb7a..5fa53d8b 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -800,7 +800,8 @@ display: std::string wake_word_prompt = "${wake_word_prompt}"; int width = 0; for (char c : wake_word_prompt) { - width += font->get_glyph_width(c); + if (font->get_glyph(c) != nullptr) { + width += font->get_glyph(c)->width; } it.filled_rectangle(20 , 20 , width + 20 , 30 , Color::BLACK ); From 11508d86f483ee3c91ec515d0716ce80b04d8266 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 16:52:23 +1300 Subject: [PATCH 19/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 46 +++++++++++++++---- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 5fa53d8b..3d0434ff 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -796,17 +796,43 @@ display: it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_idle), ImageAlign::CENTER); if ( id(display_text).state ) { - auto *font = &id(font_text); - std::string wake_word_prompt = "${wake_word_prompt}"; - int width = 0; - for (char c : wake_word_prompt) { - if (font->get_glyph(c) != nullptr) { - width += font->get_glyph(c)->width; - } + + // Get the text bounds + auto text_bounds = id(font_text).get_text_bounds(${wake_word_prompt}); + + // Calculate the rectangle dimensions with a 5-pixel padding + int rect_width = text_bounds.width + 10; + int rect_height = text_bounds.height + 10; + + // Calculate the position to center the rectangle + int rect_x = (id(my_display).get_width() - rect_width) / 2; + int rect_y = (id(my_display).get_height() - rect_height) / 2; + + // Draw the black rectangle + id(my_display).filled_rectangle(rect_x, rect_y, rect_width, rect_height, COLOR_BLACK); + + // Draw the white outline + id(my_display).rectangle(rect_x, rect_y, rect_width, rect_height, COLOR_WHITE); + + // Calculate the position to center the text inside the rectangle + int text_x = rect_x + (rect_width - text_bounds.width) / 2; + int text_y = rect_y + (rect_height - text_bounds.height) / 2; + + // Print the text in white + id(my_display).print(${wake_word_prompt}, text_x, text_y, id(font_text), COLOR_WHITE); + + # auto *font = &id(font_text); + # std::string wake_word_prompt = "${wake_word_prompt}"; + # int width = 0; + # for (char c : wake_word_prompt) { + # if (font->get_glyph(c) != nullptr) { + # width += font->get_glyph(c)->width; + # } + # } - it.filled_rectangle(20 , 20 , width + 20 , 30 , Color::BLACK ); - it.rectangle(20 , 20 , 280 , 30 , Color::WHITE ); - it.print( 30, 25, id(font_text), Color::WHITE, "${wake_word_prompt}" ); + # it.filled_rectangle(20 , 20 , width + 20 , 30 , Color::BLACK ); + # it.rectangle(20 , 20 , 280 , 30 , Color::WHITE ); + # it.print( 30, 25, id(font_text), Color::WHITE, "${wake_word_prompt}" ); } if ( std::string(id(date_format_string).c_str()) != "" or std::string(id(time_format_string).c_str()) != "" ) { From 5474921b70598bcda513b9db7222c35feca2fa8f Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 16:56:00 +1300 Subject: [PATCH 20/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 3d0434ff..3d60e7e1 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -805,21 +805,21 @@ display: int rect_height = text_bounds.height + 10; // Calculate the position to center the rectangle - int rect_x = (id(my_display).get_width() - rect_width) / 2; - int rect_y = (id(my_display).get_height() - rect_height) / 2; + int rect_x = (it.get_width() - rect_width) / 2; + int rect_y = (it.get_height() - rect_height) / 2; // Draw the black rectangle - id(my_display).filled_rectangle(rect_x, rect_y, rect_width, rect_height, COLOR_BLACK); + it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, COLOR_BLACK); // Draw the white outline - id(my_display).rectangle(rect_x, rect_y, rect_width, rect_height, COLOR_WHITE); + it.rectangle(rect_x, rect_y, rect_width, rect_height, COLOR_WHITE); // Calculate the position to center the text inside the rectangle int text_x = rect_x + (rect_width - text_bounds.width) / 2; int text_y = rect_y + (rect_height - text_bounds.height) / 2; // Print the text in white - id(my_display).print(${wake_word_prompt}, text_x, text_y, id(font_text), COLOR_WHITE); + it.print(${wake_word_prompt}, text_x, text_y, id(font_text), COLOR_WHITE); # auto *font = &id(font_text); # std::string wake_word_prompt = "${wake_word_prompt}"; From 6228e96a27d4e2c46e9fd0badb465fd096b3576d Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 16:57:41 +1300 Subject: [PATCH 21/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 3d60e7e1..99fb1f5c 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -798,7 +798,7 @@ display: // Get the text bounds - auto text_bounds = id(font_text).get_text_bounds(${wake_word_prompt}); + auto text_bounds = id(font_text).get_text_bounds("${wake_word_prompt}"); // Calculate the rectangle dimensions with a 5-pixel padding int rect_width = text_bounds.width + 10; @@ -819,7 +819,7 @@ display: int text_y = rect_y + (rect_height - text_bounds.height) / 2; // Print the text in white - it.print(${wake_word_prompt}, text_x, text_y, id(font_text), COLOR_WHITE); + it.print("${wake_word_prompt}", text_x, text_y, id(font_text), COLOR_WHITE); # auto *font = &id(font_text); # std::string wake_word_prompt = "${wake_word_prompt}"; From 7b2c6a7f5f095a8c2f946bc5bb481735c686b2c4 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 17:00:33 +1300 Subject: [PATCH 22/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 99fb1f5c..c9428b13 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -809,30 +809,21 @@ display: int rect_y = (it.get_height() - rect_height) / 2; // Draw the black rectangle - it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, COLOR_BLACK); + it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); // Draw the white outline - it.rectangle(rect_x, rect_y, rect_width, rect_height, COLOR_WHITE); + it.rectangle(rect_x, rect_y, rect_width, rect_height, Color::WHITE); // Calculate the position to center the text inside the rectangle int text_x = rect_x + (rect_width - text_bounds.width) / 2; int text_y = rect_y + (rect_height - text_bounds.height) / 2; // Print the text in white - it.print("${wake_word_prompt}", text_x, text_y, id(font_text), COLOR_WHITE); + it.print( text_x, text_y, id(font_text), Color::WHITE, "${wake_word_prompt}" ); - # auto *font = &id(font_text); - # std::string wake_word_prompt = "${wake_word_prompt}"; - # int width = 0; - # for (char c : wake_word_prompt) { - # if (font->get_glyph(c) != nullptr) { - # width += font->get_glyph(c)->width; - # } - # } - - # it.filled_rectangle(20 , 20 , width + 20 , 30 , Color::BLACK ); - # it.rectangle(20 , 20 , 280 , 30 , Color::WHITE ); - # it.print( 30, 25, id(font_text), Color::WHITE, "${wake_word_prompt}" ); + // it.filled_rectangle(20 , 20 , width + 20 , 30 , Color::BLACK ); + // it.rectangle(20 , 20 , 280 , 30 , Color::WHITE ); + // it.print( 30, 25, id(font_text), Color::WHITE, "${wake_word_prompt}" ); } if ( std::string(id(date_format_string).c_str()) != "" or std::string(id(time_format_string).c_str()) != "" ) { From 300d27763cbb8ec7cbb86fe99dcd5da415cb3e20 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 17:08:01 +1300 Subject: [PATCH 23/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index c9428b13..058333ad 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -796,27 +796,27 @@ display: it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_idle), ImageAlign::CENTER); if ( id(display_text).state ) { - - // Get the text bounds - auto text_bounds = id(font_text).get_text_bounds("${wake_word_prompt}"); - + // Estimate the text width based on the font size and number of characters + int text_width = id(font_text).get_width(' ') * (strlen(${wake_word_prompt})); + int text_height = id(font_text).get_height(); + // Calculate the rectangle dimensions with a 5-pixel padding - int rect_width = text_bounds.width + 10; - int rect_height = text_bounds.height + 10; - + int rect_width = text_width + 10; + int rect_height = text_height + 10; + // Calculate the position to center the rectangle int rect_x = (it.get_width() - rect_width) / 2; int rect_y = (it.get_height() - rect_height) / 2; - + // Draw the black rectangle - it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); - + it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, COLOR_BLACK); + // Draw the white outline - it.rectangle(rect_x, rect_y, rect_width, rect_height, Color::WHITE); - + it.rectangle(rect_x, rect_y, rect_width, rect_height, COLOR_WHITE); + // Calculate the position to center the text inside the rectangle - int text_x = rect_x + (rect_width - text_bounds.width) / 2; - int text_y = rect_y + (rect_height - text_bounds.height) / 2; + int text_x = rect_x + (rect_width - text_width) / 2; + int text_y = rect_y + (rect_height - text_height) / 2; // Print the text in white it.print( text_x, text_y, id(font_text), Color::WHITE, "${wake_word_prompt}" ); From 09652b7fa4998796cad9d3c78c1129fe208c5967 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 17:10:54 +1300 Subject: [PATCH 24/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 058333ad..fda16134 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -797,7 +797,7 @@ display: if ( id(display_text).state ) { // Estimate the text width based on the font size and number of characters - int text_width = id(font_text).get_width(' ') * (strlen(${wake_word_prompt})); + int text_width = id(font_text).get_width(' ') * (strlen("${wake_word_prompt}")); int text_height = id(font_text).get_height(); // Calculate the rectangle dimensions with a 5-pixel padding @@ -809,10 +809,10 @@ display: int rect_y = (it.get_height() - rect_height) / 2; // Draw the black rectangle - it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, COLOR_BLACK); + it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); // Draw the white outline - it.rectangle(rect_x, rect_y, rect_width, rect_height, COLOR_WHITE); + it.rectangle(rect_x, rect_y, rect_width, rect_height, Color::WHITE); // Calculate the position to center the text inside the rectangle int text_x = rect_x + (rect_width - text_width) / 2; From 0c4a23b6a55bdc1d13757c9d3aeed0683100ee4b Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 17:54:51 +1300 Subject: [PATCH 25/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index fda16134..25b18abe 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -796,8 +796,24 @@ display: it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_idle), ImageAlign::CENTER); if ( id(display_text).state ) { + int GetTextBounds(esphome::display::Display* it, esphome::font::Font *font, const char *buffer) { + int x1 = 0; + int y1 = 0; + int width = 0; + int height = 0; + it->get_text_bounds(0, 0, buffer, font, TextAlign::TOP_LEFT, &x1, &y1, &width, &height); + return width; + } + + int GetTextWidth(esphome::display::Display* it, esphome::font::Font *font, const char* text) { + return GetTextBounds(it, font, text); + } + + // Example usage + int text_width = GetTextWidth(&it, id(my_font), "${wake_word_prompt}"); + // Estimate the text width based on the font size and number of characters - int text_width = id(font_text).get_width(' ') * (strlen("${wake_word_prompt}")); + // int text_width = id(font_text).get_width(' ') * (strlen("${wake_word_prompt}")); int text_height = id(font_text).get_height(); // Calculate the rectangle dimensions with a 5-pixel padding From b77a8335ed6c53e43e64c921ad117bde53e1e981 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 17:56:00 +1300 Subject: [PATCH 26/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 25b18abe..2ca4eb57 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -810,7 +810,7 @@ display: } // Example usage - int text_width = GetTextWidth(&it, id(my_font), "${wake_word_prompt}"); + int text_width = GetTextWidth(&it, id(font_text), "${wake_word_prompt}"); // Estimate the text width based on the font size and number of characters // int text_width = id(font_text).get_width(' ') * (strlen("${wake_word_prompt}")); From ef29da73cae651280c0394c6f71326914310b486 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 18:01:56 +1300 Subject: [PATCH 27/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 2ca4eb57..f0a16a66 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -796,21 +796,17 @@ display: it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_idle), ImageAlign::CENTER); if ( id(display_text).state ) { - int GetTextBounds(esphome::display::Display* it, esphome::font::Font *font, const char *buffer) { - int x1 = 0; - int y1 = 0; - int width = 0; - int height = 0; - it->get_text_bounds(0, 0, buffer, font, TextAlign::TOP_LEFT, &x1, &y1, &width, &height); - return width; - } + esphome::Font *font = &id(font_text); + const char *text = "${wake_word_prompt}"; - int GetTextWidth(esphome::display::Display* it, esphome::font::Font *font, const char* text) { - return GetTextBounds(it, font, text); - } + int x1 = 0; + int y1 = 0; + int width = 0; + int height = 0; + it.get_text_bounds(0, 0, text, font, TextAlign::TOP_LEFT, &x1, &y1, &width, &height); - // Example usage - int text_width = GetTextWidth(&it, id(font_text), "${wake_word_prompt}"); + // Use the calculated width value + int text_width = width; // Estimate the text width based on the font size and number of characters // int text_width = id(font_text).get_width(' ') * (strlen("${wake_word_prompt}")); From 332c23fe30e45ecffefc3d47ce3ea28c93bda945 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 18:04:03 +1300 Subject: [PATCH 28/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index f0a16a66..aec76ff3 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -796,7 +796,7 @@ display: it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_idle), ImageAlign::CENTER); if ( id(display_text).state ) { - esphome::Font *font = &id(font_text); + auto *font = &id(font_text); const char *text = "${wake_word_prompt}"; int x1 = 0; From f82e4e9fb32ec423252db4f2e619bc01b85b6373 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 18:18:45 +1300 Subject: [PATCH 29/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 35 ++++++------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index aec76ff3..8389ad71 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -796,39 +796,26 @@ display: it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_idle), ImageAlign::CENTER); if ( id(display_text).state ) { - auto *font = &id(font_text); - const char *text = "${wake_word_prompt}"; - - int x1 = 0; - int y1 = 0; - int width = 0; - int height = 0; - it.get_text_bounds(0, 0, text, font, TextAlign::TOP_LEFT, &x1, &y1, &width, &height); - - // Use the calculated width value - int text_width = width; - - // Estimate the text width based on the font size and number of characters - // int text_width = id(font_text).get_width(' ') * (strlen("${wake_word_prompt}")); - int text_height = id(font_text).get_height(); - + int x1, y1, width, height; + it.get_text_bounds(0, 0, "${wake_word_prompt}", id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &width, &height); + // Calculate the rectangle dimensions with a 5-pixel padding - int rect_width = text_width + 10; - int rect_height = text_height + 10; - + int rect_width = width + 10; + int rect_height = height + 10; + // Calculate the position to center the rectangle int rect_x = (it.get_width() - rect_width) / 2; int rect_y = (it.get_height() - rect_height) / 2; - + // Draw the black rectangle it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); - + // Draw the white outline it.rectangle(rect_x, rect_y, rect_width, rect_height, Color::WHITE); - + // Calculate the position to center the text inside the rectangle - int text_x = rect_x + (rect_width - text_width) / 2; - int text_y = rect_y + (rect_height - text_height) / 2; + int text_x = rect_x + (rect_width - width) / 2; + int text_y = rect_y + (rect_height - height) / 2; // Print the text in white it.print( text_x, text_y, id(font_text), Color::WHITE, "${wake_word_prompt}" ); From fb763fa77ef3fc6ab0d466fb2a0f35744edb51a5 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 18:44:20 +1300 Subject: [PATCH 30/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 53 +++++++++++-------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 8389ad71..9f525393 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -796,33 +796,25 @@ display: it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_idle), ImageAlign::CENTER); if ( id(display_text).state ) { - int x1, y1, width, height; - it.get_text_bounds(0, 0, "${wake_word_prompt}", id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &width, &height); + int x1, y1, text_width, text_height; + it.get_text_bounds(0, 0, "${wake_word_prompt}", id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); // Calculate the rectangle dimensions with a 5-pixel padding - int rect_width = width + 10; - int rect_height = height + 10; + int rect_width = text_width + 10; + int rect_height = text_height + 10; - // Calculate the position to center the rectangle - int rect_x = (it.get_width() - rect_width) / 2; - int rect_y = (it.get_height() - rect_height) / 2; + // Calculate the position to rectangle top-left + int rect_x = (it.get_width() - rect_width) / 2; // Centered + int rect_y = 15; // Margin from the top is 15 - // Draw the black rectangle - it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); - - // Draw the white outline - it.rectangle(rect_x, rect_y, rect_width, rect_height, Color::WHITE); + it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); // Draw the black rectangle + it.rectangle(rect_x, rect_y, rect_width, rect_height, Color::WHITE); // Draw the white outline // Calculate the position to center the text inside the rectangle - int text_x = rect_x + (rect_width - width) / 2; - int text_y = rect_y + (rect_height - height) / 2; + int text_x = rect_x + (rect_width - text_width) / 2; + int text_y = rect_y + 5; - // Print the text in white - it.print( text_x, text_y, id(font_text), Color::WHITE, "${wake_word_prompt}" ); - - // it.filled_rectangle(20 , 20 , width + 20 , 30 , Color::BLACK ); - // it.rectangle(20 , 20 , 280 , 30 , Color::WHITE ); - // it.print( 30, 25, id(font_text), Color::WHITE, "${wake_word_prompt}" ); + it.print( text_x, text_y, id(font_text), Color::WHITE, "${wake_word_prompt}" ); // Print the text in white } if ( std::string(id(date_format_string).c_str()) != "" or std::string(id(time_format_string).c_str()) != "" ) { @@ -848,7 +840,26 @@ display: pos = date_time_text.find(" 0", pos); // Find the next occurrence } } - it.printf( it.get_width() / 2, it.get_height() - 10, id(font_text), Color::WHITE, TextAlign::BOTTOM_CENTER, "%s", date_time_text.c_str() ); + + int x1, y1, text_width, text_height; + it.get_text_bounds(0, 0, date_time_text, id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); + + // Calculate the rectangle dimensions with a 5-pixel padding + int rect_width = text_width + 10; + int rect_height = text_height + 10; + + // Calculate the position to rectangle top-left + int rect_x = (it.get_width() - rect_width) / 2; // Centered + int rect_y = it.get_height() - rect_height - 15; // margin from the bottom is 15 + + it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); // Draw the black rectangle + it.rectangle(rect_x, rect_y, rect_width, rect_height, Color::WHITE); // Draw the white outline + + // Calculate the position to center the text inside the rectangle + int text_x = rect_x + (rect_width - text_width) / 2; + int text_y = rect_y + 5; + + it.printf( text_x, text_y, id(font_text), Color::WHITE, TextAlign::TOP_LEFT, "%s", date_time_text.c_str() ); // Print the text in white } - id: listening_page lambda: |- From ed2216a403c459793beb3b065b25cdd7e1786b2d Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 18:46:52 +1300 Subject: [PATCH 31/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 9f525393..de348372 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -842,7 +842,7 @@ display: } int x1, y1, text_width, text_height; - it.get_text_bounds(0, 0, date_time_text, id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); + it.get_text_bounds(0, 0, date_time_text.c_str(), id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); // Calculate the rectangle dimensions with a 5-pixel padding int rect_width = text_width + 10; From 1491d8a2b23901a7c4f6ad09e63533e03a0ee139 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 18:59:20 +1300 Subject: [PATCH 32/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index de348372..31dcf752 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -797,7 +797,7 @@ display: if ( id(display_text).state ) { int x1, y1, text_width, text_height; - it.get_text_bounds(0, 0, "${wake_word_prompt}", id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); + it.get_text_bounds(0, 0, "${wake_word_prompt}", id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); // Get the text dimensions // Calculate the rectangle dimensions with a 5-pixel padding int rect_width = text_width + 10; @@ -842,7 +842,7 @@ display: } int x1, y1, text_width, text_height; - it.get_text_bounds(0, 0, date_time_text.c_str(), id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); + it.get_text_bounds(0, 0, date_time_text.c_str(), id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); // Get the text dimensions // Calculate the rectangle dimensions with a 5-pixel padding int rect_width = text_width + 10; @@ -853,7 +853,7 @@ display: int rect_y = it.get_height() - rect_height - 15; // margin from the bottom is 15 it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); // Draw the black rectangle - it.rectangle(rect_x, rect_y, rect_width, rect_height, Color::WHITE); // Draw the white outline + it.rectangle(rect_x, rect_y, rect_width, rect_height, Color::GREY); // Draw the white outline // Calculate the position to center the text inside the rectangle int text_x = rect_x + (rect_width - text_width) / 2; @@ -894,7 +894,11 @@ display: it.fill(id(error_color)); it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_error), ImageAlign::CENTER); if ( id(display_text).state ) { - it.print( 10, 10, id(font_text), Color::WHITE, "${error_prompt}" ); + int x1, y1, text_width, text_height; + it.get_text_bounds(0, 0, "${error_prompt}", id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); // Get the text dimensions + it.filled_rectangle(10, 10, text_width + 10, text_height + 10, Color::BLACK); // Draw the black rectangle + it.rectangle(10, 10, text_width + 10, text_height + 10, Color::WHITE); // Draw the white outline + it.print( 15, 15, id(font_text), Color::WHITE, "${error_prompt}" ); // Print the text in white } - id: no_ha_page lambda: |- @@ -907,7 +911,11 @@ display: it.fill(id(loading_color)); it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_initializing), ImageAlign::CENTER); if ( id(display_text).state ) { - it.print( 10, 10, id(font_text), Color::WHITE, "${starting_up}" ); + int x1, y1, text_width, text_height; + it.get_text_bounds(0, 0, "${starting_up}", id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); // Get the text dimensions + it.filled_rectangle(10, 10, text_width + 10, text_height + 10, Color::BLACK); // Draw the black rectangle + it.rectangle(10, 10, text_width + 10, text_height + 10, Color::GREY); // Draw the white outline + it.print( 15, 15, id(font_text), Color::WHITE, "${starting_up}" ); // Print the text in white } - id: muted_page lambda: |- From beaea73eeffe5ff4f18f8f1c6241a9d4c7ce9828 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 19:11:16 +1300 Subject: [PATCH 33/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 31dcf752..e3aa0034 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -15,6 +15,7 @@ substitutions: thinking_illustration_background_color: "FFFFFF" replying_illustration_background_color: "FFFFFF" error_illustration_background_color: "000000" + text_outline_color: "888888" voice_assist_idle_phase_id: "1" voice_assist_listening_phase_id: "2" @@ -752,7 +753,8 @@ color: hex: ${loading_illustration_background_color} - id: error_color hex: ${error_illustration_background_color} - + - id: text_outline_color + hex: ${text_outline_color} spi: clk_pin: 7 mosi_pin: 6 @@ -808,7 +810,7 @@ display: int rect_y = 15; // Margin from the top is 15 it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); // Draw the black rectangle - it.rectangle(rect_x, rect_y, rect_width, rect_height, Color::WHITE); // Draw the white outline + it.rectangle(rect_x, rect_y, rect_width, rect_height, text_outline_color); // Draw the outline // Calculate the position to center the text inside the rectangle int text_x = rect_x + (rect_width - text_width) / 2; @@ -853,7 +855,7 @@ display: int rect_y = it.get_height() - rect_height - 15; // margin from the bottom is 15 it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); // Draw the black rectangle - it.rectangle(rect_x, rect_y, rect_width, rect_height, Color::GREY); // Draw the white outline + it.rectangle(rect_x, rect_y, rect_width, rect_height, text_outline_color); // Draw the outline // Calculate the position to center the text inside the rectangle int text_x = rect_x + (rect_width - text_width) / 2; @@ -897,7 +899,7 @@ display: int x1, y1, text_width, text_height; it.get_text_bounds(0, 0, "${error_prompt}", id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); // Get the text dimensions it.filled_rectangle(10, 10, text_width + 10, text_height + 10, Color::BLACK); // Draw the black rectangle - it.rectangle(10, 10, text_width + 10, text_height + 10, Color::WHITE); // Draw the white outline + it.rectangle(10, 10, text_width + 10, text_height + 10, text_outline_color); // Draw the outline it.print( 15, 15, id(font_text), Color::WHITE, "${error_prompt}" ); // Print the text in white } - id: no_ha_page @@ -914,7 +916,7 @@ display: int x1, y1, text_width, text_height; it.get_text_bounds(0, 0, "${starting_up}", id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); // Get the text dimensions it.filled_rectangle(10, 10, text_width + 10, text_height + 10, Color::BLACK); // Draw the black rectangle - it.rectangle(10, 10, text_width + 10, text_height + 10, Color::GREY); // Draw the white outline + it.rectangle(10, 10, text_width + 10, text_height + 10, text_outline_color); // Draw the outline it.print( 15, 15, id(font_text), Color::WHITE, "${starting_up}" ); // Print the text in white } - id: muted_page From 1f653733241942fc786edbfe415fd2c3ae898aa0 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 19:24:20 +1300 Subject: [PATCH 34/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 44 +++++++------------ 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index e3aa0034..79dab590 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -800,22 +800,15 @@ display: int x1, y1, text_width, text_height; it.get_text_bounds(0, 0, "${wake_word_prompt}", id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); // Get the text dimensions - - // Calculate the rectangle dimensions with a 5-pixel padding - int rect_width = text_width + 10; - int rect_height = text_height + 10; - - // Calculate the position to rectangle top-left - int rect_x = (it.get_width() - rect_width) / 2; // Centered - int rect_y = 15; // Margin from the top is 15 + int rect_width = text_width + 10; // 5-pixel padding + int rect_height = text_height + 10; // 5-pixel padding + int rect_x = 10; // Margin from the left + int rect_y = 10; // Margin from the top + int text_x = rect_x + 5; // 5-pixel padding + int text_y = rect_y + 5; // 5-pixel padding it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); // Draw the black rectangle it.rectangle(rect_x, rect_y, rect_width, rect_height, text_outline_color); // Draw the outline - - // Calculate the position to center the text inside the rectangle - int text_x = rect_x + (rect_width - text_width) / 2; - int text_y = rect_y + 5; - it.print( text_x, text_y, id(font_text), Color::WHITE, "${wake_word_prompt}" ); // Print the text in white } @@ -845,22 +838,15 @@ display: int x1, y1, text_width, text_height; it.get_text_bounds(0, 0, date_time_text.c_str(), id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); // Get the text dimensions - - // Calculate the rectangle dimensions with a 5-pixel padding - int rect_width = text_width + 10; - int rect_height = text_height + 10; - - // Calculate the position to rectangle top-left + int rect_width = text_width + 10; // 5-pixel padding + int rect_height = text_height + 10; // 5-pixel padding int rect_x = (it.get_width() - rect_width) / 2; // Centered - int rect_y = it.get_height() - rect_height - 15; // margin from the bottom is 15 - + int rect_y = it.get_height() - rect_height - 10; // margin from the bottom is 10 + int text_x = rect_x + (rect_width - text_width) / 2; // Centered + int text_y = rect_y + 5; 5-pixel padding + it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); // Draw the black rectangle it.rectangle(rect_x, rect_y, rect_width, rect_height, text_outline_color); // Draw the outline - - // Calculate the position to center the text inside the rectangle - int text_x = rect_x + (rect_width - text_width) / 2; - int text_y = rect_y + 5; - it.printf( text_x, text_y, id(font_text), Color::WHITE, TextAlign::TOP_LEFT, "%s", date_time_text.c_str() ); // Print the text in white } - id: listening_page @@ -868,7 +854,11 @@ display: it.fill(id(listening_color)); it.image((it.get_width() / 2), (it.get_height() / 2), id(casita_listening), ImageAlign::CENTER); if ( id(display_text).state ) { - it.print( 10, 10, id(font_text), Color::BLACK, "${listening_prompt}" ); + int x1, y1, text_width, text_height; + it.get_text_bounds(0, 0, "${listening_prompt}", id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); // Get the text dimensions + it.filled_rectangle(10, 10, text_width + 10, text_height + 10, Color::WHITE); // Draw the white rectangle + it.rectangle(10, 10, text_width + 10, text_height + 10, text_outline_color); // Draw the outline + it.print( 15, 15, id(font_text), Color::BLACK, "${listening_prompt}" ); // Print the text in black } - id: thinking_page lambda: |- From 363c0540ad362baa57887ddc61b9482cb69027e9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 19:30:25 +1300 Subject: [PATCH 35/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 79dab590..da85ba0e 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -843,7 +843,7 @@ display: int rect_x = (it.get_width() - rect_width) / 2; // Centered int rect_y = it.get_height() - rect_height - 10; // margin from the bottom is 10 int text_x = rect_x + (rect_width - text_width) / 2; // Centered - int text_y = rect_y + 5; 5-pixel padding + int text_y = rect_y + 5; // 5-pixel padding it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); // Draw the black rectangle it.rectangle(rect_x, rect_y, rect_width, rect_height, text_outline_color); // Draw the outline From 871833826031fd98b77f4e65930bcf6cd2030fb9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 19:40:45 +1300 Subject: [PATCH 36/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index da85ba0e..76e38d5b 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -26,7 +26,7 @@ substitutions: voice_assist_muted_phase_id: "12" # These unqiue characters have been extracted from every test file of every language available on https://github.com/home-assistant/intents (14 March 2024) - allowed_characters: " !\"#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}，？" + allowed_characters: " !#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？" micro_wake_word_model: okay_nabu From 789247e8fecad310d08ee7bff29e16b2e2d5f300 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 19:43:43 +1300 Subject: [PATCH 37/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index 76e38d5b..d94e5bd5 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -26,7 +26,7 @@ substitutions: voice_assist_muted_phase_id: "12" # These unqiue characters have been extracted from every test file of every language available on https://github.com/home-assistant/intents (14 March 2024) - allowed_characters: " !#%'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？" + allowed_characters: " !#%\"'()+,-./0123456789:;<>?@ABCDEFGHIJKLMNOPQRSTUVWYZ[]_abcdefghijklmnopqrstuvwxyz{|}°²³µ¿ÁÂÄÅÉÖÚßàáâãäåæçèéêëìíîðñòóôõöøùúûüýþāăąćčďĐđēėęěğĮįıļľŁłńňőřśšťũūůűųźŻżŽžơưșțΆΈΌΐΑΒΓΔΕΖΗΘΚΜΝΠΡΣΤΥΦάέήίαβγδεζηθικλμνξοπρςστυφχψωϊόύώАБВГДЕЖЗИКЛМНОПРСТУХЦЧШЪЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяёђєіїјљњћאבגדהוזחטיכלםמןנסעפץצקרשת،ءآأإئابةتجحخدذرزسشصضطظعغفقكلمنهوىيٹپچڈکگںھہیےংকচতধনফবযরলশষস়ািু্చయలిెొ్ംഅആഇഈഉഎഓകഗങചജഞടഡണതദധനപഫബഭമയരറലളവശസഹാിീുൂെേൈ്ൺൻർൽൾაბგდევზთილმნოპრსტუფქყშჩცძჭხạảấầẩậắặẹẽếềểệỉịọỏốồổỗộớờởợụủứừửữựỳ—、一上不个中为主乾了些亮人任低佔何作供依侧係個側偵充光入全关冇冷几切到制前動區卧厅厨及口另右吊后吗启吸呀咗哪唔問啟嗎嘅嘛器圍在场執場外多大始安定客室家密寵对將小少左已帘常幫幾库度庫廊廚廳开式後恆感態成我戲戶户房所扇手打执把拔换掉控插摄整斯新明是景暗更最會有未本模機檯櫃欄次正氏水沒没洗活派温測源溫漏潮激濕灯為無煙照熱燈燥物狀玄现現瓦用發的盞目着睡私空窗立笛管節簾籬紅線红罐置聚聲脚腦腳臥色节著行衣解設調請謝警设调走路車车运連遊運過道邊部都量鎖锁門閂閉開關门闭除隱離電震霧面音頂題顏颜風风食餅餵가간감갔강개거게겨결경고공과관그금급기길깥꺼껐꼽나난내네놀누는능니다닫담대더데도동됐되된됨둡드든등디때떤뜨라래러렇렌려로료른를리림링마많명몇모무문물뭐바밝방배변보부불블빨뽑사산상색서설성세센션소쇼수스습시신실싱아안않알았애야어얼업없었에여연열옆오온완외왼요운움워원위으은을음의이인일임입있작잠장재전절정제져조족종주줄중줘지직진짐쪽차창천최추출충치침커컴켜켰쿠크키탁탄태탬터텔통트튼티파팬퍼폰표퓨플핑한함해했행혀현화활후휴힘，？" micro_wake_word_model: okay_nabu From fdd9472e7ccacb737d6e62e1f00588279d0d1124 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Mar 2024 19:54:30 +1300 Subject: [PATCH 38/38] Update esp32-s3-box-3.yaml --- wake-word-voice-assistant/esp32-s3-box-3.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/wake-word-voice-assistant/esp32-s3-box-3.yaml b/wake-word-voice-assistant/esp32-s3-box-3.yaml index d94e5bd5..8629e0a8 100644 --- a/wake-word-voice-assistant/esp32-s3-box-3.yaml +++ b/wake-word-voice-assistant/esp32-s3-box-3.yaml @@ -181,7 +181,6 @@ micro_wake_word: - voice_assistant.start: wake_word: !lambda return wake_word; - voice_assistant: id: va microphone: box_mic @@ -344,7 +343,7 @@ script: - wait_until: condition: lambda: return !(id(voice_assistant_phase) == ${voice_assist_replying_phase_id}); - # normally this would complete and move to next phase with on_tts_stream_end, + # normally this would complete and move to next phase with on_tts_stream_end, # but sometimes this is missed so put a time limit on the wait timeout: 10s - delay: 1s # Give time for the stream to end and the phase to be switched back to listening and this timeout to be reset @@ -806,7 +805,7 @@ display: int rect_y = 10; // Margin from the top int text_x = rect_x + 5; // 5-pixel padding int text_y = rect_y + 5; // 5-pixel padding - + it.filled_rectangle(rect_x, rect_y, rect_width, rect_height, Color::BLACK); // Draw the black rectangle it.rectangle(rect_x, rect_y, rect_width, rect_height, text_outline_color); // Draw the outline it.print( text_x, text_y, id(font_text), Color::WHITE, "${wake_word_prompt}" ); // Print the text in white @@ -835,7 +834,7 @@ display: pos = date_time_text.find(" 0", pos); // Find the next occurrence } } - + int x1, y1, text_width, text_height; it.get_text_bounds(0, 0, date_time_text.c_str(), id(font_text), TextAlign::TOP_LEFT, &x1, &y1, &text_width, &text_height); // Get the text dimensions int rect_width = text_width + 10; // 5-pixel padding