Change presets for pulseaudio

buildroot-external/board/raspberrypi/rootfs-overlay/usr/libexec/ovos-i2csound

@@ -62,6 +62,9 @@ fi
 if [ -f /etc/pulse/system.pa ] ; then
     rm /etc/pulse/system.pa
 fi
+if [ -f /etc/pulse/default.pa ] ; then
+    rm /etc/pulse/default.pa
+fi
 if [ -f /etc/pulse/daemon.conf ] ; then
     rm /etc/pulse/daemon.conf
 fi
@@ -123,6 +126,8 @@ ln -s $ASOUND_STATE /var/lib/alsa/asound.state
 # Install pulseaudio files
 echo "create pulse system file"
 ln -s $PULSE_SYSTEM /etc/pulse/system.pa
+echo "create pulse default file"
+ln -s $PULSE_SYSTEM /etc/pulse/default.pa
 echo "create pulse daemon file"
 ln -s $PULSE_DAEMON /etc/pulse/daemon.conf
 

buildroot-external/package/ovos-shell/ovos-shell.hash

@@ -1,2 +1,2 @@
 # Locally computed
-sha256  5db006ad65699ee1ef54e3b075b66f868ebdfe21167ed9ab4732580dc15776f6  ovos-shell-a98d7a47c204c307cc3992fe6e121fd2bcab234f.tar.gz
+sha256  e5a68fa9c1277d5522b3d56423ea560867669f51ce62643cc354ec3c8562b3c3  ovos-shell-8b252051da0e00532ce19bb982960b622081408c.tar.gz

buildroot-external/package/ovos-shell/ovos-shell.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OVOS_SHELL_VERSION = a98d7a47c204c307cc3992fe6e121fd2bcab234f
+OVOS_SHELL_VERSION = 8b252051da0e00532ce19bb982960b622081408c
 OVOS_SHELL_SITE = $(call github,OpenVoiceOS,ovos-shell,$(OVOS_SHELL_VERSION))
 OVOS_SHELL_LICENSE = Apache License 2.0
 

buildroot-external/package/python-ovos-phal-plugin-color-scheme-manager/python-ovos-phal-plugin-color-scheme-manager.hash

@@ -1 +1 @@
-sha256  31bae9fb0bb44565f796c4d4a421fee97f5ed1169f1054fac3d56efa528d6fa4  python-ovos-phal-plugin-color-scheme-manager-7fd44984d0e8ebc09f6df12a2608f6288ba153b7.tar.gz
+sha256  79fd4ccf1f06053049aefd2e251bd462458515091380198ddc242d832ad6e215  python-ovos-phal-plugin-color-scheme-manager-756abc7f6ea6acba3595668b20363cda40f1a470.tar.gz

buildroot-external/package/python-ovos-phal-plugin-color-scheme-manager/python-ovos-phal-plugin-color-scheme-manager.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_OVOS_PHAL_PLUGIN_COLOR_SCHEME_MANAGER_VERSION = 7fd44984d0e8ebc09f6df12a2608f6288ba153b7
+PYTHON_OVOS_PHAL_PLUGIN_COLOR_SCHEME_MANAGER_VERSION = 756abc7f6ea6acba3595668b20363cda40f1a470
 PYTHON_OVOS_PHAL_PLUGIN_COLOR_SCHEME_MANAGER_SITE = $(call github,OpenVoiceOS,ovos-PHAL-plugin-color-scheme-manager,$(PYTHON_OVOS_PHAL_PLUGIN_COLOR_SCHEME_MANAGER_VERSION))
 PYTHON_OVOS_PHAL_PLUGIN_COLOR_SCHEME_MANAGER_SETUP_TYPE = setuptools
 PYTHON_OVOS_PHAL_PLUGIN_COLOR_SCHEME_MANAGER_LICENSE_FILES = LICENSE

buildroot-external/package/python-ovos-phal-plugin-wifi-setup/python-ovos-phal-plugin-wifi-setup.hash

@@ -1 +1 @@
-sha256  1619a0cdedc49c4791e8a10732ff5a598532eaf0cebfd10e9061db9fea8e5abd  python-ovos-phal-plugin-wifi-setup-c987703ef4225ef41f2f75e82f86de510e71b4cc.tar.gz
+sha256  560d213a14485289fc257fa2bc2a6bd51f0c998f74685b3edd9d3e18f7a5b5c6  python-ovos-phal-plugin-wifi-setup-822eb5dbfbebd8dd12439365a56e3ee8487a302b.tar.gz

buildroot-external/package/python-ovos-phal-plugin-wifi-setup/python-ovos-phal-plugin-wifi-setup.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_OVOS_PHAL_PLUGIN_WIFI_SETUP_VERSION = c987703ef4225ef41f2f75e82f86de510e71b4cc
+PYTHON_OVOS_PHAL_PLUGIN_WIFI_SETUP_VERSION = 822eb5dbfbebd8dd12439365a56e3ee8487a302b
 PYTHON_OVOS_PHAL_PLUGIN_WIFI_SETUP_SITE = $(call github,OpenVoiceOS,ovos-PHAL-plugin-wifi-setup,$(PYTHON_OVOS_PHAL_PLUGIN_WIFI_SETUP_VERSION))
 PYTHON_OVOS_PHAL_PLUGIN_WIFI_SETUP_SETUP_TYPE = setuptools
 PYTHON_OVOS_PHAL_PLUGIN_WIFI_SETUP_LICENSE_FILES = LICENSE

buildroot-external/package/python-ovos-plugin-manager/python-ovos-plugin-manager.hash

@@ -1 +1 @@
-sha256  206b54c25adfa859682e94277e3901b451c663bc738f50cc3572113c63663fca  python-ovos-plugin-manager-dd745ba6e62533d8985041a63e1c9dba2f769072.tar.gz
+sha256  3f0e90232656677447727b85acf074ab233e479da82e8fb07bac4e336a86122f  python-ovos-plugin-manager-f25b598f7a52d5a38b3403e9a0707758d7550de0.tar.gz

buildroot-external/package/python-ovos-plugin-manager/python-ovos-plugin-manager.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_OVOS_PLUGIN_MANAGER_VERSION = dd745ba6e62533d8985041a63e1c9dba2f769072
+PYTHON_OVOS_PLUGIN_MANAGER_VERSION = f25b598f7a52d5a38b3403e9a0707758d7550de0
 PYTHON_OVOS_PLUGIN_MANAGER_SITE = $(call github,OpenVoiceOS,OVOS-plugin-manager,$(PYTHON_OVOS_PLUGIN_MANAGER_VERSION))
 PYTHON_OVOS_PLUGIN_MANAGER_SETUP_TYPE = setuptools
 PYTHON_OVOS_PLUGIN_MANAGER_LICENSE_FILES = LICENSE

buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.hash

@@ -1 +1 @@
-sha256  ed6afd919d520a98c192f6eb0e7473bdbd943bba7251f341f7da6321e3ac536e  python-ovos-skill-manager-04102cc75c8777085a3304bb0a3023fb46891710.tar.gz
+sha256  9181142eb9d84eb523f210a0f9e26febf4536044b98f1adf69ab1a2fe14474f6  python-ovos-skill-manager-44103885ff80d3ed14bb96f6a3df3a17f854fd6e.tar.gz

buildroot-external/package/python-ovos-skill-manager/python-ovos-skill-manager.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_OVOS_SKILL_MANAGER_VERSION = 04102cc75c8777085a3304bb0a3023fb46891710
+PYTHON_OVOS_SKILL_MANAGER_VERSION = 44103885ff80d3ed14bb96f6a3df3a17f854fd6e
 PYTHON_OVOS_SKILL_MANAGER_SITE = $(call github,OpenVoiceOS,ovos_skill_manager,$(PYTHON_OVOS_SKILL_MANAGER_VERSION))
 PYTHON_OVOS_SKILL_MANAGER_SETUP_TYPE = setuptools
 PYTHON_OVOS_SKILL_MANAGER_LICENSE_FILES = LICENSE

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

@@ -1 +1 @@
-sha256  72c176f792c5ac0663dda5cfa22e955d60bb51683ed79bf0d81bf80ffe01b787  python-ovos-utils-68c577245c8c24ebfa96f5b1a906aa8d9b2ab917.tar.gz
+sha256  cbd51a050ed27d85feddb96e70212194af41ae2417587ac04d583b3fa50ca6ac  python-ovos-utils-cf10eb22668651fc0e5545b3145c29c61d4de305.tar.gz

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

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_OVOS_UTILS_VERSION = 68c577245c8c24ebfa96f5b1a906aa8d9b2ab917
+PYTHON_OVOS_UTILS_VERSION = cf10eb22668651fc0e5545b3145c29c61d4de305
 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/package/skill-ovos-homescreen/0001-drop-examples-skill.patch

@@ -0,0 +1,267 @@
+From ba22850b5b3e6941c3792ff1eabca8060b189ba6 Mon Sep 17 00:00:00 2001
+From: Aditya Mehra <aix.m@outlook.com>
+Date: Fri, 4 Nov 2022 11:11:22 +1030
+Subject: [PATCH 1/4] drop examples skill and use util from osm
+
+---
+ __init__.py | 43 ++++++++++---------------------------------
+ 1 file changed, 10 insertions(+), 33 deletions(-)
+
+diff --git a/__init__.py b/__init__.py
+index e8ed826..47c19d3 100644
+--- a/__init__.py
++++ b/__init__.py
+@@ -26,7 +26,7 @@
+ from ovos_utils.xdg_utils import xdg_config_home
+ from .skill import (DashboardHandler,
+                     CardGenerator)
+-
++from ovos_skills_manager.utils import get_skills_examples
+ 
+ class OVOSHomescreenSkill(MycroftSkill):
+     # The constructor of the skill, which calls MycroftSkill's constructor
+@@ -38,10 +38,9 @@ def __init__(self):
+         self.selected_wallpaper = None  # Get from config after __init__ is done
+         self.wallpaper_collection = []
+         self.rtlMode = None  # Get from config after __init__ is done
+-        
++
+         # Populate skill IDs to use for data sources
+         self.datetime_skill = None  # Get from config after __init__ is done
+-        self.skill_info_skill = None  # Get from config after __init__ is done
+         self.datetime_api = None
+         self.skill_info_api = None
+ 
+@@ -51,7 +50,7 @@ def __init__(self):
+         # Display Configuration Variables
+         self.wallpaper_rotation_enabled = False
+         self.dashboard_handler = None
+-        
++
+         # Media State Tracking For Widget
+         # Needed for setting qml button state
+         self.media_widget_player_state = None
+@@ -62,7 +61,6 @@ def initialize(self):
+         self.card_generator = CardGenerator(self.file_system.path, self.bus,
+                                             path.dirname(__file__))
+         self.datetime_api = None
+-        self.skill_info_api = None
+         self.loc_wallpaper_folder = self.file_system.path + '/wallpapers/'
+         self.selected_wallpaper = self.settings.get(
+             "wallpaper") or "default.jpg"
+@@ -72,9 +70,6 @@ def initialize(self):
+             "datetime_skill") or "skill-ovos-date-time.openvoiceos"
+         self.examples_enabled = 1 if self.settings.get(
+             "examples_enabled", True) else 0
+-        if self.examples_enabled:
+-            self.skill_info_skill = self.settings.get(
+-                "examples_skill") or "ovos-skills-info.openvoiceos"
+ 
+         now = datetime.datetime.now()
+         callback_time = datetime.datetime(
+@@ -124,7 +119,7 @@ def initialize(self):
+ 
+         if not self.file_system.exists("wallpapers"):
+             os.mkdir(path.join(self.file_system.path, "wallpapers"))
+-            
++
+         # Handler For Weather Response
+         self.bus.on("skill-ovos-weather.openvoiceos.weather.response", self.update_weather_response)
+ 
+@@ -176,17 +171,8 @@ def update_examples(self):
+         """
+         Loads or updates skill examples via the skill_info_api.
+         """
+-        if not self.skill_info_api:
+-            if not self.examples_enabled:
+-                LOG.warning("Examples are disabled in settings")
+-            else:
+-                LOG.warning("Requested update before skill_info API loaded")
+-                self._load_skill_apis()
+-        if self.skill_info_api:
+-            self.gui['skill_examples'] = {
+-                "examples": self.skill_info_api.skill_info_examples()}
+-        else:
+-            LOG.warning("No skill_info_api, skipping update")
++        skill_examples = get_skills_examples(randomize=True)
++        self.gui['skill_examples'] = {"examples": skill_examples}
+         self.gui['skill_info_enabled'] = self.examples_enabled
+ 
+     def update_dt(self):
+@@ -290,7 +276,7 @@ def check_wallpaper_path(self, wallpaper):
+             return self.def_wallpaper_folder
+         elif path.exists(file_loc_check):
+             return self.loc_wallpaper_folder
+-        
++
+     def check_wallpaper_rotation_config(self, message=None):
+         display_config_path_local = path.join(xdg_config_home(), "OvosDisplay.conf")
+         if path.exists(display_config_path_local):
+@@ -329,13 +315,6 @@ def _load_skill_apis(self):
+         """
+         Loads weather, date/time, and examples skill APIs
+         """
+-        
+-        try:
+-            if not self.skill_info_api:
+-                self.skill_info_api = SkillApi.get(self.skill_info_skill) or None
+-        except Exception as e:
+-            LOG.error(f"Failed To Import OVOS Info Skill: {e}")
+-
+         # Import Date Time Skill As Date Time Provider
+         try:
+             if not self.datetime_api:
+@@ -361,7 +340,7 @@ def _split_month_string(self, month_date: str) -> list:
+ 
+     #####################################################################
+     # Build Voice Applications Model
+-    
++
+     def find_icon_full_path(self, icon_name):
+         localuser = environ.get('USER')
+         folder_search_paths = ["/usr/share/icons/", "/usr/local/share/icons/",
+@@ -387,7 +366,7 @@ def parse_desktop_file(self, file_path):
+ 
+                 with open(file_path, "r") as f:
+                     file_contents = f.read()
+-                    
++
+                     name_start = file_contents.find("Name=")
+                     name_end = file_contents.find("\n", name_start)
+                     name = file_contents[name_start + 5:name_end]
+@@ -415,7 +394,7 @@ def parse_desktop_file(self, file_path):
+                                                11:categories_end]
+ 
+                     categories_list = categories.split(";")
+-                    
++
+                     if "VoiceApp" in categories_list:
+                         app_entry = {
+                             "name": name,
+@@ -542,8 +521,6 @@ def get_dashboard_cards(self, message=None):
+         cards = self.dashboard_handler.get_collection()
+         collection = {"collection": cards}
+         return collection
+-    
+-
+ 
+ 
+ def create_skill():
+
+From 06e23d0a7c7085025e06b036b722e7a4d3a492ad Mon Sep 17 00:00:00 2001
+From: Aditya Mehra <aix.m@outlook.com>
+Date: Fri, 4 Nov 2022 11:56:00 +1030
+Subject: [PATCH 2/4] restore examples skill api optionally
+
+---
+ __init__.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/__init__.py b/__init__.py
+index 47c19d3..bd24d29 100644
+--- a/__init__.py
++++ b/__init__.py
+@@ -41,6 +41,7 @@ def __init__(self):
+ 
+         # Populate skill IDs to use for data sources
+         self.datetime_skill = None  # Get from config after __init__ is done
++        self.skill_info_skill = None # Get from config after __init__ is done
+         self.datetime_api = None
+         self.skill_info_api = None
+ 
+@@ -70,6 +71,9 @@ def initialize(self):
+             "datetime_skill") or "skill-ovos-date-time.openvoiceos"
+         self.examples_enabled = 1 if self.settings.get(
+             "examples_enabled", True) else 0
++        if self.examples_enabled:
++            self.skill_info_skill = self.settings.get(
++                "examples_skill") or "ovos-skills-info.openvoiceos"
+ 
+         now = datetime.datetime.now()
+         callback_time = datetime.datetime(
+@@ -171,8 +175,13 @@ def update_examples(self):
+         """
+         Loads or updates skill examples via the skill_info_api.
+         """
+-        skill_examples = get_skills_examples(randomize=True)
+-        self.gui['skill_examples'] = {"examples": skill_examples}
++        if self.skill_info_api:
++            self.gui['skill_examples'] = {
++                "examples": self.skill_info_api.skill_info_examples()}
++        else:
++            skill_examples = get_skills_examples(randomize=True)
++            self.gui['skill_examples'] = {"examples": skill_examples}
++
+         self.gui['skill_info_enabled'] = self.examples_enabled
+ 
+     def update_dt(self):
+
+From bbe52c7bc3bae4e47e4ace2eaa810572c34cba8e Mon Sep 17 00:00:00 2001
+From: Aditya Mehra <aix.m@outlook.com>
+Date: Sat, 5 Nov 2022 11:03:37 +1030
+Subject: [PATCH 3/4] remove examples skill and depend on settings to get it
+
+---
+ __init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/__init__.py b/__init__.py
+index bd24d29..2dd2f4f 100644
+--- a/__init__.py
++++ b/__init__.py
+@@ -73,7 +73,7 @@ def initialize(self):
+             "examples_enabled", True) else 0
+         if self.examples_enabled:
+             self.skill_info_skill = self.settings.get(
+-                "examples_skill") or "ovos-skills-info.openvoiceos"
++                "examples_skill")
+ 
+         now = datetime.datetime.now()
+         callback_time = datetime.datetime(
+
+From 9decdde074d790e11433a3fc54a166a415c6b236 Mon Sep 17 00:00:00 2001
+From: builderjer <34875857+builderjer@users.noreply.github.com>
+Date: Mon, 7 Nov 2022 17:52:53 -0700
+Subject: [PATCH 4/4] Feat/random examples (#54)
+
+* Fix skill examples not rotating
+
+* added setting to randomize examples
+---
+ __init__.py      | 2 +-
+ settingsmeta.yml | 7 +++++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/__init__.py b/__init__.py
+index 2dd2f4f..d546d35 100644
+--- a/__init__.py
++++ b/__init__.py
+@@ -179,7 +179,7 @@ def update_examples(self):
+             self.gui['skill_examples'] = {
+                 "examples": self.skill_info_api.skill_info_examples()}
+         else:
+-            skill_examples = get_skills_examples(randomize=True)
++            skill_examples = get_skills_examples(randomize=self.settings.get("randomize_examples", True))
+             self.gui['skill_examples'] = {"examples": skill_examples}
+ 
+         self.gui['skill_info_enabled'] = self.examples_enabled
+diff --git a/settingsmeta.yml b/settingsmeta.yml
+index 88ee52f..f8eab4c 100644
+--- a/settingsmeta.yml
++++ b/settingsmeta.yml
+@@ -20,8 +20,15 @@ skillMetadata:
+           type: text
+           label: Wallpaper
+           value: default.jpg
++    - name: Examples
++      fields:
+         - name: examples_enabled
+           type: bool
+           label: Enable Examples
+           value: true
++        - name: randomize_examples
++          type: bool
++          label: Randomize Example Entries
++          value: true
++
+ 

buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/pulseaudio.service

@@ -0,0 +1 @@
+../../../../../../usr/lib/systemd/user/pulseaudio.service

buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/sockets.target.wants/pulseaudio.socket

@@ -0,0 +1 @@
+../../../../../../usr/lib/systemd/user/pulseaudio.socket

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

@@ -3,13 +3,13 @@ enable hostname.service
 enable sshd.service
 enable brcm_bt.service
 enable bluetooth.service
-enable pulseaudio.service
 enable avahi-daemon.service
 enable NetworkManager.service
 enable getty@tty1.service
 enable ovos-splash-start.service
 enable ovos-splash-systemd.service
 
+disable pulseaudio.service
 disable getty@.service
 disable ovos-splash-quit.service
 disable mosquitto.service

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

@@ -1,5 +1,5 @@
-disable pulseaudio.service
-disable pulseaudio.socket
+enable pulseaudio.service
+enable pulseaudio.socket
 
 enable mycroft.service
 enable mycroft-messagebus.service