Skip to content

Implement wake function with multiple timers #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Implement wake function with multiple timers #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51fd91b
Minor typo error
pickfire Sep 22, 2016
3f3c30d
Thoughly revised wake function
pickfire Sep 22, 2016
34e79da
Merge branch 'wake' of https://github.com/Webconverger/rpi2 into wake
pickfire Sep 22, 2016
f887aba
Final update for wake=
pickfire Nov 6, 2016
7fb9bff
Remove uneeded /bootfat and /bin files
pickfire Nov 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed boot/System Volume Information/IndexerVolumeGuid
View file
Open in desktop
Binary file not shown.
Binary file removed usr/bin/physlock
View file
Open in desktop
Binary file not shown.
163 changes: 86 additions & 77 deletions usr/bin/webc-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ fi

. "$config_runtime"


for x in $(cmdline)
do
case $x in
Expand Down Expand Up @@ -100,6 +101,91 @@ do
esac
done


if cmdline_has wake
then
i=0
IFS=$'\n'; for w in $(cmdline_get wake | tr ^ \\n)
do
sleep_time=0
for t in $(echo ${w#*+} | grep -o '[0-9]*[A-Za-z]')
do
case $t in
*[Ww]) sleep_time=$(( $sleep_time + ${t%[Ww]}*60*60*24*7 ));;
*[Dd]) sleep_time=$(( $sleep_time + ${t%[Dd]}*60*60*24 ));;
*[Hh]) sleep_time=$(( $sleep_time + ${t%[Hh]}*60*60 ));;
*[Mm]) sleep_time=$(( $sleep_time + ${t%[Mm]}*60 ));;
*[Ss]) sleep_time=$(( $sleep_time + ${t%[Ss]} ));;
esac
done
wday=$(echo "$w" | grep -o '[0-9]\+:[0-9]\+\s') # Eg. 10:00
dura=$(( $(date +%s --date="$wday") + $sleep_time )) # epoch

wake[$i]=${w% +*} # Eg. Sun 10:0
unwake[$i]=$(date +"${w% $wday*} %H:%M" -d "@$dura") # Eg. Mon-Fri 20:00
logger "Wake at ${wake[$i]} till ${unwake[$i]}"
i=$(( $i + 1 ))
done
unset i

cat > /etc/systemd/system/wake.timer <<EOF
[Unit]
Description=Starts screen waking timer

[Timer]
$(echo "${wake[*]}" | sed 's/^/OnCalendar=/')
Persistent=true

[Install]
WantedBy=multi-user.target
EOF
cat > /etc/systemd/system/unwake.timer <<EOF
[Unit]
Description=Stop screen waking timer

[Timer]
$(echo "${unwake[*]}" | sed 's/^/OnCalendar=/')
Persistent=true

[Install]
WantedBy=multi-user.target
EOF
cat > /etc/systemd/system/wake.service <<EOF
[Unit]
Description=Wake up!
Before=sleep.target

[Service]
Environment="DISPLAY=:0"
ExecStart=$(which xset) dpms force on
EOF
cat > /etc/systemd/system/unwake.service <<EOF
[Unit]
Description=Wake up! Or not!

[Service]
Environment="DISPLAY=:0"
ExecStart=$(which xset) dpms force off
EOF

# TODO: not sure if this is required
# if cmdline_has noblank
# then
# echo "ExecStart=$(which xset) s off"
# echo "ExecStartPost=$(which xset) -dpms"
# else
# echo "ExecStart=$(which xset) s ${secondstillblank:-10}"
# fi >> /etc/systemd/system/wake.service

systemctl daemon-reload
systemctl start unwake.timer
systemctl start wake.timer
else
systemctl stop unwake.timer
systemctl stop wake.timer
fi


if cmdline_has debug
then
sshkey=$(cmdline_get ssh)
Expand Down Expand Up @@ -135,83 +221,6 @@ then
fi


if cmdline_has wake
then
wake=$(cmdline_get wake)
wake="${wake/_/ }" # TODO: Use &20 instead of _
physlock -d & # Start screen locker first

for t in $(echo ${wake#*+} | grep -o '[0-9]*[A-Za-z]')
do
case $t in
*[Ww]) sleep_time=$(( $sleep_time + ${t%[Ww]} * 7 * 24 * 60 * 60));;
*[Dd]) sleep_time=$(( $sleep_time + ${t%[Dd]} * 24 * 60 *60));;
*[Hh]) sleep_time=$(( $sleep_time + ${t%[Hh]} * 60 * 60));;
*[Mm]) sleep_time=$(( $sleep_time + ${t%[Mm]} * 60));;
*[Ss]) sleep_time=$(( $sleep_time + ${t%[Ss]} ));;
esac
done

wday=$(echo $wake | grep -o '\s.*:.*\s') # Eg. 10:00
tstart=$(date +%s --date="$wday") # Time to start (epoch)
tstop=$(( $tstart + $sleep_time )) # Time to stop (epoch)
unwake=$(date +"${wake%$wday*} %H:%M:%S" --date="@$tstop") # Eg. Mon-Fri 20:00

logger "Waking up system at ${wake%+*} and unwake at $unwake"

if test "$wake"
then
cat > /etc/systemd/system/wake.timer <<EOF
[Unit]
Description=Starts screen waking timer

[Timer]
OnCalendar=${wake%+*}

[Install]
WantedBy=multi-user.target
EOF
cat > /etc/systemd/system/unwake.timer <<EOF
[Unit]
Description=Stop screen waking timer

[Timer]
OnCalendar=${unwake}

[Install]
WantedBy=multi-user.target
EOF
cat > /etc/systemd/system/wake.service <<EOF
[Unit]
Description=Wake up!
Before=sleep.target

[Service]
ExecStart=pkill physlock

[Install]
WantedBy=sleep.target
EOF
cat > /etc/systemd/system/unwake.service <<EOF
[Unit]
Description=Wake up! Or not!

[Service]
ExecStart=phylock -d &

[Install]
WantedBy=sleep.target
EOF
systemctl daemon-reload
systemctl start wake.timer
systemctl start unwake.timer
fi
else
systemctl stop wake.timer
systemctl stop unwake.timer
fi


wpassid=$( cmdline_get wpa-ssid )
wpapsk=$( cmdline_get wpa-psk )
if test "$wpassid" && test "$wpapsk"
Expand Down