Skip to content

Commit

Permalink
🎉
Browse files Browse the repository at this point in the history
  • Loading branch information
JarbasAl committed Nov 26, 2024
1 parent d34d26f commit 3bd71ce
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_img.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
compress-with-xz: true
cache: true
mount-repository: true
env-vars: USER
env-vars: USER,PASSWORD
script-path: build_raspOVOS.sh
-
name: Print outputs
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/build_img_ca.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: build catalan headless image

on:
push:
workflow_dispatch:

jobs:
Expand All @@ -12,12 +11,11 @@ jobs:
name: Checkout repository
uses: actions/checkout@v4
-
name: Add OVOS to Raspberry Pi OS Bookworm
name: Configure OVOS for Catalan
uses: dtcooper/rpi-image-modifier@v1
id: create-image
env:
USER: 'ovos'
PASSWORD: 'ovos'
with:
base-image-url: https://github.com/JarbasAl/image_build_test/releases/download/untagged-a7109acc0e90d68aea81/raspOVOS-bookworm-arm64-lite.img.xz
image-path: raspOVOS-catalan-bookworm-arm64-lite.img
Expand Down
2 changes: 2 additions & 0 deletions build_raspOVOS.sh
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ cp -v /mounted-github-repo/ovos-messagebus.service /home/$USER/.config/systemd/u
cp -v /mounted-github-repo/ovos-audio.service /home/$USER/.config/systemd/user/
cp -v /mounted-github-repo/ovos-listener.service /home/$USER/.config/systemd/user/
cp -v /mounted-github-repo/ovos-phal.service /home/$USER/.config/systemd/user/
cp -v /mounted-github-repo/ovos-gui.service /home/$USER/.config/systemd/user/
cp -v /mounted-github-repo/ovos-ggwave.service /home/$USER/.config/systemd/user/
cp -v /mounted-github-repo/ovos-admin-phal.service /etc/systemd/system/

Expand All @@ -185,6 +186,7 @@ ln -s /home/$USER/.config/systemd/user/ovos-messagebus.service /home/$USER/.conf
ln -s /home/$USER/.config/systemd/user/ovos-audio.service /home/$USER/.config/systemd/user/default.target.wants/ovos-audio.service
ln -s /home/$USER/.config/systemd/user/ovos-listener.service /home/$USER/.config/systemd/user/default.target.wants/ovos-listener.service
ln -s /home/$USER/.config/systemd/user/ovos-phal.service /home/$USER/.config/systemd/user/default.target.wants/ovos-phal.service
ln -s /home/$USER/.config/systemd/user/ovos-gui.service /home/$USER/.config/systemd/user/default.target.wants/ovos-gui.service
ln -s /home/$USER/.config/systemd/user/ovos-ggwave.service /home/$USER/.config/systemd/user/default.target.wants/ovos-ggwave.service
ln -s /etc/systemd/system/ovos-admin-phal.service /etc/systemd/system/multi-user.target.wants/ovos-admin-phal.service

Expand Down
23 changes: 14 additions & 9 deletions mycroft.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
{
"logs": {
"path": "/ramdisk/mycroft",
"max_bytes": 1500000,
"backup_count": 1
},
"PHAL": {
"admin": {
"ovos-PHAL-plugin-system": {"enabled": true}
}
"logs": {
"path": "/ramdisk/mycroft",
"max_bytes": 1500000,
"backup_count": 1
},
"PHAL": {
"admin": {
"ovos-PHAL-plugin-system": {
"enabled": true
}
}
},
"gui": {
"disable_gui": true
}
}
45 changes: 23 additions & 22 deletions mycroft_ca.conf
Original file line number Diff line number Diff line change
@@ -1,49 +1,50 @@
{
"lang": "ca-ES",

"system_unit": "metric",
"temperature_unit": "celsius",
"windspeed_unit": "km/h",
"precipitation_unit": "mm",
"time_format": "full",
"spoken_time_format": "half",
"date_format": "DMY",

"listener": {
"stand_up_word": "desperta"
},

"hotwords": {
"desperta": {
"module": "ovos-ww-plugin-vosk",
"rule": "fuzzy",
"samples": ["desperta't", "desperta", "desperti's", "desperteu-vos", "despertar"],
"lang": "ca",
"wakeup": true,
"fallback_ww": "desperta_pocketsphinx"
"module": "ovos-ww-plugin-vosk",
"rule": "fuzzy",
"samples": [
"desperta't",
"desperta",
"desperti's",
"desperteu-vos",
"despertar"
],
"lang": "ca",
"wakeup": true,
"fallback_ww": "desperta_pocketsphinx"
},
"desperta_pocketsphinx": {
"module": "ovos-ww-plugin-pocketsphinx",
"phonemes": "D EH S P ER T . AH",
"threshold": 1e-20,
"lang": "ca",
"wakeup": true
"module": "ovos-ww-plugin-pocketsphinx",
"phonemes": "D EH S P ER T . AH",
"threshold": 1e-20,
"lang": "ca",
"wakeup": true
}
},

"stt": {
"module": "ovos-stt-plugin-server",
"fallback_module": "",
"ovos-stt-plugin-server": {
"urls": [
"https://stt.smartgic.io/aina/stt",
"https://ainastt.ziggyai.online/stt",
"https://stt.smartgic.io/citrinet/stt",
"https://citrinetstt.ziggyai.online/stt"
]
"urls": [
"https://stt.smartgic.io/aina/stt",
"https://ainastt.ziggyai.online/stt",
"https://stt.smartgic.io/citrinet/stt",
"https://citrinetstt.ziggyai.online/stt"
]
}
},

"tts": {
"module": "ovos-tts-plugin-matxa-multispeaker-cat",
"ovos-tts-plugin-matxa-multispeaker-cat": {
Expand Down
18 changes: 18 additions & 0 deletions ovos-gui.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[Unit]
Description=OVOS GUI Websocket
PartOf=ovos.service
After=ovos.service
After=ovos-messagebus.service

[Service]
Type=notify
ExecStart=%h/.venvs/ovos/bin/python /usr/libexec/ovos-systemd-gui
TimeoutStartSec=1m
TimeoutStopSec=1m
Restart=on-failure
StartLimitInterval=5min
StartLimitBurst=4

[Install]
WantedBy=ovos.service

33 changes: 33 additions & 0 deletions ovos-systemd-gui
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/env python
##########################################################################
# ovos-systemd-gui.py
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
##########################################################################
import sdnotify
from ovos_gui.__main__ import main

n = sdnotify.SystemdNotifier()


def notify_ready():
n.notify('READY=1')
print('Startup of OVOS GUI service complete')


def notify_stopping():
n.notify('STOPPING=1')
print('Stopping the OVOS GUI service')


main(ready_hook=notify_ready, stopping_hook=notify_stopping)

0 comments on commit 3bd71ce

Please sign in to comment.