Several runtime optimizations to reduce CPU load and temperature and increase battery life

AdminInterface/www/admin.php

@@ -237,7 +237,7 @@ function write_json($data)
 		$change=3;
 		$CHANGE_TXT=$CHANGE_TXT."<li>Spotify Services are restarted</li>";
 		}
-		
+
 	if( $_POST['spotify_restart'] )
 		{
 		$command = "sudo /usr/local/bin/mupibox/./spotify_restartspotify_restart.sh";
@@ -323,7 +323,7 @@ function write_json($data)
 	</details>
 
 	<details id="backuprestore">
-		<summary><i class="fa-solid fa-download"></i> Backup and restore settings</summary>			
+		<summary><i class="fa-solid fa-download"></i> Backup and restore settings</summary>
 		<ul>
 			<li class="li_norm"><h2>Backup MuPiBox-settings</h2>
 				<p>Backup MuPiBox-Data (cover, mupiboxconfig.json and data.json):</p>
@@ -360,7 +360,7 @@ function write_json($data)
 			<li class="li_norm"><h2>IP Control Backend</h2>
 				<p>In some cases, the MuPiBox cannot communicate correctly via hostname. Try to activate this point, to set the communication to IP.</p>
 				<p>
-				<?php 
+				<?php
 				if( $data["mupibox"]["ip_control_backend"] )
 					{
 					$ip_control_backend_state="enabled";
@@ -369,12 +369,12 @@ function write_json($data)
 				else
 					{
 					$ip_control_backend_state="disabled";
-					$change_ip_control="enable";					
+					$change_ip_control="enable";
 					}
 
 				echo "IP Control Backend: <b>".$ip_control_backend_state."</b>";
 				?></p>
-				<input id="saveForm" class="button_text" type="submit" name="ip_control_backend" value="<?php print $change_ip_control; ?>" />																									
+				<input id="saveForm" class="button_text" type="submit" name="ip_control_backend" value="<?php print $change_ip_control; ?>" />
 			</li>
 			<li class="li_norm"><h2>Restart MuPiBox kiosk</h2>
 				<p>Restart chromium browser. </p>
@@ -490,8 +490,8 @@ function write_json($data)
 
 			</li>
 		</ul>
-	</details>	
-			
+	</details>
+
 	<details id="resetconfiguration">
 		<summary><i class="far fa-file-alt"></i> Reset configuration</summary>
 		<ul>

AdminInterface/www/network.php

@@ -23,7 +23,7 @@
 		exec($command, $output, $result );
 
 		$change=1;
-		if (file_exists("/tmp/driver-install.txt")) 
+		if (file_exists("/tmp/driver-install.txt"))
 			{
 			$CHANGE_TXT=$CHANGE_TXT."<li>Kernel-headers not installed. Please check correct arm_64bit-setting in /boot/config.txt (in V7, the setting must be 0).</li>";
 			}
@@ -47,7 +47,7 @@
 		exec("sudo systemctl disable mupi_vnc.service");
 		exec("sudo systemctl disable mupi_novnc.service");
 		exec("sudo apt-get remove x11vnc websockify -y");
-		exec("sudo pkill websockify");		
+		exec("sudo pkill websockify");
 		exec("sudo rm -R /usr/share/novnc");
 		exec("sudo su - -c \"/usr/bin/cat <<< $(/usr/bin/jq --arg v \"0\" '.tweaks.vnc = $v' /etc/mupibox/mupiboxconfig.json) >  /etc/mupibox/mupiboxconfig.json\"");
 		$change=1;
@@ -61,7 +61,7 @@
 		exec("sudo systemctl enable mupi_vnc.service");
 		exec("sudo systemctl enable mupi_novnc.service");
 		exec("sudo systemctl start mupi_vnc.service");
-		exec("sudo systemctl start mupi_novnc.service");		
+		exec("sudo systemctl start mupi_novnc.service");
 		exec("sudo su - -c \"/usr/bin/cat <<< $(/usr/bin/jq --arg v \"1\" '.tweaks.vnc = $v' /etc/mupibox/mupiboxconfig.json) >  /etc/mupibox/mupiboxconfig.json\"");
 		$change=1;
 		$CHANGE_TXT=$CHANGE_TXT."<li>VNC-Services enabled and started</li>";
@@ -81,7 +81,7 @@
 		$change=1;
 		$CHANGE_TXT=$CHANGE_TXT."<li>DHCP-Timeout set to default</li>";
 		}
-		
+
 	if( $_POST['change_samba'] == "enable & start" )
 		{
 		$command = "sudo apt-get install samba wsdd -y && sudo wget https://raw.githubusercontent.com/splitti/MuPiBox/main/config/templates/smb.conf -O /etc/samba/smb.conf && sudo systemctl enable smbd.service && sudo systemctl start smbd.service && (echo 'mupibox'; echo 'mupibox') | sudo smbpasswd -s -a 'dietpi'";
@@ -306,7 +306,7 @@
         <tr><td>Bitrate:</td><td><?php print $BITRATE ?></td></tr>
         </table>
 		</li></ul></details>
-		
+
 	<details id="deletewifi">
 		<summary><i class="fa-regular fa-trash-can"></i> Delete Wifi-Network</summary>
 
@@ -327,11 +327,11 @@
 			{
 				$connection=" [connected]";
 			}
-		else 
+		else
 			{
 				$connection="";
 			}
-		
+
 		echo "<input type=\"radio\" id=\"".$wifidetails[0]."\" name=\"wifinr\" value=\"".$wifidetails[0]."\"> ";
 		echo "<label for=\"".$wifidetails[0]."\"> ".$wifidetails[1].$connection."</label></input><br/>";
 		}
@@ -344,9 +344,7 @@
 		</li>
 	</ul>
 	</details>
-
-
-
+
 	<details id="addwifi">
 	<summary><i class="fa-solid fa-tower-broadcast"></i> Add Wifi-Network</summary>
 	<ul>
@@ -356,21 +354,21 @@
 
 	<?php
 	if ( $wifi_networks )
-		{	
+		{
 				?>
 				<li class="li_1">
 				<h2>SSID-Name</h2>
 
 				<div><select id="wifi_name" name="wifi_name" class="element text small">
-				
+
 				<?php
 				foreach($wifi_cleaned as $wifiname) {
 					print "<option value=\"". $wifiname . "\">" . $wifiname . "</option>";
 				}
 				?>
 				"</select></li>
 
-	<?php	
+	<?php
 		}
 	else
 		{
@@ -393,7 +391,6 @@
 	</ul>
 	</details>
 
-
 	<details id="miscwifioptions">
 		<summary><i class="fa-solid fa-toggle-off"></i> Misc Options</summary>
 
@@ -467,12 +464,12 @@
 		</li>
 		<li class="li_1"><h2>Install RTL88X2BU-Drivers</h2>
 			<p>
-			These drivers are for several network cards like these: 
+			These drivers are for several network cards like these:
 			<ul style="list-style-type:'• '; margin-left:20px;"><li>			<a href="https://amzn.to/3vj2Ubn" target="_blank">Referal link to Amazon.com (US)</a></li>
 			<li><a href="https://amzn.to/3U4ID3Z" target="_blank">Referal link to Amazon.de (GER)</a></li></ul>
 			</p>
 			<p>
-			
+
 			<?php
 			$path="/home/dietpi/.driver/network/88x2bu-20210702";
 		    if($path !== false AND is_dir($path))
@@ -491,7 +488,6 @@
 			<input id="saveForm" class="button_text" type="submit" name="RTL88X2BU" value="<?php print $change_rtl88x2bu; ?>" />
 		</li>
 
-
 	</ul>
 	</details>
 
@@ -501,7 +497,7 @@
 		<li class="li_1"><h2>DietPi-WiFi-Monitor</h2>
 			<p>Automatic reconnection to wifi, if signal is lost.</p>
 			<p>
-			<?php 
+			<?php
 			echo "DietPi-WiFi-Monitor Status: <b>".$wifi_monitor_state."</b>";
 			?>
 			</p>
@@ -510,7 +506,7 @@
 		<li class="li_1"><h2>Check for best wifi connection</h2>
 			<p>Checks the WiFi SSIDs in the area every 10 seconds and connects to the strongest SSID if this is stored in the configuration. May cause connection dropouts, but allows for quick switching in a multi-Wifi environment.</p>
 			<p>
-			<?php 
+			<?php
 			echo "Autoconnect-wifi: <b>".$wifi_autoconnect_state."</b>";
 			?>
 			</p>
@@ -521,15 +517,15 @@
 			<p>Disabling this service will result in faster boot time.</p>
 			<p>New: The package wsdd (Web-Service-Discovery-Daemon) will be also installed. </p>
 			<p>
-			<?php 
+			<?php
 			echo "Samba-Service Status: <b>".$samba_state."</b>";
 			?>
 			</p>
 			<input id="saveForm" class="button_text" type="submit" name="change_samba" value="<?php print $change_samba; ?>" />
 		</li>
 		<li class="li_1"><h2>FTP-Server</h2>
 			<p>
-			<?php 
+			<?php
 			echo "FTP-Service Status: <b>".$ftp_state."</b>";
 			?>
 			</p>
@@ -540,7 +536,7 @@
 			Enables or disables VNC-Service! The service allows remote access to the browser (Display). Usage recommended for Pi version 3 and up. Usually doesn't work with onboard WiFi.
 			</p>
 			<p>
-			<?php 
+			<?php
 			echo "VNC-Service Status: <b>".$vnc_state."</b>";
 			?>
 			</p>
@@ -551,5 +547,5 @@
 </form>
 
 <?php
-        include ('includes/footer.php');
+	include ('includes/footer.php');
 ?>

README.md

@@ -4,7 +4,7 @@
 [![Discord](https://img.shields.io/discord/879874342203306005?logo=Discord&link=https%3A%2F%2Fdiscord.gg%2F4EjCgpCbbe)](https://discord.gg/4EjCgpCbbe) [![Static Badge](https://img.shields.io/badge/Website-Website?logo=Google%20Chrome&logoColor=%23ffffff&labelColor=%234285F4&color=%234285F4&link=https%3A%2F%2Fmupibox.de)](https://mupibox.de) [![Static Badge](https://img.shields.io/badge/Youtube-Youtube?logo=youtube&labelColor=red&color=red&link=https%3A%2F%2Fwww.youtube.com%2Fchannel%2FUCiqTXPBQLYgTB4uPBKzLENA)](https://www.youtube.com/channel/UCiqTXPBQLYgTB4uPBKzLENA) [![Static Badge](https://img.shields.io/badge/Facebook-Facebook?logo=facebook&labelColor=blue&color=blue&link=https%3A%2F%2Fwww.facebook.com%2Fmupibox)](https://www.facebook.com/mupibox) [![Static Badge](https://img.shields.io/badge/Paypal-Donate?logo=Paypal&label=Donate&link=https%3A%2F%2Fpaypal.me%2FDonateMuPiBox)](https://paypal.me/DonateMuPiBox)
 
 MuPiBox is an easy to use music player, controlled via touch display. You can use local music, Spotify and streams.
-![MuPiBox](media/images/splash.png "MuPiBox") 
+![MuPiBox](media/images/splash.png "MuPiBox")
 ## Website & Support
 For more information:
 - visit https://mupibox.de 

autosetup/autosetup.sh

@@ -54,9 +54,9 @@ rm -Rf /home/dietpi/mupibox.zip /home/dietpi/MuPiBox-* >&3 2>&3
 	before=$(date +%s)
 	rm -f /usr/bin/jq >&3 2>&3
 	if [ "$(getconf LONG_BIT)" = "32" ]; then
-		wget -q -O /usr/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.8.1/jq-linux-armhf >&3 2>&3
+		wget -q -O /usr/bin/jq https://github.com/jqlang/jq/releases/latest/download/jq-linux-armhf >&3 2>&3
 	else
-		wget -q -O /usr/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.8.1/jq-linux-arm64 >&3 2>&3
+		wget -q -O /usr/bin/jq https://github.com/jqlang/jq/releases/latest/download/jq-linux-arm64 >&3 2>&3
 	fi
 	chmod 755 /usr/bin/jq >&3 2>&3
 	after=$(date +%s)

autosetup/autostart.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 echo "echo '' && echo '' && echo 'Please wait, MuPiBox-Installer starts soon...' && sleep 10" >> /home/dietpi/.bashrc
-echo "cd; curl -L https://raw.githubusercontent.com/splitti/MuPiBox/main/autosetup/autosetup.sh | sudo bash" >> /home/dietpi/.bashrc
+echo "cd; curl -L https://raw.githubusercontent.com/splitti/MuPiBox/main/autosetup/autosetup.sh | bash" >> /home/dietpi/.bashrc
 reboot

config/templates/.bashrc

@@ -203,4 +203,4 @@ clear
 # Failsafe: Never load this script in non-interactive shells, e.g. SFTP, SCP or rsync
 [[ -t 0 && $- == *'i'* ]] || return 0
 
-mupi-info
+mupi-info

config/templates/crontab.template

@@ -1,31 +1,24 @@
 # Edit this file to introduce tasks to be run by cron.
-# 
+#
 # Each task to run has to be defined through a single line
 # indicating with different fields when the task will be run
 # and what command to run for the task
-# 
+#
 # To define the time you can provide concrete values for
 # minute (m), hour (h), day of month (dom), month (mon),
 # and day of week (dow) or use '*' in these fields (for 'any').
-# 
+#
 # Notice that tasks will be started based on the cron's system
 # daemon's notion of time and timezones.
-# 
+#
 # Output of the crontab jobs (including errors) is sent through
 # email to the user the crontab file belongs to (unless redirected).
-# 
+#
 # For example, you can run a backup of all your user accounts
 # at 5 a.m every week with:
 # 0 5 * * 1 tar -zcf /var/backups/home.tgz /home/
-# 
+#
 # For more information see the manual pages of crontab(5) and cron(8)
-# 
+#
 # m h  dom mon dow   command
-#@reboot         /usr/local/bin/mupibox/./get_network.sh
-#@reboot         sleep 30; /usr/local/bin/mupibox/./get_network.sh
 * * * * *       /usr/local/bin/mupibox/./save_rrd.sh
-* * * * *       sleep 15; /usr/local/bin/mupibox/./save_rrd.sh
-* * * * *       sleep 30; /usr/local/bin/mupibox/./save_rrd.sh
-* * * * *       sleep 45; /usr/local/bin/mupibox/./save_rrd.sh
-* * * * *       /usr/local/bin/mupibox/./get_network.sh
-* * * * *       sleep 30; /usr/local/bin/mupibox/./get_network.sh

scripts/OnOffShim/off_trigger.sh

@@ -29,15 +29,15 @@ if [ -z "$GPIO_CHIP" ]; then
     echo "$(date) - ERROR: No GPIO chip found, aborting." >> ${LOGFILE}
     exit 1
 else
-    echo "$(date) - INFO:  GPIO chip found -> ${GPIO_CHIP}" >> ${LOGFILE}	
+    echo "$(date) - INFO:  GPIO chip found -> ${GPIO_CHIP}" >> ${LOGFILE}
 fi
 
 # Check GPIO status
-gpio_status=$(sudo gpioget ${GPIO_CHIP} ${TRIGGER_PIN})
+gpio_status=$(pinctrl lev ${TRIGGER_PIN})
 echo "$(date) - INFO:  GPIO${TRIGGER_PIN} status: ${gpio_status}" >> ${LOGFILE}
 
 check_button_pressed() {
-    local button_state=$(sudo gpioget ${GPIO_CHIP} ${TRIGGER_PIN})
+    local button_state=$(pinctrl lev ${TRIGGER_PIN})
     if [ "$button_state" = "0" ]; then
         return 0  # Button is pressed
     else
@@ -48,7 +48,7 @@ check_button_pressed() {
 # Main monitoring loop
 while true; do
     echo "$(date) - INFO:  Waiting for button press..." >> ${LOGFILE}
-    sudo gpiomon --num-events=1 --falling-edge ${GPIO_CHIP} ${TRIGGER_PIN} &>> ${LOGFILE} &
+    gpiomon --chip ${GPIO_CHIP} --num-events=1 --edges falling ${TRIGGER_PIN} &>> ${LOGFILE} &
     GPIOMON_PID=$!
     if [ $? -ne 0 ]; then
         echo "$(date) - ERROR: Failed to start gpiomon for GPIO${TRIGGER_PIN}" >> ${LOGFILE}
@@ -61,7 +61,7 @@ while true; do
     wait $GPIOMON_PID
     if [ $? -eq 0 ]; then
         echo "$(date) - INFO:  Button pressed, checking hold duration..." >> ${LOGFILE}
-        
+
         # Check if button is held for the required duration
         button_held=true
         for ((i=0; i<PRESS_DELAY; i++)); do
@@ -72,7 +72,7 @@ while true; do
             fi
             sleep 1
         done
-        
+
         if [ "$button_held" = true ]; then
             echo "$(date) - INFO:  Button held for ${PRESS_DELAY} seconds, initiating shutdown" >> ${LOGFILE}
 

scripts/OnOffShim/poweroff.sh

@@ -8,10 +8,10 @@ if [ "$1" = "poweroff" ]; then
     echo "$(date): Initiating poweroff sequence"
 
     # CUT_PIN setzen (z. B. Stromzufuhr abschalten)
-    gpioset gpiochip0 ${CUT_PIN}=1
+    pinctrl set ${CUT_PIN} op dh
 
     # POWEROFF_PIN setzen (Signal an OnOff SHIM)
-    gpioset gpiochip0 ${POWEROFF_PIN}=0
+    pinctrl set ${POWEROFF_PIN} op dl
 
     echo "$(date): Poweroff sequence complete"
 fi