Initial commit for play.sh script:

- Create play.sh script to play an alarm sound with increasing volume using the mpv player. - The script iterates through different volume levels (20 to 100 in increments of 10). - Utilize pkill to terminate any previous mpv processes before starting a new one. - Incorporate comments for script header, loop, and process handling. - Add wait command to ensure the completion of each mpv process before starting the next one. - Created: 06.02.2024 - Description: Script to play an alarm sound with increasing volume.
Refactor generate_text.sh script:
2024-02-06 17:43:54 +01:00 · 2024-02-06 17:41:48 +01:00 · 2024-02-06 17:40:40 +01:00 · 2024-02-06 17:39:37 +01:00 · 2024-02-06 17:38:20 +01:00
5 changed files with 128 additions and 79 deletions
--- a/generate_mp3.sh
+++ b/generate_mp3.sh
@ -19,12 +19,11 @@ category_order=("date" "time")
 # Directories
 txt_dir="/data/scripts/.text"
 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
+am start --user 0 -a android.intent.action.VIEW -d file:///sdcard/handout.html -t text

 # Function to create MP3 files
 create_mp3_files() {
--- a/generate_text.sh
+++ b/generate_text.sh
@ -62,49 +62,33 @@ generate_text() {
 # Call the generate_text function
 generate_text

-# 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"
+# Create Markdown content
+markdown_content="**Handout:**  
+\n
+| Deutsch | Español |  
+| ------- | -------- |"

 for component in "${all[@]}"; do
-  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"
+  markdown_content+="\n| $german_output | $spanish_output |"
 done

-echo "</table>" >> "$html_file"
-echo "</body>" >> "$html_file"
-echo "</html>" >> "$html_file"
+# Send Notification to A72 with Markdown content
+curl_command="curl -u 'Michaelis:u5ptufUFuDL6q4yEcSN3iqas5gtXNkN77Lx3cy3oX8UoSgFWdifYy9FVopv2Zwtu' \
+  -H 'Priority:High' \
+  -d \"$markdown_content\" \
+  -H 'Markdown: yes' \
+  https://ntfy.michaelis.digital/ioBroker"
+
+echo "curl_command: $curl_command"
+eval "$curl_command"  # Execute the constructed curl command

 # Transfer files to A72
-scp -r -i /root/.ssh/A72 "$text_dir" root@$A72_ip:/data/scripts/
+scp -r -i /root/.ssh/A72 "$text_dir" root@$A72_ip:/sdcard/

-# Display Markdown file content
-cat $markdown_file
+# Display Markdown content
+echo -e "$markdown_content"

 # Start generate_mp3.sh on A72
 nohup ssh -i /root/.ssh/A72 -f root@$A72_ip '/data/scripts/generate_mp3.sh' > /root/generate_mp3.log &
-
--- a/morning-alarm.sh
+++ b/morning-alarm.sh
@ -6,7 +6,12 @@
 # It turns off Bluetooth, increases the volume, and checks if the alarm has been dismissed.
 # After the alarm is dismissed, it plays the alarm sound.

-echo "Script executed at: $(date)" > /data/scripts/morning-alarm.log
+# clear logs
+rm -rf /data/scripts/morning-alarm.log
+echo "Script executed at: $(date)"
+
+# Set a flag for the loop
+alarm_dismissed=false

 # Function to turn off Bluetooth
 turn_off_bluetooth() {
@ -23,18 +28,18 @@ increase_volume() {
 # Function to check the alarm notification
 check_notification() {
  # Run the dumpsys command within a timeout
-  output=$(timeout 5s dumpsys activity processes | grep "com.urbandroid.sleep/")
+  output=$(dumpsys activity processes | grep "com.urbandroid.sleep")

  # Check if the result is not empty and contains the alarm
  if [ -n "$output" ] && echo "$output" | grep -q "AlarmKlaxon"; then
    date && echo "Alarm not dismissed yet."
+    sleep 5
+    return 1
  else
    date && echo "Alarm dismissed."
-    killall mpv
-    break
-    #killall /data/data/com.termux/files/usr/bin/mpv
-    echo "$output"
-    exit
+    alarm_dismissed=true
+    /system/bin/pkill play.sh
+    /system/bin/pkill mpv
  fi
 }

@ -43,16 +48,20 @@ check_notification() {
 # Turn off Bluetooth
 turn_off_bluetooth

-# Increase volume and check notification
+# start play.sh script
+/data/scripts/play.sh &
+
+# Repeat the check_notification function
 while true; do
  increase_volume
+  sleep 2
  check_notification
-done &

-## Play alarm sound
-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 &
+  # Check if the alarm dismissed flag is set
+  if [ "$alarm_dismissed" = true ]; then
+    /system/bin/pkill play.sh
+    /system/bin/pkill mpv
+    exit 0  # Exit the script here
+  fi
 done

--- a/play.sh
+++ b/play.sh
@ -0,0 +1,27 @@
+#!/data/data/com.termux/files/usr/bin/zsh
+#
+# Alarm Volume Increase Script
+#
+# This script plays an alarm sound with increasing volume using the mpv player.
+# It iterates through different volume levels, starting from 20 and increasing by 10 until reaching 100.
+
+# Header information
+# Created: 06.02.2024
+# Description: Script to play an alarm sound with increasing volume.
+
+# Loop to play the alarm sound with increasing volume
+for ((volume = 20; volume <= 100; volume += 10)); do 
+  echo "Current volume: $volume"
+  
+  # Terminate any previous mpv processes
+  /system/bin/pkill mpv
+  
+  # Start the new mpv process with the specified volume
+  /data/data/com.termux/files/usr/bin/mpv --replaygain=track --volume="$volume" /data/scripts/your-new-morning-alarm.ogg &
+
+  # Wait for the completion of the current mpv process before starting the next one
+  wait
+done
+
+# End of the script
+
--- a/wecker.sh
+++ b/wecker.sh
@ -13,6 +13,9 @@
 #set -e  # Stop the script on errors
 #set -x  # Enable debugging # Uncomment for a more detailed log

+# Variables
+alarm_dismissed=false  # Variable to track alarm status
+
 # Debug
 debug=false
 ssh_executed=false  # Variable to track SSH command status
@ -107,12 +110,12 @@ check_external_light_status() {
    fi
 }

-# Check if the alarm on the phone has been turned off
+# Function to check the alarm notification
 check_notification() {
  max_attempts=10
  wait_time=5

-  for ((i = 1; i <= $max_attempts; i++)); do
+  for ((i = 1; i <= $max_attempts;)); do
    # Execute the SSH command within a timeout
    check_ip # Get IP

@ -121,26 +124,25 @@ check_notification() {
      output="com.urbandroid.sleep AlarmKlaxon"
    else
      output=$(ssh -i /root/.ssh/A72 root@$A72_ip 'dumpsys activity processes | grep com.urbandroid.sleep')
-      echo $output
+      #echo $output
    fi

    # Check if the result contains the alarm
    if [[ $output == *"com.urbandroid.sleep"* && $output == *"AlarmKlaxon"* ]]; then
      # Alarm not turned off yet
      date && echo "Alarm not turned off yet."
-      echo $output
-      return
+      #echo $output
    elif [[ $output == *"com.urbandroid.sleep"* && $output != *"AlarmKlaxon"* ]]; then
      # Alarm turned off
      date && echo "Alarm turned off."
-      echo $output
+      ssh -i /root/.ssh/A72 root@$A72_ip 'killall mpv'
      iobroker state set zigbee.0.04cd15fffee03198.state false
-      /root/iobroker_scripts/general/generate_text.sh > /dev/null
-      exit  # Beende das Skript, wenn der Alarm ausgeschaltet wurde
+      exit  # Exit the script when the alarm is turned off
    else
      # Phone unreachable
      echo "Phone unreachable. Waiting $wait_time seconds before the next attempt."
      check_ip # Get IP
+      i++ 
      sleep $wait_time
    fi
  done
@ -148,8 +150,9 @@ check_notification() {
  # Phone could not be reached.
  echo "Phone could not be reached after $max_attempts attempts."
  date && echo "Alarm turned off."
+  ssh -i /root/.ssh/A72 root@$A72_ip 'killall mpv'
  iobroker state set zigbee.0.04cd15fffee03198.state false
-  exit  # Beende das Skript, wenn das Telefon nicht erreicht werden konnte
+  exit  # Exit the script when the phone is unreachable
 }

 # Define starting values for brightness and color temperature
@ -184,7 +187,7 @@ echo "Reached final colortemp: $((start_colortemp - colortemp_step * steps)) fro
 sleep_duration=$((duration_seconds / steps - 3))

 # Gradual adjustment of brightness and color temperature
-for ((i = 1; i <= $steps; i++)); do
+for ((i = 1; i < $steps; i++)); do
  current_brightness=$(printf "%.0f" $(bc <<< "$start_brightness + ($brightness_step * $i)"))
  current_colortemp=$(printf "%.0f" $(bc <<< "$start_colortemp - ($colortemp_step * $i)"))

@ -193,6 +196,7 @@ for ((i = 1; i <= $steps; i++)); do
  echo "current brightness= $current_brightness"
  echo "current colortemp= $current_colortemp"

+  # Check if it's the first brightness change
  if [ "$first_brightness_change" = true ]; then
    echo "Variable first_brightness_change = true"
    check_external_light_status
@ -210,6 +214,11 @@ for ((i = 1; i <= $steps; i++)); do
  else
    sleep $sleep_duration # Changes every 30 seconds
  fi
+
+  # Check if the alarm is dismissed
+  if [ "$alarm_dismissed" = true ]; then
+    exit  # Exit the script when the alarm is dismissed
+  fi
 done

 # Set to end values.
@ -226,22 +235,38 @@ echo "$A72_ip"
 echo "current_brightness: $current_brightness end_brightness: $end_brightness"
 echo "current_colortemp: $current_colortemp end_colortemp: $end_colortemp"

+# Check if the alarm is dismissed
+if [ "$alarm_dismissed" = true ]; then
+  exit  # Exit the script when the alarm is dismissed
+fi
+
 ssh_command() { # Function to send a command to A72.
  local command=$1
-  nohup ssh -i /root/.ssh/A72 -f root@$A72_ip "$command" </dev/null &
  ssh_executed=true  # Mark that the SSH command has been executed.
+  
+  # Start the SSH command in the background and store the PID.
+  nohup ssh -i /root/.ssh/A72 root@$A72_ip "$command" > /dev/null 2>&1 &
+  echo "$ssh_executed"
+  ssh_pid=$!  # Store the PID of the SSH process.
+  echo "ssh_pid: $ssh_pid"+
+
+  # Wait briefly to ensure that the process has started.
+  sleep 1
 }

 if [ $current_brightness -eq $end_brightness ] && [ $current_colortemp -eq $end_colortemp ]; then
-    # Change colors for more concentration
+
+  # Continue with the color-changing loop 
  while :; do
    # Start the alarm script on the phone if the SSH command has not been executed yet. 
    if [ "$ssh_executed" = false ]; then
      if [ "$debug" = true ]; then
        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"
+        ssh_command "cmd media_session volume --set 5 --stream 9 && /data/data/com.termux/files/usr/bin/mpv /data/scripts/your-new-morning-alarm.ogg"
      else
-          nohup ssh a72 '/data/scripts/morning-alarm.sh 2>&1 | /data/data/com.termux/files/usr/bin/tee /data/scripts/morning-alarm.log'
+        sleep 1
+        ssh_command "/data/scripts/morning-alarm.sh >> /data/scripts/morning-alarm.log" &
+        ssh_executed=true
      fi
    else
      check_external_light_status
@ -250,7 +275,12 @@ if [ $current_brightness -eq $end_brightness ] && [ $current_colortemp -eq $end_
      set_color "$red"
      sleep 5
      set_color "$blue"
-        check_notification
+      check_notification #&
+    fi
+  if [ "$alarm_dismissed" = true ]; then
+    echo "Alarm dismissed"
+    /root/iobroker_scripts/general/generate_text.sh # Call generate_text.sh script 
+    exit  # Exit the script when the alarm is dismissed
  fi
  done
 fi
Author	SHA1	Message	Date
Ratatoskr	59e5ffc91a	Initial commit for play.sh script: - Create play.sh script to play an alarm sound with increasing volume using the mpv player. - The script iterates through different volume levels (20 to 100 in increments of 10). - Utilize pkill to terminate any previous mpv processes before starting a new one. - Incorporate comments for script header, loop, and process handling. - Add wait command to ensure the completion of each mpv process before starting the next one. - Created: 06.02.2024 - Description: Script to play an alarm sound with increasing volume.	2024-02-06 17:43:54 +01:00
Ratatoskr	4fe4ef7de7	Refactor generate_text.sh script: - Replace HTML file creation with Markdown content generation for improved simplicity and readability. - Construct Markdown content with a header, table, and row entries based on the generated text components. - Introduce a curl_command variable to construct and echo the curl command for sending a notification to A72. - Display the constructed Markdown content for debugging purposes. - Transfer text files to A72's sdcard instead of the scripts directory. - Start generate_mp3.sh on A72 using nohup and ssh. - Adjust comments and remove unnecessary HTML file display section. - Overall, enhance the script structure, content creation, and notification handling in generate_text.sh.	2024-02-06 17:41:48 +01:00
Ratatoskr	a5076ae046	Enhance morning-alarm.sh script: - Clear morning-alarm.log before logging execution timestamp. - Set a flag 'alarm_dismissed' for loop control. - Modify the check_notification function to continuously check the alarm state and sleep for better efficiency. - Start play.sh script in the background. - Replace 'killall' with '/system/bin/pkill' for better compatibility. - Introduce sleep intervals for smoother execution. - Adjust the volume increment loop and add sleep before checking the notification. - Properly exit the script when the alarm is dismissed, killing play.sh and mpv. - Overall improvements for better readability and functionality in the morning-alarm.sh script.	2024-02-06 17:40:40 +01:00
Ratatoskr	41f3b3a4d2	Refactor HTML generation, improve Markdown content creation, and update notification mechanism in generate_text.sh: - Refactored HTML file creation with Markdown content construction for clarity and conciseness. - Removed the HTML file generation block and replaced it with a Markdown content string. - Updated the notification mechanism using the constructed Markdown content and a curl command. - Display the constructed Markdown content instead of the HTML file. - Updated the file transfer destination to the A72 device's /sdcard/ directory for generate_text.sh.	2024-02-06 17:39:37 +01:00
Ratatoskr	0fb0ae1e48	Refactor directory comment, update file opening command, and improve German MP3 creation comment in generate_mp3.sh: - Refactored a directory comment in the script for clarity. - Updated the file opening command to use the correct path (/sdcard/handout.html). - Improved the comment explaining the creation of German MP3 files.	2024-02-06 17:38:20 +01:00