From aa4768e428dae4ab30753d7442c0ef2461c930f7 Mon Sep 17 00:00:00 2001
From: Tim Curtis <tim@moodeaudio.org>
Date: Fri, 13 Dec 2024 16:24:58 -0500
Subject: [PATCH] [per-config] Leave DSI controls enabled

---
 www/per-config.php            |  3 +--
 www/templates/per-config.html | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/www/per-config.php b/www/per-config.php
index 08933a17..b1d5bf79 100644
--- a/www/per-config.php
+++ b/www/per-config.php
@@ -252,6 +252,7 @@
 
     // DSI DISPLAYS (PI TOUCH1/TOUCH2)
 
+    $_dsi_ctl_disable = $_SESSION['dsi_scn_type'] == 'none' ? 'disabled' : '';
     // NOTE: The option 'none' is used in xinitrc to determine whether HDMI or DSI configuration is used
     $_select['dsi_scn_type'] .= "<option value=\"none\" " . (($_SESSION['dsi_scn_type'] == 'none') ? "selected" : "") . ">None</option>\n";
     $_select['dsi_scn_type'] .= "<option value=\"1\" " . (($_SESSION['dsi_scn_type'] == '1') ? "selected" : "") . ">Pi Touch 1</option>\n";
@@ -264,10 +265,8 @@
 	//$_select['pixel_aspect_ratio'] .= "<option value=\"Default\" " . (($_SESSION['pixel_aspect_ratio'] == 'Default') ? "selected" : "") . ">Default</option>\n";
 	//$_select['pixel_aspect_ratio'] .= "<option value=\"Square\" " . (($_SESSION['pixel_aspect_ratio'] == 'Square') ? "selected" : "") . ">Square</option>\n";
 
-    $_dsi_scn_brightness_disable = $_SESSION['dsi_scn_type'] == 'none' ? 'disabled' : '';
     $_select['dsi_scn_brightness'] = $_SESSION['dsi_scn_brightness'];
 
-    $_dsi_scn_rotate_disable = $_SESSION['dsi_scn_type'] == 'none' ? 'disabled' : '';
     if ($_SESSION['dsi_scn_type'] == '1' || $_SESSION['dsi_scn_type'] == 'none') {
         $_dsi_scn_brightness_min = '0';
         $_dsi_scn_brightness_max = '255';
diff --git a/www/templates/per-config.html b/www/templates/per-config.html
index f18124b1..ca82ec6a 100644
--- a/www/templates/per-config.html
+++ b/www/templates/per-config.html
@@ -154,7 +154,7 @@ <h1 class="per-config">Peripherals</h1>
 
 			<label class="control-label" for="dsi-scn-type">Type</label>
 			<div class="controls">
-				<select id="dsi-scn-type" class="config-select-large" name="dsi_scn_type" onchange="autoClick('#btn-set-dsi-scn-type');" $_ctl_disable>
+				<select id="dsi-scn-type" class="config-select-large" name="dsi_scn_type" onchange="autoClick('#btn-set-dsi-scn-type');">
 					$_select[dsi_scn_type]
 				</select>
 				<button id="btn-set-dsi-scn-type" class="hide btn btn-primary btn-small config-btn-set btn-submit" type="submit" name="update_dsi_scn_type" value="novalue" $_ctl_disable><i class="fa fa-solid fa-sharp fa-arrow-turn-down-left"></i></button>
@@ -162,16 +162,16 @@ <h1 class="per-config">Peripherals</h1>
 
 			<label class="control-label" for="dsi-port">DSI port</label>
 			<div class="controls">
-				<select id="dsi-port" class="config-select-large" name="dsi_port" onchange="autoClick('#btn-set-dsi-port');" $_ctl_disable>
+				<select id="dsi-port" class="config-select-large" name="dsi_port" onchange="autoClick('#btn-set-dsi-port');" $_dsi_ctl_disable>
 					$_select[dsi_port]
 				</select>
-				<button id="btn-set-dsi-port" class="hide btn btn-primary btn-small config-btn-set btn-submit" type="submit" name="update_dsi_port" value="novalue" $_ctl_disable><i class="fa fa-solid fa-sharp fa-arrow-turn-down-left"></i></button>
+				<button id="btn-set-dsi-port" class="hide btn btn-primary btn-small config-btn-set btn-submit" type="submit" name="update_dsi_port" value="novalue" $_dsi_ctl_disable><i class="fa fa-solid fa-sharp fa-arrow-turn-down-left"></i></button>
 			</div>
 
 			<label class="control-label" for="dsi-scn-brightness">Brightness</label>
 			<div class="controls">
-            	<input class="config-input-large" type="number" maxlength="3" min="$_dsi_scn_brightness_min" max="$_dsi_scn_brightness_max" id="dsi-scn-brightness" name="dsi_scn_brightness" value="$_select[dsi_scn_brightness]" $_ctl_disable $_dsi_scn_brightness_disable>
-				<button class="btn btn-primary btn-small config-btn-set btn-submit" type="submit" name="update_dsi_scn_brightness" value="novalue" $_ctl_disable $_dsi_scn_brightness_disable><i class="fa fa-solid fa-sharp fa-arrow-turn-down-left"></i></button>
+            	<input class="config-input-large" type="number" maxlength="3" min="$_dsi_scn_brightness_min" max="$_dsi_scn_brightness_max" id="dsi-scn-brightness" name="dsi_scn_brightness" value="$_select[dsi_scn_brightness]" $_dsi_ctl_disable>
+				<button class="btn btn-primary btn-small config-btn-set btn-submit" type="submit" name="update_dsi_scn_brightness" value="novalue" $_dsi_ctl_disable><i class="fa fa-solid fa-sharp fa-arrow-turn-down-left"></i></button>
 				<span class="config-help-static">
 					Touch1: 0-255, Touch2: 1-31
                 </span>
@@ -192,10 +192,10 @@ <h1 class="per-config">Peripherals</h1>
 
 			<label class="control-label" for="dsi-scn-rotate">Rotate</label>
 			<div class="controls">
-				<select id="dsi-scn-rotate" class="config-select-large" name="dsi_scn_rotate" onchange="autoClick('#btn-set-dsi-scn-rotate');" $_ctl_disable $_dsi_scn_rotate_disable>
+				<select id="dsi-scn-rotate" class="config-select-large" name="dsi_scn_rotate" onchange="autoClick('#btn-set-dsi-scn-rotate');" $_dsi_ctl_disable>
 					$_select[dsi_scn_rotate]
 				</select>
-				<button id="btn-set-dsi-scn-rotate" class="hide btn btn-primary btn-small config-btn-set btn-submit" type="submit" name="update_dsi_scn_rotate" value="novalue" $_ctl_disable $_dsi_scn_rotate_disable><i class="fa fa-solid fa-sharp fa-arrow-turn-down-left"></i></button>
+				<button id="btn-set-dsi-scn-rotate" class="hide btn btn-primary btn-small config-btn-set btn-submit" type="submit" name="update_dsi_scn_rotate" value="novalue" $_dsi_ctl_disable><i class="fa fa-solid fa-sharp fa-arrow-turn-down-left"></i></button>
 			</div>
 		</div>