This commit includes changes to the 'wecker.sh' script:
- Added '&' to run 'killall mpv' command in the background to avoid blocking.
- Modified the invocation of 'rgb.sh' to redirect output to /dev/null and run it in the background.
- Improved comments and formatting in the script.
These changes aim to optimize script execution and enhance readability.
Note: Ensure that the 'rgb.sh' script runs as expected in the background.
This commit refactors the 'wecker.sh' script to enhance functionality and integrate RGB control.
Changes:
- Removed redundant color variables (red, green, blue) as RGB control is now managed by an external script.
- Replaced 'set_color' function with a call to the 'rgb.sh' script for RGB control.
- Introduced the use of 'pkill rgb.sh' to stop the RGB script when the alarm is turned off.
- Added the execution of 'rgb.sh' at the end of the script for dynamic color cycling.
- Enhanced code readability and removed unnecessary sleep commands for color cycling.
- Modified the 'check_notification' function to ensure proper termination of the RGB script.
Usage:
1. Ensure the 'rgb.sh' script is available in the specified path.
2. Run the 'wecker.sh' script to manage alarms with integrated RGB control.
Note: Adjust the paths and dependencies based on your system configuration and requirements.
This commit introduces the RGB Cycling Script for the ioBroker Zigbee Adapter.
The script is designed to cycle through RGB colors on an ioBroker device using a zigbee adapter.
Author: Michael Haider
Description:
- The script defines RGB colors: red, green, and blue.
- A function 'set_color' is created to set the color on the ioBroker device.
- The main loop continuously cycles through the colors: green, red, and blue.
- Instructions are provided in the script header to replace the ioBroker address for controlling the color.
Usage:
1. Ensure the script has execution permissions (chmod +x rgb.sh).
2. Replace 'zigbee.0.04cd15fffee03198.color' with the actual ioBroker address for color control.
3. Run the script to start cycling through RGB colors.
Note: Adjust the sleep intervals or uncomment the sleep commands based on your preferences.
This script retrieves current weather information from OpenWeatherMap API. It includes:
- OpenWeatherMap API key for data retrieval.
- Location settings for specifying the city and country.
- API request using cURL to fetch weather data.
- Extraction of relevant information from the JSON response using jq.
- Conversion of temperature from Kelvin to Celsius.
- Formulation of the weather information in a formatted English text.
- Output of the weather information.
Author: Michael Haider
Date: 2024-02-08
- Add an echo statement to output the current notification information when the alarm is turned off.
- Call 'generate_text.sh' script from '/root/iobroker_scripts/general/' when the alarm is turned off, providing a visual notification update.
- Remove the call to 'generate_text.sh' when the alarm is dismissed, as it is now handled when the alarm is turned off.
- Add 'weather' to the 'all' array, allowing inclusion of weather information in the generated text.
- Create directories /sdcard/.mp3/ and /sdcard/.text/ to store MP3 and text files respectively.
- Update txt_dir and mp3_dir paths to use /sdcard/ instead of /root/iobroker_scripts/general/.
- Modify the 'generate_text' function to include weather information in both German and Spanish.
- Create an HTML file (handout.html) for better presentation of text information.
- Style the HTML content with a table for improved readability.
- Add processing messages for each component during HTML generation.
- Extract IP address retrieval into a separate function 'check_ip'.
- Transfer the HTML and text files to A72's /sdcard/ directory using SCP.
- Start 'generate_mp3.sh' on A72 asynchronously using nohup.
- Add 'weather' to category_order array to include weather information in the generated MP3 files.
- Create directories /sdcard/.mp3/ and /sdcard/.text/ to store MP3 and text files respectively.
- Update txt_dir and mp3_dir paths to use /sdcard/ instead of /data/scripts/.
- Modify the 'am start' command to open handout.html in a Chromium tabbed activity for better compatibility.
- Remove unnecessary commented-out am start command and replace it with an updated command.
- Improve comments for better script understanding.
- 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.
- 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.
- 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.
- 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.
- 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.
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.
The morning-alarm.sh script has been modified with the following changes:
- Added the 'break' statement after killing the mpv process to exit the loop when the alarm is dismissed. This prevents unnecessary iterations and improves script efficiency.
- Commented out the line 'killall /data/data/com.termux/files/usr/bin/mpv' since it seems to be redundant after the 'killall mpv' command. If this line is intended for different use, it may need further clarification or context.
These changes enhance the morning-alarm.sh script by optimizing the loop's termination when the alarm is dismissed, improving script efficiency and preventing unnecessary iterations. The redundant 'killall' line has been commented out for clarification.
The generate_text.sh script has been modified with the following changes:
- Updated the variable name 'markdown_file' to 'html_file' to reflect the change in the file format from Markdown to HTML.
- Modified the HTML structure to create a formatted table for the handout, enhancing readability and presentation.
- Added inline CSS styling to the HTML file to improve the table layout and appearance.
These changes improve the generate_text.sh script by switching from Markdown to HTML for better presentation and readability of the handout. Additionally, the HTML table is now more structured and visually appealing.
The commit also includes the removal of the previous notification-related code, which was commented out and not in use.
The goal is to enhance the script's functionality and improve the presentation of the generated handout in HTML format.
The generate_mp3.sh script has been updated with the following changes:
- Added a comment to specify the directory for MP3 files.
- Implemented a command to open the handout.md file using the 'am start' command.
- The 'am start' command opens the file in VIEW mode with the 'text/plain' MIME type.
- This enhancement provides a convenient way to access the handout.md file directly.
The commit aims to improve the functionality and user experience of the generate_mp3.sh script by enabling easy access to the handout file.
The A72_alarm_getter.sh script has been refactored for improved readability and clarity. Changes include:
- Updated script header with standardized information.
- Changed German comments to English for consistency.
- Improved comments and added explanations for key sections.
- Reorganized code structure for better flow.
- Enhanced variable names for increased understanding.
- Added debug information for 'at' jobs.
- Modified output messages for better user understanding.
- Ensured consistent formatting throughout the script.
- Fixed indentation issues and removed unnecessary spaces.
The commit aims to make the script more maintainable and user-friendly, following best practices for scripting.
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.
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.
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.
In this commit, I made several improvements to the 'generate_mp3.sh' script:
1. Removed old complete files before processing to ensure a clean slate.
2. Modified the 'create_mp3_files' function to use '>>' instead of '>' when appending text to the complete files.
3. Updated the comments in the script for better clarity.
These changes help maintain a more organized and reliable MP3 generation process. The script now properly appends text to the 'de_complete.txt' and 'es_complete.txt' files, and it removes old complete files before starting the processing.
File Changes:
- Modified 'generate_mp3.sh' (see diff for details)
Note: Please review and test the changes to ensure they meet your requirements.
- Commented out 'set -e' and 'set -x' to prevent stopping the script on errors and disable debugging by default.
- Introduced functions set_brightness, set_colortemp, and set_color for better code organization.
- Modified brightness and color temperature commands to use the new functions.
- Author: Michael Haider
- Created on: 26.01.2024
- Description: This script generates various text files with information such as date, time, news, and weather in German and Spanish.
- The script includes functions to check the IP address of Lisa's iPhone, generate text files in German and Spanish, transfer files to the A72 device, and start generate_mp3.sh on the A72.
- The generated texts are outputted in both German and Spanish.
Added generate_mp3.sh script:
- Author: Michael Haider
- Created on: 26.01.2024
- Description: This script generates MP3 files from text files in German and Spanish using gtts-cli (Google Text-to-Speech).
- The script exports the path to the programs, defines language and category order, sets directories, and includes a function to create MP3 files.
- The generated MP3 files are created with gtts-cli in German or Spanish slow mode based on the file content.
- The script then sets the media volume and loops through categories and languages to play the generated MP3 files at normal or half speed, based on the language indication.
Made the following changes to the wecker.sh script:
- Adjusted comments and translated the comments and script messages into English for better clarity.
- Introduced error handling for SSH commands, Bluetooth operations, and volume adjustments to ensure the script exits gracefully in case of failures.
- Updated variable names for consistency and improved overall readability of the script.
- Removed unnecessary debug-related code and streamlined the script structure.
- Addressed formatting issues for better code presentation.
Adjusted comments and translated the comments and script messages into English for better clarity. The script now provides more informative output during its execution, including status messages for Bluetooth operations, volume adjustment, and alarm notification checks. Additionally, introduced error handling for Bluetooth and volume adjustment operations to ensure the script exits gracefully in case of failures.
The main program section and function names have been retained for continuity, but the script's overall readability and understandability have been improved through language translation and comments rephrasing.
Corrected the path for the 'weckzeit_datei' variable in A72_alarm_getter.sh script. The original path was pointing to '/root/iobroker_scripts/generel/.weckzeiten.txt' and has been updated to the correct path '/root/iobroker_scripts/general/.weckzeiten.txt'.
This ensures that the script can accurately locate and utilize the 'weckzeit_datei' file, preventing potential issues related to the incorrect file path.
Modify the morning-alarm.sh script to enhance clarity and maintainability. The changes involve updating the path for the mpv command to use '/data/scripts/your-new-morning-alarm.ogg' instead of the previous path '/product/media/audio/alarms/your-new-morning-alarm.ogg'. This adjustment ensures consistency with other script paths and makes it easier to locate the alarm sound file.
Changes made:
- Update the path for the mpv command to '/data/scripts/your-new-morning-alarm.ogg'
This modification simplifies the script and aligns it with the path used in other related scripts, improving overall script coherence.
Adjust the SSH command in the wecker.sh script for better readability and functionality. Instead of 'cmd media_session volume --set 5 --stream 9', use the more descriptive 'cmd media_session volume scripts/--set 5 --stream 9'. Additionally, update the path for the mpv command to use '/data/scripts/your-new-morning-alarm.ogg'. This change ensures consistency and clarity in the script.
Changes made:
- Replace 'cmd media_session volume --set 5 --stream 9' with 'cmd media_session volume scripts/--set 5 --stream 9'
- Update the path for mpv command to '/data/scripts/your-new-morning-alarm.ogg'
- Enabled debugging mode to provide a more detailed log when needed.
- Modified the interval in the check_ip function to 5 seconds for better accuracy in IP retrieval attempts.
- Refactored the sleep_duration calculation to ensure it accurately reflects the intended duration between adjustments.
- Adjusted the loop in gradual adjustment to start from 1, ensuring the initial values are set correctly.
- Replaced multiple consecutive '&& sleep' statements with separate lines for improved readability.
- Simplified the error handling in check_ip and check_notification functions for clarity.
- Removed unnecessary '|| true' statements in error handling.
- Added echo statements to print the light status when it is off in check_external_light_status.
- Improved comments for better script understanding.
These changes enhance the script's execution, improve debugging capabilities, and make the code more readable and maintainable.
- Simplified calculation of brightness_step and colortemp_step for better readability.
- Corrected the calculation of reached final values for brightness and color temperature.
- Introduced sleep_duration variable for improved flexibility in sleep intervals.
- Adjusted the loop to start from 0 to correctly set the initial values.
- Added a comment to clarify the purpose of the loop and its iteration.
- Set the current_brightness and current_colortemp directly to the end values after the loop, ensuring they reach the intended final values.
- Moved the sleep_duration calculation inside the loop for consistency.
This refactoring enhances the script's clarity and ensures accurate calculation of brightness and color temperature steps during the gradual adjustment process. The changes also include improvements in sleep duration handling.
- Updated comments for better clarity and documentation
- Introduced a DEBUG variable to toggle debugging information
- Utilized set -e to stop the script on errors for better error handling
- Corrected the script flow to ensure proper execution of color changes
- Introduced a new ssh_command function for executing SSH commands
- Improved check_ip function for finding the IP address more reliably
- Added DEBUG checks to bypass certain functions for debugging purposes
- Fixed issues with sleep intervals during script execution
- Improved logging by adding echo statements for important steps
- Adjusted variable names for better readability
- Removed unnecessary comments and debug statements
- Added set -e for better error handling
- Introduced command-line option -d for enabling DEBUG mode
- Improved formatting and indentation for better code readability
- Updated comments for better clarity and documentation
- Introduced a DEBUG variable to toggle debugging information
- Utilized set -e to stop the script on errors for better error handling
- Corrected the script flow to ensure proper execution of color changes
- Introduced a new ssh_command function for executing SSH commands
- Improved check_ip function for finding the IP address more reliably
- Added DEBUG checks to bypass certain functions for debugging purposes
- Fixed issues with sleep intervals during script execution
- Improved logging by adding echo statements for important steps
- Adjusted variable names for better readability
- Removed unnecessary comments and debug statements
- Added set -e for better error handling
- Introduced command-line option -d for enabling DEBUG mode
- Improved formatting and indentation for better code readability
- Reordered the iobroker state set commands to set colortemp at the end for better consistency.
- Removed unnecessary ping test in the check_ip function.
- Cleaned up the check_notification function, removed unnecessary echo statements.
- Adjusted the sleep time in the check_notification function to 5 seconds.
- Updated comments and removed unnecessary comments for clarity.
- Minor formatting improvements for better readability.
- Added missing code in the color change loop, now it changes colors as intended. (hopefully)
- Removed redundant comments at the end of the script.
These changes enhance the script's clarity, remove unnecessary code, and ensure proper functionality.
- Entfernen des nicht benötigten Ping-Tests in der check_ip-Funktion.
- Kommentieren des Codes zum Löschen überholter 'at'-Jobs, da er derzeit auskommentiert ist (Muss ich mich ein anderes mal drum kümmern).
- Modified the IP resolution process to allow for multiple attempts with a specified interval.
- Added a retry mechanism to check the IP address multiple times before considering it unsuccessful.
- If the target IP cannot be found after the specified number of attempts, an error message is displayed.
- Updated the SSH command to run the alarm script in the background.
- Modified the IP resolution process to allow for multiple attempts with a specified interval.
- Added a retry mechanism to check the IP address multiple times before considering it unsuccessful.
- If the target IP cannot be found after the specified number of attempts, an error message is displayed.
- Updated the SSH command to run the alarm script in the background.
- Combined IP retrieval and ping test into a single function 'check_ip'.
- Improved error handling for better script robustness.
- Removed unnecessary commented-out code and added comments for clarity.
- Ensured consistency in indentation and formatting.
Author: Michael, Haider
Date: 22.12.2023
- Corrected the calculation of the variable 'lightsOn' to ensure the correct time is set for turning on lights.
- Refactored the script by combining the IP retrieval and ping test into a single function 'check_ip'.
- Improved error handling and added comments for better readability.
Author: Michael, Haider
Date: 22.12.2023
Modified delete_expired_at_jobs function to retain only the next 'at'-job and delete all upcoming jobs. This ensures that only the immediate 'at'-job remains scheduled.
- Geänderte Mac-Adresse für die Funktion check_ip.
- Verwende 'arp-scan' für die IP-Ermittlung.
- Verbesserte Ausgabe und Wartezeit in der Funktion check_notification.
- Start des Alarm-Scripts auf dem Handy mit protokollierter Ausgabe.
- Geänderte Mac-Adresse für Lisas iPhone in check_ip-Funktion.
- Verbesserte Ausgabe und Wartezeit in der check_notification-Funktion.
- Angepasste Schritte und Dauer für die Helligkeits- und Farbtemperaturanpassung.
- Start des Alarm-Scripts auf dem Handy ohne protokollierte Ausgabe.
- Änderung des Bluetooth-Ausschaltbefehls zu 'svc bluetooth disable'.
- Aktualisierung des Lautstärke-Erhöhungsbefehls.
- Verbesserte Ausgabe in der check_notification-Funktion.
- Entfernung des Timeout-Befehls bei der Überprüfung der Weckerbenachrichtigung.
- Hinzufügen von 'killall mpv' bei Beendigung des Weckers.
- Geänderte Mac-Adresse für Lisas iPhone in check_ip-Funktion.
- Verbesserte Ausgabe in der check_notification-Funktion.
- Angepasste Schritte und Dauer für die Helligkeits- und Farbtemperaturanpassung.
- Start des Alarm-Scripts auf dem Handy mit protokollierter Ausgabe.
