Update wecker.sh script

The wecker.sh script has been modified with the following changes:

1. Modified the 'check_notification()' function to exit the entire script using 'exit' instead of 'return' when the alarm is turned off or the phone is unreachable. This ensures the script terminates completely in these scenarios.

2. Adjusted the 'sleep_duration' calculation to subtract 3 seconds, enhancing the script's timing accuracy during gradual adjustment of brightness and color temperature.

3. Changed the ssh command in the loop to use 'nohup' and 'tee' for logging the morning-alarm.sh output to a file named 'morning-alarm.log'. This modification improves logging and captures script output for later analysis.

These changes enhance the wecker.sh script by improving script termination logic, adjusting sleep duration for better timing accuracy, and enhancing logging during the execution of the morning-alarm.sh script.

A72_alarm_getter.sh

@@ -1,47 +1,55 @@
 #!/bin/bash
 #
-# Automatisches Aufstehen-Skript
-# Autor: Michael, Haider
-# Datum: 31. Oktober 2023
+# Automatic Wake-up Script
+# Author: Michael Haider
+# Date: October 31, 2023
 #
-# Dieses Skript ermittelt den nächsten Weckzeitpunkt von A72 und plant
-# dann das Einschalten der Lichter.
-# mit dem "at" Befehl.
+# This script retrieves the next wake-up time from A72 and schedules
+# turning on the lights using the "at" command.
 
-echo "Ausgeführt um: " 
+echo "Executed at: "
 date
 
-# Überprüfen, ob alte "at"-Aufträge abgelaufen sind und sie löschen
+# Check if old "at" jobs have expired and delete them
 delete_expired_at_jobs() {
   current_time=$(date +"%Y-%m-%d %H:%M:%S")
   old_jobs=$(/usr/bin/atq | awk -v current_time="$current_time" '$3 < current_time { print $1 }')
 
   if [ -n "$old_jobs" ]; then
-    echo "Lösche überholte 'at'-Jobs:"
+    echo "Deleting expired 'at' jobs:"
     for job_id in $old_jobs; do
       /usr/bin/atrm "$job_id"
-      echo "Gelöscht: $job_id"
+      echo "Deleted: $job_id"
     done
   else
-    echo "Keine überholten 'at'-Jobs gefunden."
+    echo "No expired 'at' jobs found."
   fi
 
-  ## Behalte nur den nächsten 'at'-Job und lösche alle zukünftigen Jobs
-  #next_job_id=$(/usr/bin/atq | awk '{print $1}' | sort -n | head -n 1)
-  #if [ -n "$next_job_id" ]; then
-    #/usr/bin/atrm $(/usr/bin/atq | awk -v next_job_id="$next_job_id" '$1 > next_job_id {print $1}')
-    #echo "Nur der nächste 'at'-Job bleibt erhalten: $next_job_id"
-  #else
-    #echo "Keine 'at'-Jobs gefunden."
-  #fi
+  # Debug: List all 'at' jobs
+  echo "All 'at' jobs:"
+  /usr/bin/atq
+
+  # Keep only the earliest 'at' job and delete all other jobs
+  next_job_id=$(/usr/bin/atq | sort -k3,4 -k5,5 | awk 'NR==1 {print $1}')
+  if [ -n "$next_job_id" ]; then
+    echo "Next 'at' job to keep: $next_job_id"
+    /usr/bin/atrm $(/usr/bin/atq | awk -v next_job_id="$next_job_id" '$1 != next_job_id {print $1}')
+    echo "Only the next 'at' job remains: $next_job_id"
+  else
+    echo "No 'at' jobs found."
+  fi
+
+  # Debug: List remaining 'at' jobs after deletion
+  echo "Remaining 'at' jobs:"
+  /usr/bin/atq
 }
 
-# Verwende die Funktion, um überholte Jobs zu löschen
+# Use the function to delete expired jobs
 delete_expired_at_jobs
 
-# Die IP-Adresse von Lisas-IPhone holen (ohne Ping-Test)
+# Get the IP address of Lisa's iPhone (without Ping test)
 check_ip() {
-  mac_address="e4:cd:d1"  # Ersetze dies durch die MAC-Adresse
+  mac_address="e4:cd:d1"  # Replace this with the MAC address
   attempts=10
   interval=5
 
@@ -49,57 +57,64 @@ check_ip() {
     A72_ip=$(arp-scan -r 5 -v --localnet | grep "$mac_address" | awk '{print $1}')
 
     if [ -n "$A72_ip" ]; then
-      echo "Gefundene IP: $A72_ip"
-      return 0  # Erfolg: IP-Adresse gefunden
+      echo "Found IP: $A72_ip"
+      return 0  # Success: IP address found
     fi
 
     if [ $i -lt $attempts ]; then
-      echo "Warte $interval Sekunden, bevor der nächste Versuch gestartet wird."
+      echo "Waiting $interval seconds before the next attempt."
       sleep $interval
     fi
   done
 
-  # Alle Versuche erfolglos
-  echo "Das Ziel konnte nach $attempts Versuchen nicht erreicht werden."
+  # All attempts unsuccessful
+  echo "The target could not be reached after $attempts attempts."
   iobroker state set zigbee.0.04cd15fffee03198.state false
-  return 1  # Fehler: IP-Adresse nicht gefunden
+  return 1  # Error: IP address not found
 }
 
-# check_ip -Funktion ausführen.
-check_ip || exit 1  # Beende das Skript, wenn das Ziel nicht erreichbar ist
+# Execute the check_ip function.
+check_ip || exit 1  # Exit the script if the target is unreachable
 
-# Datei zum Speichern der geplanten Weckzeiten
+# File to store scheduled wake-up times
 weckzeit_datei="/root/iobroker_scripts/general/.weckzeiten.txt"
 
-# Ziel ist erreichbar, Alarmzeit über SSH abrufen
+# Target is reachable, retrieve alarm time over SSH
 alarmTime=$(ssh -i /root/.ssh/A72 root@$A72_ip dumpsys alarm | grep -A 6 ":com.urbandroid.sleep.alarmclock.ALARM_ALERT" | grep "type=RTC_WAKEUP origWhen=" | cut -d= -f3 | cut -c1-16 | uniq)
 
 if [ -n "$alarmTime" ]; then
-# Zerlege das Datum und die Uhrzeit
-datum=$(echo "$alarmTime" | cut -d ' ' -f 1)
-uhrzeit=$(echo "$alarmTime" | cut -d ' ' -f 2)
+  # Parse the date and time
+  date=$(echo "$alarmTime" | cut -d ' ' -f 1)
+  time=$(echo "$alarmTime" | cut -d ' ' -f 2)
 
-# Formatiere das Datum und die Uhrzeit neu
-neues_format=$(date -d "$datum $uhrzeit" "+%H:%M %m/%d/%y")
+  # Format the date and time
+  new_format=$(date -d "$date $time" "+%H:%M %m/%d/%y")
 
-# Subtrahiere 15 Minuten von der Zeit
-lightsOn=$(date -d "$neues_format - 15 minutes" "+%H:%M %m/%d/%y")
+  # Subtract 15 minutes from the time
+  lightsOn=$(date -d "$new_format - 15 minutes" "+%H:%M %m/%d/%y")
 
-echo "Nächster Wecker: $neues_format"
-echo "Lichter einschalten um: $lightsOn"
+  echo "Next Alarm: $new_format"
+  echo "Turning on lights at: $lightsOn"
 
-# Überprüfen, ob die Weckzeit bereits geplant ist
+  # Check if the wake-up time is already scheduled
   if grep -Fxq "$lightsOn" "$weckzeit_datei"; then
-  echo "Weckzeit ist bereits geplant für: $lightsOn"
+    echo "Wake-up time already scheduled for: $lightsOn"
   else
-  echo "Weckzeit planen und in Datei speichern: $lightsOn"
+    echo "Schedule wake-up time and save to file: $lightsOn"
     echo "$lightsOn" > "$weckzeit_datei"
+
+    # Remove all existing 'at' Jobs
+    /usr/bin/atrm $(/usr/bin/atq | awk '{print $1}')
+
+    # Add the new 'at' Job
     echo "/root/iobroker_scripts/schlafzimmer/wecker.sh > /root/wecker.log" | at "$lightsOn"
-  curl -u "Michaelis:u5ptufUFuDL6q4yEcSN3iqas5gtXNkN77Lx3cy3oX8UoSgFWdifYy9FVopv2Zwtu" -H "Icon:https://static.vecteezy.com/system/resources/previews/018/931/118/original/alarm-clock-icon-png.png" -d "Alarm gestellt um: $neues_format" https://ntfy.michaelis.digital/$HOSTNAME
+  
+    curl -u "Michaelis:u5ptufUFuDL6q4yEcSN3iqas5gtXNkN77Lx3cy3oX8UoSgFWdifYy9FVopv2Zwtu" -H "Icon:https://static.vecteezy.com/system/resources/previews/018/931/118/original/alarm-clock-icon-png.png" -d "Alarm set at: $new_format" https://ntfy.michaelis.digital/$HOSTNAME
   fi
 else
-  echo "Kein Wecker gestellt. Lösche geplante Weckzeiten."
-  #curl -u "Michaelis:u5ptufUFuDL6q4yEcSN3iqas5gtXNkN77Lx3cy3oX8UoSgFWdifYy9FVopv2Zwtu" -H "Icon:https://static.vecteezy.com/system/resources/previews/018/931/118/original/alarm-clock-icon-png.png" -H "Priority:High" -d "Alarm gelöscht" https://ntfy.michaelis.digital/$HOSTNAME
+  echo "No alarm set. Deleting scheduled wake-up times."
+  #curl -u "Michaelis:u5ptufUFuDL6q4yEcSN3iqas5gtXNkN77Lx3cy3oX8UoSgFWdifYy9FVopv2Zwtu" -H "Icon:https://static.vecteezy.com/system/resources/previews/018/931/118/original/alarm-clock-icon-png.png" -H "Priority:High" -d "Alarm deleted" https://ntfy.michaelis.digital/$HOSTNAME
 
   rm "$weckzeit_datei"
 fi
+

generate_mp3.sh

@@ -23,6 +23,9 @@ mp3_dir="/data/scripts/.mp3"
 # remove old files
 rm -f "$txt_dir"/*complete.txt
 
+# open handout.md file
+am start --user 0 -a android.intent.action.VIEW -d file:///data/local/tmp/file.txt -t text/plain
+
 # Function to create MP3 files
 create_mp3_files() {
 

generate_text.sh

@@ -9,7 +9,7 @@
 #######################################
 
 text_dir="/root/iobroker_scripts/general/.text"
-markdown_file="$text_dir/handout.md"
+html_file="$text_dir/handout.html"
 
 all=("date" "time")  # Add more elements as needed
 
@@ -62,41 +62,46 @@ generate_text() {
 # Call the generate_text function
 generate_text
 
-# Create Markdown file
-echo "## Handout:" > $markdown_file
-echo "| Deutsch | Español |" >> $markdown_file
-echo "| ------- | ------- |" >> $markdown_file
+# Create HTML file
+echo "<!DOCTYPE html>" > "$html_file"
+echo "<html>" >> "$html_file"
+echo "<head>" >> "$html_file"
+echo "<title>Handout</title>" >> "$html_file"
+echo "<style>" >> "$html_file"
+echo "table {" >> "$html_file"
+echo "  border-collapse: collapse;" >> "$html_file"
+echo "  width: 50%;" >> "$html_file"
+echo "  margin: auto;" >> "$html_file"
+echo "}" >> "$html_file"
+echo "th, td {" >> "$html_file"
+echo "  border: 1px solid black;" >> "$html_file"
+echo "  padding: 8px;" >> "$html_file"
+echo "  text-align: left;" >> "$html_file"
+echo "}" >> "$html_file"
+echo "th {" >> "$html_file"
+echo "  background-color: #f2f2f2;" >> "$html_file"
+echo "}" >> "$html_file"
+echo "</style>" >> "$html_file"
+echo "</head>" >> "$html_file"
+echo "<body>" >> "$html_file"
+echo "<h2>Handout:</h2>" >> "$html_file"
+echo "<table>" >> "$html_file"
+echo "<tr><th>Deutsch</th><th>Español</th></tr>" >> "$html_file"
 
 for component in "${all[@]}"; do
-  german_output=$(cat $text_dir/${component}_de.txt)
-  spanish_output=$(cat $text_dir/${component}_es.txt)
-  echo "| $german_output | $spanish_output |" >> $markdown_file
+  echo "processing: $component"
+  german_output=$(cat "$text_dir/${component}_de.txt")
+  spanish_output=$(cat "$text_dir/${component}_es.txt")
+  echo "<tr><td>$german_output</td><td>$spanish_output</td></tr>" >> "$html_file"
 done
 
+echo "</table>" >> "$html_file"
+echo "</body>" >> "$html_file"
+echo "</html>" >> "$html_file"
+
 # Transfer files to A72
 scp -r -i /root/.ssh/A72 "$text_dir" root@$A72_ip:/data/scripts/
 
-# Send Notification to A72 with handout.md file
-curl_command="curl -u 'Michaelis:u5ptufUFuDL6q4yEcSN3iqas5gtXNkN77Lx3cy3oX8UoSgFWdifYy9FVopv2Zwtu' \
-  -H 'Priority:High' \
-  -T $markdown_file \
-  -H 'Filename: handout.md' \
-  -d $'notification_date: Heute ist Dienstag, der 30. Januar 2024.\n"
-
-for component in "${all[@]}"; do
-  curl_command+="${component}:\n"
-  curl_command+="$(cat $text_dir/${component}_de.txt)\n"
-  curl_command+="$(cat $text_dir/${component}_es.txt)\n"
-done
-
-curl_command="${curl_command%\\n}"  # Remove the trailing newline
-curl_command+="\n'"
-
-curl_command+=" https://ntfy.michaelis.digital/ioBroker"
-
-echo "curl_command: $curl_command"
-eval "$curl_command"  # Execute the constructed curl command
-
 # Display Markdown file content
 cat $markdown_file
 

morning-alarm.sh

@@ -31,6 +31,8 @@ check_notification() {
   else
     date && echo "Alarm dismissed."
     killall mpv
+    break
+    #killall /data/data/com.termux/files/usr/bin/mpv
     echo "$output"
     exit
   fi
@@ -51,5 +53,6 @@ done &
 for ((volume = 20; volume <= 100; volume += 10)); do 
   echo "Actual volume: $volume"
   /data/data/com.termux/files/usr/bin/mpv --replaygain=track --volume="$volume" /data/scripts/your-new-morning-alarm.ogg
+  #check_notification &
 done
 

wecker.sh

@@ -136,7 +136,7 @@ check_notification() {
       echo $output
       iobroker state set zigbee.0.04cd15fffee03198.state false
       /root/iobroker_scripts/general/generate_text.sh > /dev/null
-      return  # Exit the function without terminating the entire script
+      exit  # Beende das Skript, wenn der Alarm ausgeschaltet wurde
     else
       # Phone unreachable
       echo "Phone unreachable. Waiting $wait_time seconds before the next attempt."
@@ -149,7 +149,7 @@ check_notification() {
   echo "Phone could not be reached after $max_attempts attempts."
   date && echo "Alarm turned off."
   iobroker state set zigbee.0.04cd15fffee03198.state false
-    return
+  exit  # Beende das Skript, wenn das Telefon nicht erreicht werden konnte
 }
 
 # Define starting values for brightness and color temperature
@@ -181,7 +181,7 @@ echo "Reached final brightness: $((brightness_step * steps + start_brightness))
 colortemp_step=$(( start_colortemp / steps ))
 echo "Color temperature difference per step: $colortemp_step"
 echo "Reached final colortemp: $((start_colortemp - colortemp_step * steps)) from $end_colortemp"
-sleep_duration=$((duration_seconds / steps))
+sleep_duration=$((duration_seconds / steps - 3))
 
 # Gradual adjustment of brightness and color temperature
 for ((i = 1; i <= $steps; i++)); do
@@ -241,7 +241,7 @@ if [ $current_brightness -eq $end_brightness ] && [ $current_colortemp -eq $end_
           echo "DEBUG: Alternative ssh command."
           ssh_command "cmd media_session volume  scripts/--set 5 --stream 9 && /data/data/com.termux/files/usr/bin/mpv /data/scripts/your-new-morning-alarm.ogg"
         else
-          ssh_command "/data/scripts/morning-alarm.sh > /dev/null"
+          nohup ssh a72 '/data/scripts/morning-alarm.sh 2>&1 | /data/data/com.termux/files/usr/bin/tee /data/scripts/morning-alarm.log'
         fi
       else
         check_external_light_status