From de12e1cda8078a2cc0e4854037caefa768cb7dd2 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Tue, 23 Apr 2024 09:46:11 +0000
Subject: [PATCH] [All] More bumps and fixes all over the codebase to get back
into shape
---
buildroot | 2 +-
buildroot-external/Config.in | 1 -
.../usr/lib/udev/rules.d/91-vocalfusion.rules | 4 +-
.../rootfs-overlay/usr/libexec/ovos-i2csound | 95 +++++++++++++++++--
.../profile-sets/{xvf3510.conf => sj201.conf} | 0
buildroot-external/configs/rpi4_64_defconfig | 3 +
.../package/libgpiod2/Config.in | 27 ------
.../package/libgpiod2/libgpiod2.hash | 4 -
.../package/libgpiod2/libgpiod2.mk | 30 ------
9 files changed, 93 insertions(+), 73 deletions(-)
rename buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/share/alsa-card-profile/mixer/profile-sets/{xvf3510.conf => sj201.conf} (100%)
delete mode 100644 buildroot-external/package/libgpiod2/Config.in
delete mode 100644 buildroot-external/package/libgpiod2/libgpiod2.hash
delete mode 100644 buildroot-external/package/libgpiod2/libgpiod2.mk
diff --git a/buildroot b/buildroot
index 2ea8cb50..45464c7c 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 2ea8cb5076fa06c656096868b9e18fbd2ff52c70
+Subproject commit 45464c7c1a5b15493545bd784629440f1db7d381
diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in
index 2e55c80a..0ee45a27 100644
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -93,7 +93,6 @@ menu "KDE Framework and Plasma"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-threadweaver/Config.in"
endmenu
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/ksm-preload/Config.in"
- source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/libgpiod2/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/libre/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/librem/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/lottie-qml/Config.in"
diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/lib/udev/rules.d/91-vocalfusion.rules b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/lib/udev/rules.d/91-vocalfusion.rules
index 7c18c0c8..014da27d 100644
--- a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/lib/udev/rules.d/91-vocalfusion.rules
+++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/lib/udev/rules.d/91-vocalfusion.rules
@@ -3,9 +3,9 @@ ACTION!="change", GOTO="vocalfusion_end"
KERNEL!="card*", GOTO="vocalfusion_end"
# PulseAudio profile sets
-ATTR{id}=="sndxmosvocalfus",ENV{PULSE_PROFILE_SET}="xvf3510.conf"
+ATTR{id}=="sj201",ENV{PULSE_PROFILE_SET}="sj201.conf"
# ALSA profile sets
-ATTR{id}=="sndxmosvocalfus",ENV{ACP_PROFILE_SET}="xvf3510.conf"
+ATTR{id}=="sj201",ENV{ACP_PROFILE_SET}="sj201.conf"
LABEL="vocalfusion_end"
diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/libexec/ovos-i2csound b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/libexec/ovos-i2csound
index 171ea16b..3182e5f1 100755
--- a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/libexec/ovos-i2csound
+++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/libexec/ovos-i2csound
@@ -15,6 +15,15 @@
# limitations under the License.
##########################################################################
+# Define a list of valid boards
+declare -A boards=(
+ [RPI3]="Pi 3"
+ [RPI4]="Pi 4"
+ [RPI5]="Pi 5"
+)
+
+declare board_result
+
# Define a list of device names and their I2C addresses
declare -A devices=(
[WM8XXX]=1a
@@ -38,8 +47,23 @@ detect_i2c_device() {
fi
}
+# Gets the board version
+get_board_version() {
+ v=$(tr -d '\0'