Skip to content

Commit

Permalink
Bug Fixes: Wizard / Updater Manifest
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
nebhead committed Nov 16, 2024
1 parent de5626b commit 6945417
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,9 @@ share/
lib64

pyvenv.cfg

root-control.sh

venv-desktop.sh

venv-laptop.sh
6 changes: 3 additions & 3 deletions updater/updater_manifest.json
Original file line number Diff line number Diff line change
@@ -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" : ""
Expand Down Expand Up @@ -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" : []
}
Expand Down
12 changes: 6 additions & 6 deletions wizard/wizard_manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" : {
Expand Down Expand Up @@ -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" : {
Expand All @@ -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" : {
Expand Down Expand Up @@ -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" : {
Expand Down Expand Up @@ -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" : {
Expand Down Expand Up @@ -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" : {
Expand Down

0 comments on commit 6945417

Please sign in to comment.