From 46904149bcaf7d0f4452ada4b775974eba442b42 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Wed, 4 Jan 2023 09:14:32 +0100
Subject: [PATCH] Get Mark2 retail version working + other tweaks
---
buildroot-external/Config.in | 3 +++
.../board/raspberrypi/config_3_64bit.txt | 5 ++++-
.../board/raspberrypi/config_4_64bit.txt | 13 ++++++++-----
buildroot-external/configs/rpi3_64-gui_defconfig | 4 +++-
buildroot-external/configs/rpi4_64-gui_defconfig | 4 +++-
.../package/python-neon-phal-plugin-fan/Config.in | 6 ++++++
.../python-neon-phal-plugin-fan.hash | 1 +
.../python-neon-phal-plugin-fan.mk | 12 ++++++++++++
.../python-neon-phal-plugin-linear-led/Config.in | 6 ++++++
.../python-neon-phal-plugin-linear-led.hash | 1 +
.../python-neon-phal-plugin-linear-led.mk | 12 ++++++++++++
.../python-neon-phal-plugin-switches/Config.in | 6 ++++++
.../python-neon-phal-plugin-switches.hash | 1 +
.../python-neon-phal-plugin-switches.mk | 12 ++++++++++++
14 files changed, 78 insertions(+), 8 deletions(-)
create mode 100644 buildroot-external/package/python-neon-phal-plugin-fan/Config.in
create mode 100644 buildroot-external/package/python-neon-phal-plugin-fan/python-neon-phal-plugin-fan.hash
create mode 100644 buildroot-external/package/python-neon-phal-plugin-fan/python-neon-phal-plugin-fan.mk
create mode 100644 buildroot-external/package/python-neon-phal-plugin-linear-led/Config.in
create mode 100644 buildroot-external/package/python-neon-phal-plugin-linear-led/python-neon-phal-plugin-linear-led.hash
create mode 100644 buildroot-external/package/python-neon-phal-plugin-linear-led/python-neon-phal-plugin-linear-led.mk
create mode 100644 buildroot-external/package/python-neon-phal-plugin-switches/Config.in
create mode 100644 buildroot-external/package/python-neon-phal-plugin-switches/python-neon-phal-plugin-switches.hash
create mode 100644 buildroot-external/package/python-neon-phal-plugin-switches/python-neon-phal-plugin-switches.mk
diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in
index 6f23f57c..fe61eecd 100644
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -187,6 +187,9 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-multi-key-dict/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-mycroft-messagebus-client/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-lang-plugin-libretranslate/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-phal-plugin-fan/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-phal-plugin-linear-led/Config.in"
+ source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-phal-plugin-switches/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-solver-plugin-ddg/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-solver-plugin-wikipedia/Config.in"
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-neon-solver-plugin-wolfram-alpha/Config.in"
diff --git a/buildroot-external/board/raspberrypi/config_3_64bit.txt b/buildroot-external/board/raspberrypi/config_3_64bit.txt
index ce2bdb93..b174030c 100644
--- a/buildroot-external/board/raspberrypi/config_3_64bit.txt
+++ b/buildroot-external/board/raspberrypi/config_3_64bit.txt
@@ -29,7 +29,7 @@ max_framebuffers=2
# How much memory in MB to assign to the GPU on Pi models having
# 256, 512 or 1024 MB total memory
-gpu_mem=256
+gpu_mem=128
gpu_mem_256=128
gpu_mem_512=128
gpu_mem_1024=128
@@ -43,6 +43,9 @@ dtoverlay=krnbt=on
# Enable the onboard soundcard
dtparam=audio=on
+# Enable the hardware random generator
+dtparam=random=on
+
# Enable camera driver
# dtoverlay=imx219
# dtoverlay=ov5647
diff --git a/buildroot-external/board/raspberrypi/config_4_64bit.txt b/buildroot-external/board/raspberrypi/config_4_64bit.txt
index 9a9a9fce..72b2ddff 100644
--- a/buildroot-external/board/raspberrypi/config_4_64bit.txt
+++ b/buildroot-external/board/raspberrypi/config_4_64bit.txt
@@ -15,7 +15,7 @@ kernel=Image
# Disable overscan assuming the display supports displaying the full resolution
# If the text shown on the screen disappears off the edge, comment this out
-# disable_overscan=1
+disable_overscan=1
# Automatically load overlays for detected DSI displays
display_auto_detect=1
@@ -32,7 +32,7 @@ max_framebuffers=2
# How much memory in MB to assign to the GPU on Pi models having
# 256, 512 or 1024 MB total memory
-gpu_mem=256
+gpu_mem=128
gpu_mem_256=128
gpu_mem_512=128
gpu_mem_1024=128
@@ -46,6 +46,9 @@ dtoverlay=krnbt=on
# Enable the onboard soundcard
dtparam=audio=on
+# Enable the hardware random generator
+dtparam=random=on
+
# Enable camera driver
# dtoverlay=imx219
# dtoverlay=ov5647
@@ -61,8 +64,8 @@ dtoverlay=i2s-mmap
dtparam=i2s=on
dtparam=spi=on
-# enable 64bits support
-arm_64bit=1
-
# Enable boost from 1.5Ghz to 1.8Ghz on compatible models
arm_boost=1
+
+# enable 64bits support
+arm_64bit=1
diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig
index ca016af4..f2cde0aa 100644
--- a/buildroot-external/configs/rpi3_64-gui_defconfig
+++ b/buildroot-external/configs/rpi3_64-gui_defconfig
@@ -633,6 +633,9 @@ BR2_PACKAGE_PYTHON_MSM=y
BR2_PACKAGE_PYTHON_MULTI_KEY_DICT=y
BR2_PACKAGE_PYTHON_MYCROFT_MESSAGEBUS_CLIENT=y
BR2_PACKAGE_PYTHON_NEON_LANG_PLUGIN_LIBRETRANSLATE=y
+BR2_PACKAGE_PYTHON_NEON_PHAL_PLUGIN_FAN=y
+BR2_PACKAGE_PYTHON_NEON_PHAL_PLUGIN_LINEAR_LED=y
+BR2_PACKAGE_PYTHON_NEON_PHAL_PLUGIN_SWITCHES=y
BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_DDG=y
BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_WIKIPEDIA=y
BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_WOLFRAM_ALPHA=y
@@ -712,7 +715,6 @@ BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_DASHBOARD=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_DISPLAY_MANAGER_IPC=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_GUI_NETWORK_CLIENT=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_IPGEO=y
-BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_MK2=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_NETWORK_MANAGER=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_NOTIFICATION_WIDGETS=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_RESPEAKER_2MIC=y
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index 5de423ac..4bbc276a 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -633,6 +633,9 @@ BR2_PACKAGE_PYTHON_MSM=y
BR2_PACKAGE_PYTHON_MULTI_KEY_DICT=y
BR2_PACKAGE_PYTHON_MYCROFT_MESSAGEBUS_CLIENT=y
BR2_PACKAGE_PYTHON_NEON_LANG_PLUGIN_LIBRETRANSLATE=y
+BR2_PACKAGE_PYTHON_NEON_PHAL_PLUGIN_FAN=y
+BR2_PACKAGE_PYTHON_NEON_PHAL_PLUGIN_LINEAR_LED=y
+BR2_PACKAGE_PYTHON_NEON_PHAL_PLUGIN_SWITCHES=y
BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_DDG=y
BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_WIKIPEDIA=y
BR2_PACKAGE_PYTHON_NEON_SOLVER_PLUGIN_WOLFRAM_ALPHA=y
@@ -712,7 +715,6 @@ BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_DASHBOARD=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_DISPLAY_MANAGER_IPC=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_GUI_NETWORK_CLIENT=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_IPGEO=y
-BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_MK2=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_NETWORK_MANAGER=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_NOTIFICATION_WIDGETS=y
BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_RESPEAKER_2MIC=y
diff --git a/buildroot-external/package/python-neon-phal-plugin-fan/Config.in b/buildroot-external/package/python-neon-phal-plugin-fan/Config.in
new file mode 100644
index 00000000..b574c482
--- /dev/null
+++ b/buildroot-external/package/python-neon-phal-plugin-fan/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_NEON_PHAL_PLUGIN_FAN
+ bool "python-neon-phal-plugin-fan"
+ help
+ PHAL Fan plugin
+
+ https://github.com/NeonGeckoCom/neon-phal-plugin-fan
diff --git a/buildroot-external/package/python-neon-phal-plugin-fan/python-neon-phal-plugin-fan.hash b/buildroot-external/package/python-neon-phal-plugin-fan/python-neon-phal-plugin-fan.hash
new file mode 100644
index 00000000..53c7ce8a
--- /dev/null
+++ b/buildroot-external/package/python-neon-phal-plugin-fan/python-neon-phal-plugin-fan.hash
@@ -0,0 +1 @@
+sha256 f4c22378397e77d8749cd2b7b6a843f2133ac6c8c6869bd98057298bacbe3f35 python-neon-phal-plugin-fan-47b7030a0ec302146542179d13b12a61a3d95b4d.tar.gz
diff --git a/buildroot-external/package/python-neon-phal-plugin-fan/python-neon-phal-plugin-fan.mk b/buildroot-external/package/python-neon-phal-plugin-fan/python-neon-phal-plugin-fan.mk
new file mode 100644
index 00000000..e44ca441
--- /dev/null
+++ b/buildroot-external/package/python-neon-phal-plugin-fan/python-neon-phal-plugin-fan.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-neon-phal-plugin-fan
+#
+################################################################################
+
+PYTHON_NEON_PHAL_PLUGIN_FAN_VERSION = 47b7030a0ec302146542179d13b12a61a3d95b4d
+PYTHON_NEON_PHAL_PLUGIN_FAN_SITE = $(call github,NeonGeckoCom,neon-phal-plugin-fan,$(PYTHON_NEON_PHAL_PLUGIN_FAN_VERSION))
+PYTHON_NEON_PHAL_PLUGIN_FAN_SETUP_TYPE = setuptools
+PYTHON_NEON_PHAL_PLUGIN_FAN_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot-external/package/python-neon-phal-plugin-linear-led/Config.in b/buildroot-external/package/python-neon-phal-plugin-linear-led/Config.in
new file mode 100644
index 00000000..bcd5c223
--- /dev/null
+++ b/buildroot-external/package/python-neon-phal-plugin-linear-led/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_NEON_PHAL_PLUGIN_LINEAR_LED
+ bool "python-neon-phal-plugin-linear-led"
+ help
+ PHAL Linear LED plugin
+
+ https://github.com/NeonGeckoCom/neon-phal-plugin-linear_led
diff --git a/buildroot-external/package/python-neon-phal-plugin-linear-led/python-neon-phal-plugin-linear-led.hash b/buildroot-external/package/python-neon-phal-plugin-linear-led/python-neon-phal-plugin-linear-led.hash
new file mode 100644
index 00000000..f4d46c79
--- /dev/null
+++ b/buildroot-external/package/python-neon-phal-plugin-linear-led/python-neon-phal-plugin-linear-led.hash
@@ -0,0 +1 @@
+sha256 04a0e03c8ae90d87713492d2a2e8a28391eede91df3bb311d591394247647c73 python-neon-phal-plugin-linear-led-ee43c88355ad800fb0095490b19464f8adb55158.tar.gz
diff --git a/buildroot-external/package/python-neon-phal-plugin-linear-led/python-neon-phal-plugin-linear-led.mk b/buildroot-external/package/python-neon-phal-plugin-linear-led/python-neon-phal-plugin-linear-led.mk
new file mode 100644
index 00000000..271fa798
--- /dev/null
+++ b/buildroot-external/package/python-neon-phal-plugin-linear-led/python-neon-phal-plugin-linear-led.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-neon-phal-plugin-linear-led
+#
+################################################################################
+
+PYTHON_NEON_PHAL_PLUGIN_LINEAR_LED_VERSION = ee43c88355ad800fb0095490b19464f8adb55158
+PYTHON_NEON_PHAL_PLUGIN_LINEAR_LED_SITE = $(call github,NeonGeckoCom,neon-phal-plugin-linear_led,$(PYTHON_NEON_PHAL_PLUGIN_LINEAR_LED_VERSION))
+PYTHON_NEON_PHAL_PLUGIN_LINEAR_LED_SETUP_TYPE = setuptools
+PYTHON_NEON_PHAL_PLUGIN_LINEAR_LED_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/buildroot-external/package/python-neon-phal-plugin-switches/Config.in b/buildroot-external/package/python-neon-phal-plugin-switches/Config.in
new file mode 100644
index 00000000..39174fa1
--- /dev/null
+++ b/buildroot-external/package/python-neon-phal-plugin-switches/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_NEON_PHAL_PLUGIN_SWITCHES
+ bool "python-neon-phal-plugin-switches"
+ help
+ PHAL Switches plugin
+
+ https://github.com/NeonGeckoCom/neon-phal-plugin-switches
diff --git a/buildroot-external/package/python-neon-phal-plugin-switches/python-neon-phal-plugin-switches.hash b/buildroot-external/package/python-neon-phal-plugin-switches/python-neon-phal-plugin-switches.hash
new file mode 100644
index 00000000..0e97ed69
--- /dev/null
+++ b/buildroot-external/package/python-neon-phal-plugin-switches/python-neon-phal-plugin-switches.hash
@@ -0,0 +1 @@
+sha256 befc25c749c7ec85e5c92cf9693fc23d047c715db5e5f81d5f499bc1aa3c534a python-neon-phal-plugin-switches-e5f7fd5d1e8f2effadbe76e13b03e7d03006ab32.tar.gz
diff --git a/buildroot-external/package/python-neon-phal-plugin-switches/python-neon-phal-plugin-switches.mk b/buildroot-external/package/python-neon-phal-plugin-switches/python-neon-phal-plugin-switches.mk
new file mode 100644
index 00000000..a04a23ba
--- /dev/null
+++ b/buildroot-external/package/python-neon-phal-plugin-switches/python-neon-phal-plugin-switches.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# python-neon-phal-plugin-switches
+#
+################################################################################
+
+PYTHON_NEON_PHAL_PLUGIN_SWITCHES_VERSION = e5f7fd5d1e8f2effadbe76e13b03e7d03006ab32
+PYTHON_NEON_PHAL_PLUGIN_SWITCHES_SITE = $(call github,NeonGeckoCom,neon-phal-plugin-switches,$(PYTHON_NEON_PHAL_PLUGIN_SWITCHES_VERSION))
+PYTHON_NEON_PHAL_PLUGIN_SWITCHES_SETUP_TYPE = setuptools
+PYTHON_NEON_PHAL_PLUGIN_SWITCHES_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))