Add mycroft-admin-phal.service

Update mycroft.conf

buildroot-external/Config.in

@@ -300,6 +300,7 @@ menu "Plugins"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-marytts/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-mimic/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-mimic2/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-mimic3-server/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-pico/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-server/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-server-plugin/Config.in"

buildroot-external/configs/rpi4_64-gui_defconfig

@@ -729,6 +729,7 @@ BR2_PACKAGE_PYTHON_NEON_TTS_PLUGIN_LARYNX_SERVER=y
 BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MARYTTS=y
 BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC=y
 BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC2=y
+BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC3_SERVER=y
 BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_PICO=y
 BR2_PACKAGE_PYTHON_OVOS_TTS_SERVER=y
 BR2_PACKAGE_PYTHON_OVOS_TTS_SERVER_PLUGIN=y

buildroot-external/package/python-ovos-phal-plugin-system/python-ovos-phal-plugin-system.hash

@@ -1 +1 @@
-sha256  2e81280361848ac038f319e759112dc325966b26e1ae66667cec6c6ddeb9a5ca  python-ovos-phal-plugin-system-5f480dc788eca3989dc6111f4c7bf7a52418fd04.tar.gz
+sha256  1104d506eaff09110c343d3afb753a4f8b188db999a13eb2a49ea1eb3297c55c  python-ovos-phal-plugin-system-4e697036a6ace2105247954b64a003e602358747.tar.gz

buildroot-external/package/python-ovos-phal-plugin-system/python-ovos-phal-plugin-system.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_OVOS_PHAL_PLUGIN_SYSTEM_VERSION = 5f480dc788eca3989dc6111f4c7bf7a52418fd04
+PYTHON_OVOS_PHAL_PLUGIN_SYSTEM_VERSION = 4e697036a6ace2105247954b64a003e602358747
 PYTHON_OVOS_PHAL_PLUGIN_SYSTEM_SITE = $(call github,OpenVoiceOS,ovos-PHAL-plugin-system,$(PYTHON_OVOS_PHAL_PLUGIN_SYSTEM_VERSION))
 PYTHON_OVOS_PHAL_PLUGIN_SYSTEM_SETUP_TYPE = setuptools
 PYTHON_OVOS_PHAL_PLUGIN_SYSTEM_LICENSE_FILES = LICENSE

buildroot-external/package/python-ovos-stt-plugin-vosk/python-ovos-stt-plugin-vosk.hash

@@ -1,2 +1,2 @@
 # sha256 locally computed
-sha256  e5e713d230ab02f12e606c92b99f1644dbeeff9ee85bae35ba7dc87d9db4d750  python-ovos-stt-plugin-vosk-808527c7187584177a656bb16988c8fd5ab0bdcb.tar.gz
+sha256  111c61cc6f050daf108feeeda96a067699cff12dd2f620b4f88f972e2e61a2d6  python-ovos-stt-plugin-vosk-86893e9b41acb14a4840ff03e73d066aefb3e568.tar.gz

buildroot-external/package/python-ovos-stt-plugin-vosk/python-ovos-stt-plugin-vosk.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_OVOS_STT_PLUGIN_VOSK_VERSION = 808527c7187584177a656bb16988c8fd5ab0bdcb
+PYTHON_OVOS_STT_PLUGIN_VOSK_VERSION = 86893e9b41acb14a4840ff03e73d066aefb3e568
 PYTHON_OVOS_STT_PLUGIN_VOSK_SITE = $(call github,OpenVoiceOS,ovos-stt-plugin-vosk,$(PYTHON_OVOS_STT_PLUGIN_VOSK_VERSION))
 PYTHON_OVOS_STT_PLUGIN_VOSK_SETUP_TYPE = setuptools
 PYTHON_OVOS_STT_PLUGIN_VOSK_ENV = MYCROFT_LOOSE_REQUIREMENTS=true

buildroot-external/package/python-ovos-tts-plugin-mimic3-server/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC3_SERVER
+	bool "python-ovos-tts-plugin-mimic3-server"
+	help
+	  OVOS Server TTS plugin for Mimic3
+
+	  https://github.com/OpenVoiceOS/ovos-tts-plugin-mimic3-server

buildroot-external/package/python-ovos-tts-plugin-mimic3-server/python-ovos-tts-plugin-mimic3-server.hash

@@ -0,0 +1,2 @@
+# sha256 locally computed
+sha256  8c40d5b2ce1784f9d0f693dbf11d01942d9a68a9799918864028e1112acb0cf1  python-ovos-tts-plugin-mimic3-server-efabecb074e2e53811b9e801dec0844485b7474f.tar.gz

buildroot-external/package/python-ovos-tts-plugin-mimic3-server/python-ovos-tts-plugin-mimic3-server.mk

@@ -0,0 +1,11 @@
+################################################################################
+#
+# python-ovos-tts-plugin-mimic3-server
+#
+################################################################################
+
+PYTHON_OVOS_TTS_PLUGIN_MIMIC3_SERVER_VERSION = efabecb074e2e53811b9e801dec0844485b7474f
+PYTHON_OVOS_TTS_PLUGIN_MIMIC3_SERVER_SITE = $(call github,OpenVoiceOS,ovos-tts-plugin-mimic3-server,$(PYTHON_OVOS_TTS_PLUGIN_MIMIC3_SERVER_VERSION))
+PYTHON_OVOS_TTS_PLUGIN_MIMIC3_SERVER_SETUP_TYPE = setuptools
+
+$(eval $(python-package))

buildroot-external/package/python-ovos-utils/python-ovos-utils.hash

@@ -1 +1 @@
-sha256  cbd51a050ed27d85feddb96e70212194af41ae2417587ac04d583b3fa50ca6ac  python-ovos-utils-cf10eb22668651fc0e5545b3145c29c61d4de305.tar.gz
+sha256  de283a81115a600cfb55357dc3cb993870f46cdf45078b4fbf7cdb0f2d98c643  python-ovos-utils-5bb8fb900cec3c8a233c4265dccecbe63c51a168.tar.gz

buildroot-external/package/python-ovos-utils/python-ovos-utils.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_OVOS_UTILS_VERSION = cf10eb22668651fc0e5545b3145c29c61d4de305
+PYTHON_OVOS_UTILS_VERSION = 5bb8fb900cec3c8a233c4265dccecbe63c51a168
 PYTHON_OVOS_UTILS_SITE = $(call github,OpenVoiceOS,ovos_utils,$(PYTHON_OVOS_UTILS_VERSION))
 PYTHON_OVOS_UTILS_SETUP_TYPE = setuptools
 PYTHON_OVOS_UTILS_LICENSE_FILES = LICENSE

buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf

@@ -4,20 +4,12 @@
   "play_wav_cmdline": "paplay %1",
   "play_mp3_cmdline": "mpg123 %1",
   "ipc_path": "/dev/shm/mycroft/ipc/",
-  "enclosure": {
-    "platform": "OpenVoiceOS",
-    "ntp_sync_on_boot": true
-  },
   "gui": {
     "extension": "smartspeaker",
     "idle_display_skill": "skill-ovos-homescreen.openvoiceos"
   },
   "PHAL": {
-    "ovos-PHAL-plugin-system": {"enabled": true},
-    "ovos-PHAL-plugin-connectivity-events": {"enabled": true},
-    "ovos-PHAL-plugin-balena-wifi": {"enabled": true},
-    "ovos-PHAL-plugin-display-manager-ipc": {"enabled": true},
-    "ovos-PHAL-plugin-dashboard": {"enabled": true}
+    "ovos-PHAL-plugin-system": {"sudo": false}
   },
   "listener": {
     "mute_during_output": false,
@@ -33,35 +25,18 @@
       "model": "~/.local/share/precise-lite/wakewords/en/hey_mycroft.tflite",
       "sensitivity": 0.5,
       "trigger_level": 3,
-      "expected_duration": 3,
-      "phonemes": "HH EY . M AY K R AO F T",
-      "threshold": 1e-90,
-      "lang": "en-us"
-    },
-    "wake_up": {
-      "module": "ovos-ww-plugin-pocketsphinx",
-      "phonemes": "W EY K . AH P",
-      "threshold": 1e-20,
-      "lang": "en-us"
+      "expected_duration": 3
     }
   },
   "tts": {
-    "module": "ovos-tts-plugin-mimic2",
+    "module": "ovos-tts-plugin-mimic3-server",
     "fallback_module": "ovos-tts-plugin-mimic",
-    "ovos-tts-plugin-mimic2": {
-      "voice": "kusal",
-      "preloaded_cache": "/usr/share/mycroft/Mimic2TTSPlugin/kusal/en-us"
+    "ovos-tts-plugin-mimic3-server": {
+      "voice": "en_UK/apope_low"
     }
   },
   "skills": {
-    "wait_for_internet": true,
-    "upload_skill_manifest": false,
-    "sync2way": false,
-    "blacklisted_skills": [
-      "mycroft-pairing.mycroftai",
-      "mycroft-volume.mycroftai",
-      "mycroft-version-checker.mycroftai"
-    ]
+    "wait_for_internet": true
   },
   "Audio": {
     "backends": {
@@ -80,8 +55,7 @@
         "type": "ovos_audio_simple",
         "active": true
       }
-    },
-    "default-backend": "OCP"
+    }
   },
   "log_level": "INFO"
 }

buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset

@@ -8,6 +8,7 @@ enable NetworkManager.service
 enable getty@tty1.service
 enable ovos-splash-start.service
 enable ovos-splash-systemd.service
+enable mycroft-admin-phal.service
 
 disable pulseaudio.service
 disable getty@.service

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-admin-phal.service

@@ -0,0 +1,16 @@
+[Unit]
+Description=Admin PHAL
+
+[Service]
+Type=notify
+ExecStart=/usr/libexec/mycroft-systemd-admin-phal
+TimeoutStartSec=1m
+TimeoutStopSec=1m
+Restart=on-failure
+StartLimitInterval=5min
+StartLimitBurst=4
+#StartLimitAction=reboot-force
+#WatchdogSec=30s
+
+[Install]
+WantedBy=multi-user.target

buildroot-external/rootfs-overlay/usr/libexec/mycroft-systemd-admin-phal

@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+##########################################################################
+# mycroft-systemd_enclosure.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_PHAL.admin import main
+
+n = sdnotify.SystemdNotifier()
+
+def notify_ready():
+    n.notify('READY=1')
+    print('Startup of admin PHAL service complete')
+
+def notify_stopping():
+    n.notify('STOPPING=1')
+    print('Stopping the admin PHAL service')
+
+main(ready_hook=notify_ready, stopping_hook=notify_stopping)