From 6945417d4713f0fe4d72ed30c8728ea9f1ebef5f Mon Sep 17 00:00:00 2001
From: nebhead <nebhead77@gmail.com>
Date: Fri, 15 Nov 2024 17:46:13 -0800
Subject: [PATCH] Bug Fixes: Wizard / Updater Manifest

1. Ensure that rpi-hardware-pwm is installed regardless of DC/AC fan support.  This missing module will cause the control script to crash/fail if not found.
2. Add GPIO4 to the Custom PCB configuration 1Wire selection.  This is default for the PCB 4.x.x board.
---
 .gitignore                    |  6 ++++++
 updater/updater_manifest.json |  6 +++---
 wizard/wizard_manifest.json   | 12 ++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 982d4076..f5a3f127 100755
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,9 @@ share/
 lib64
 
 pyvenv.cfg
+
+root-control.sh
+
+venv-desktop.sh
+
+venv-laptop.sh
diff --git a/updater/updater_manifest.json b/updater/updater_manifest.json
index e39216dc..84caa1ca 100644
--- a/updater/updater_manifest.json
+++ b/updater/updater_manifest.json
@@ -1,10 +1,10 @@
 {
   "metadata" : {
     "versions" : {
-      "server" : "1.8.7",
+      "server" : "1.8.8",
       "cookfile" : "1.5.0",
       "recipe" : "1.0.0",
-      "build" : 35
+      "build" : 36
     },
     "update_notes" : "",
     "update_warnings" : ""
@@ -112,7 +112,7 @@
           "command_list" : [["sudo", "cp", "./auto-install/supervisor/*.conf", "/etc/supervisor/conf.d"]]
         },
         "control": {
-          "py_dependencies": ["rpi_hardware_pwm", "scikit-learn==1.4.2"],
+          "py_dependencies": ["rpi-hardware-pwm", "scikit-learn==1.4.2"],
           "apt_dependencies": [],
           "command_list" : []
         }
diff --git a/wizard/wizard_manifest.json b/wizard/wizard_manifest.json
index 73544726..3651ee26 100644
--- a/wizard/wizard_manifest.json
+++ b/wizard/wizard_manifest.json
@@ -8,7 +8,7 @@
 				"default" : false,
 				"image" : "custom.png",
 				"reboot_required" : true,
-				"py_dependencies" : ["rpi_hardware_pwm"], 
+				"py_dependencies" : ["rpi-hardware-pwm"], 
 				"apt_dependencies" : [],
 				"command_list" : [["sudo", "python", "board-config.py", "-pwm", "-ow", "-bl", "-s", "-i"]],
 				"settings_dependencies" : {
@@ -142,7 +142,7 @@
 					"system_1wire" : {
 						"friendly_name" : "1Wire GPIO Pin",
 						"description" : "GPIO Pin for 1Wire bus/interface.  Used for DS18B20 sensors.",
-						"options" : { "None" : "None", "6" : "GPIO6", "12" : "GPIO12", "13" : "GPIO13", "16": "GPIO16", "19" : "GPIO19", "20" : "GPIO20", "21" : "GPIO21", "22" : "GPIO22", "23" : "GPIO23", "26" : "GPIO26", "27" : "GPIO27" },
+						"options" : { "None" : "None", "4" : "GPIO4", "6" : "GPIO6", "12" : "GPIO12", "13" : "GPIO13", "16": "GPIO16", "19" : "GPIO19", "20" : "GPIO20", "21" : "GPIO21", "22" : "GPIO22", "23" : "GPIO23", "26" : "GPIO26", "27" : "GPIO27" },
 						"settings" : ["platform", "system", "1WIRE"]
 					},
 					"real_hw" : {
@@ -160,7 +160,7 @@
 				"default" : false,
 				"image" : "pcb_2.00a.png",
 				"reboot_required" : true,
-				"py_dependencies" : [], 
+				"py_dependencies" : ["rpi-hardware-pwm"], 
 				"apt_dependencies" : [],
 				"command_list" : [["sudo", "python", "board-config.py", "-ow", "-s", "-i"]],
 				"settings_dependencies" : {
@@ -337,7 +337,7 @@
 				"default" : true,
 				"image" : "pcb_3.01a.png",
 				"reboot_required" : true,
-				"py_dependencies" : [], 
+				"py_dependencies" : ["rpi-hardware-pwm"], 
 				"apt_dependencies" : [],
 				"command_list" : [["sudo", "python", "board-config.py", "-ow", "-s", "-i"]],
 				"settings_dependencies" : {
@@ -520,7 +520,7 @@
 				"default" : false,
 				"image" : "pcb_pwm.png",
 				"reboot_required" : true,
-				"py_dependencies" : ["rpi_hardware_pwm"], 
+				"py_dependencies" : ["rpi-hardware-pwm"], 
 				"apt_dependencies" : [],
 				"command_list" : [["sudo", "python", "board-config.py", "-pwm", "-s", "-i"]],
 				"settings_dependencies" : {
@@ -705,7 +705,7 @@
 				"default" : false,
 				"image" : "pcb_4.x.x.png",
 				"reboot_required" : true,
-				"py_dependencies" : ["rpi_hardware_pwm"], 
+				"py_dependencies" : ["rpi-hardware-pwm"], 
 				"apt_dependencies" : [],
 				"command_list" : [["sudo", "python", "board-config.py", "-pwm", "-ow", "-bl", "-s", "-i", "-gs"]],
 				"settings_dependencies" : {