Compare commits

..

2 Commits

Author SHA1 Message Date
89fd2f2f8c
Improve morning-alarm.sh script
Enhancements:
- Adjusted the way the alarm sound is played by introducing a loop to increase volume gradually.
- Utilized a loop to iterate over volume levels from 10 to 100 with increments of 10.
- Replaced the previous mpv command with a loop to control the volume for a smoother alarm experience.

Code Clarity:
- Added comments to clarify the purpose of the loop and volume adjustment.

Note: This modification provides a more gradual increase in volume for the morning alarm, enhancing the user experience.
2024-01-30 22:39:21 +01:00
14dcb406c6
Enhance generate_text.sh script
Addition of Markdown File:
- Introduce a Markdown file 'handout.md' to store information in a structured format.
- Markdown file is created with headers, columns, and content for German and Spanish text.

Refactoring and Cleanup:
- Declare 'markdown_file' variable to store the path of the Markdown file.
- Introduce 'all' array to store components like 'date' and 'time'.
- Clear files in 'text_dir' at the beginning to ensure a clean start.

File Transfer and Notification:
- Use 'scp' to transfer files to A72, maintaining the directory structure.
- Enhance the curl command to include the Markdown file as an attachment.
- Set the 'Filename' header for better identification on the server.
- Display the constructed curl command for visibility.
- Execute the curl command to send a high-priority notification with the Markdown file.

Logging and Output:
- Display the content of the generated Markdown file.
- Initiate 'generate_mp3.sh' on A72 in the background.

Note: Adjusted the output formatting for better readability in the commit message.
2024-01-30 22:38:26 +01:00
2 changed files with 51 additions and 14 deletions

View File

@ -9,6 +9,12 @@
#######################################
text_dir="/root/iobroker_scripts/general/.text"
markdown_file="$text_dir/handout.md"
all=("date" "time") # Add more elements as needed
# remove files in text_dir
rm -f $text_dir/*
# Function to get the IP address of Lisa's iPhone
check_ip() {
@ -42,29 +48,58 @@ check_ip
generate_text() {
# German
date_de=$(date '+Heute ist %A, der %d. %B %Y.')
echo $date_de > $text_dir/date_de.txt
echo "$date_de" > "$text_dir/date_de.txt"
time_de=$(date '+Es ist %H:%M Uhr.')
echo $time_de > $text_dir/time_de.txt
echo "$time_de" > "$text_dir/time_de.txt"
# Spanish
date_es=$(trans -b :de :es "$date_de")
echo $date_es > $text_dir/date_es.txt
echo "$date_es" > "$text_dir/date_es.txt"
time_es=$(trans -b :de :es "$time_de")
echo $time_es > $text_dir/time_es.txt
echo "$time_es" > "$text_dir/time_es.txt"
}
# Call the generate_text function
generate_text
# Create Markdown file
echo "## Handout:" > $markdown_file
echo "| Deutsch | Español |" >> $markdown_file
echo "| ------- | ------- |" >> $markdown_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
done
# 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:/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
# Start generate_mp3.sh on A72
ssh -i /root/.ssh/A72 -f root@$A72_ip '/data/scripts/generate_mp3.sh' > /root/generate_mp3.log &
nohup ssh -i /root/.ssh/A72 -f root@$A72_ip '/data/scripts/generate_mp3.sh' > /root/generate_mp3.log &
# Output the generated texts
echo "German Output:"
echo "$date_de $time_de"
echo "Spanish Output:"
echo "$date_es $time_es"

View File

@ -41,8 +41,10 @@ check_notification() {
# Turn off Bluetooth
turn_off_bluetooth
# Play alarm sound
/data/data/com.termux/files/usr/bin/mpv --replaygain=track --loop=inf /data/scripts/your-new-morning-alarm.ogg &
## Play alarm sound
for ((volume = 10; volume <= 100; volume += 10)); do
/data/data/com.termux/files/usr/bin/mpv --replaygain=track --volume="$volume" /data/scripts/your-new-morning-alarm.ogg &
done
# Increase volume and check notification
while true; do