From e71fd36593eebd402dd2aa2425473827dda1c9f2 Mon Sep 17 00:00:00 2001 From: krebs Date: Fri, 9 Sep 2011 20:06:13 -0400 Subject: //noise /overlord: little fixture --- noise/modules/overlord | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/noise/modules/overlord b/noise/modules/overlord index 6df2451d..6edb0fd8 100755 --- a/noise/modules/overlord +++ b/noise/modules/overlord @@ -2,22 +2,31 @@ set -euf announce() { -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 90% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 80% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 70% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 60% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 50% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 90% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 80% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 70% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 60% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 50% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 40% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 30% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 20% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 10% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 0% /krebs/streams/streams stop amixer -q -c 0 -D hw:0 sset Front 100% mplayer /krebs/god/overlord/announce.mp3 -/krebs/streams/streams start & espeak -v de -s 120 -a 900 "$*" -amixer -q -c 0 -D hw:0 sset Front 40% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 50% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 60% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 70% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 80% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 90% +/krebs/streams/streams start +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 0% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 10% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 20% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 30% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 40% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 50% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 60% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 70% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 80% +sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 90% } case "$1" in -- cgit v1.2.3 From 3b48e005f95dbadcef714e225b3b104b3935e9c7 Mon Sep 17 00:00:00 2001 From: krebs Date: Fri, 9 Sep 2011 20:26:03 -0400 Subject: //noise /overlord: removed redundancy --- noise/modules/overlord | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/noise/modules/overlord b/noise/modules/overlord index 6edb0fd8..53766116 100755 --- a/noise/modules/overlord +++ b/noise/modules/overlord @@ -1,35 +1,31 @@ #! /bin/sh set -euf +max=100 +step=10 +min=0 + announce() { -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 90% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 80% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 70% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 60% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 50% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 40% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 30% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 20% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 10% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 0% -/krebs/streams/streams stop -amixer -q -c 0 -D hw:0 sset Front 100% -mplayer /krebs/god/overlord/announce.mp3 -espeak -v de -s 120 -a 900 "$*" -/krebs/streams/streams start -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 0% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 10% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 20% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 30% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 40% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 50% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 60% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 70% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 80% -sleep 0.1; amixer -q -c 0 -D hw:0 sset Front 90% + # fade-out streams + for i in `seq $max -$step $min`; do + amixer -q -c 0 -D hw:0 sset Front $i% + sleep 0.1 + done + /krebs/streams/streams stop + + amixer -q -c 0 -D hw:0 sset Front $max% + mplayer /krebs/god/overlord/announce.mp3 >/dev/null + espeak -v de -s 120 -a 900 "$*" + + # fade-in streams + /krebs/streams/streams start + for i in `seq $min $step $max`; do + sleep 0.1 + amixer -q -c 0 -D hw:0 sset Front $i% + done } -case "$1" in +case "${1---help}" in --help) echo "Make an announcement! Usage: /overlord ";; *) announce "$@";; esac -- cgit v1.2.3 From 27a38dd34af2e035eb0d37ce2f27f169763c3538 Mon Sep 17 00:00:00 2001 From: krebs Date: Fri, 9 Sep 2011 20:35:04 -0400 Subject: //noise /temp: fix inside-temperature bug --- noise/modules/temp | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/noise/modules/temp b/noise/modules/temp index 2f1dfcef..3c364acd 100755 --- a/noise/modules/temp +++ b/noise/modules/temp @@ -1,33 +1,40 @@ #! /bin/bash +temper=/krebs/temper/temper + main() { case "$1" in (--help) echo "report temperature in K, °C, °R, or °F." + exit ;; (-C|--celsius) - espeak_inside `inside_temp 'x - 273.15'` Grad Zelsius - espeak_outside `outside_temp 'x - 273.15'` Grad Zelsius + unit='Grad Zelsius' + formula='x - 273.15' ;; (-F|--fahrenheit) - espeak_inside `inside_temp 'x * 9/5 - 459.67'` Grad Fahrenheit - espeak_outside `outside_temp 'x * 9/5 - 459.67'` Grad Fahrenheit + unit='Grad Fahrenheit' + formula='x * 9/5 - 459.67' ;; (-R|--rankine) - espeak_inside `inside_temp 'x * 9/5'` Grad Renkin - espeak_outside `outside_temp 'x * 9/5'` Grad Renkin + unit='Grad Renkin' + formula='x * 9/5' ;; (-K|--kelvin|*) - espeak_inside `inside_temp` Kelvin - espeak_outside `outside_temp` Kelvin + unit='Kelvin' + formula=x ;; esac + if test -f $temper -a -x $temper; then + espeak_inside `inside_temp "$formula"` $unit + fi + espeak_outside `outside_temp "$formula"` $unit } ## temp [] ## Echo temperature in K. If formula is given then return that result instead. inside_temp() { - echo "scale=2; x=`/krebs/temper/temper` + 273.15; ${1-x}" | bc + echo "scale=2; x=`$temper` + 273.15; ${1-x}" | bc } outside_temp() { -- cgit v1.2.3 From 8712dfa17f0dd7b90c646e13d2cd4e0d4c5a11e6 Mon Sep 17 00:00:00 2001 From: krebs Date: Fri, 9 Sep 2011 21:26:15 -0400 Subject: //god/overlord: be the right and only one This commit also makes the //noise module a pure wrapper around the read overlord. --- god/overlord/index | 27 +++++++++++++++++++++++++++ god/overlord/overlord | 19 ------------------- noise/modules/overlord | 33 ++++++++------------------------- 3 files changed, 35 insertions(+), 44 deletions(-) create mode 100755 god/overlord/index delete mode 100755 god/overlord/overlord diff --git a/god/overlord/index b/god/overlord/index new file mode 100755 index 00000000..27506ccd --- /dev/null +++ b/god/overlord/index @@ -0,0 +1,27 @@ +#! /bin/sh +set -euf + +# cd // +cd $(dirname $(readlink -f $0))/../.. + +max=100 +step=10 +min=0 + +# fade-out streams +for i in `seq $max -$step $min`; do + amixer -q -c 0 -D hw:0 sset Front $i% + sleep 0.1 +done +streams/streams stop + +amixer -q -c 0 -D hw:0 sset Front $max% +mplayer god/overlord/announce.mp3 >/dev/null +espeak -v de -s 120 -a 900 "$*" + +# fade-in streams +streams/streams start +for i in `seq $min $step $max`; do + sleep 0.1 + amixer -q -c 0 -D hw:0 sset Front $i% +done diff --git a/god/overlord/overlord b/god/overlord/overlord deleted file mode 100755 index 501afc80..00000000 --- a/god/overlord/overlord +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh -set -euf - -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 90% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 80% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 70% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 60% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 50% -/krebs/streams/streams stop -amixer -q -c 0 -D hw:0 sset Front 100% -mplayer announce.mp3 -/krebs/streams/streams start & -espeak -v de -s 120 -a 900 "$*" -amixer -q -c 0 -D hw:0 sset Front 40% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 50% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 60% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 70% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 80% -sleep 0.4; amixer -q -c 0 -D hw:0 sset Front 90% diff --git a/noise/modules/overlord b/noise/modules/overlord index 53766116..ded8627a 100755 --- a/noise/modules/overlord +++ b/noise/modules/overlord @@ -1,31 +1,14 @@ #! /bin/sh set -euf -max=100 -step=10 -min=0 - -announce() { - # fade-out streams - for i in `seq $max -$step $min`; do - amixer -q -c 0 -D hw:0 sset Front $i% - sleep 0.1 - done - /krebs/streams/streams stop - - amixer -q -c 0 -D hw:0 sset Front $max% - mplayer /krebs/god/overlord/announce.mp3 >/dev/null - espeak -v de -s 120 -a 900 "$*" - - # fade-in streams - /krebs/streams/streams start - for i in `seq $min $step $max`; do - sleep 0.1 - amixer -q -c 0 -D hw:0 sset Front $i% - done -} +# cd // +cd $(dirname $(readlink -f $0))/../.. case "${1---help}" in - --help) echo "Make an announcement! Usage: /overlord ";; - *) announce "$@";; + --help) + echo "Make an announcement! Usage: /overlord " + ;; + *) + exec god/overlord/index "$@" + ;; esac -- cgit v1.2.3 From 9c9e9809e61e5e6a45c5f5babd0fef17cdc1d33d Mon Sep 17 00:00:00 2001 From: krebs Date: Fri, 9 Sep 2011 21:29:15 -0400 Subject: //noise /temp: compress space --- noise/modules/temp | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/noise/modules/temp b/noise/modules/temp index 3c364acd..a11c3720 100755 --- a/noise/modules/temp +++ b/noise/modules/temp @@ -3,26 +3,18 @@ temper=/krebs/temper/temper main() { - case "$1" in + case "${1--K}" in (--help) echo "report temperature in K, °C, °R, or °F." exit ;; - (-C|--celsius) - unit='Grad Zelsius' - formula='x - 273.15' - ;; - (-F|--fahrenheit) - unit='Grad Fahrenheit' - formula='x * 9/5 - 459.67' - ;; - (-R|--rankine) - unit='Grad Renkin' - formula='x * 9/5' - ;; - (-K|--kelvin|*) - unit='Kelvin' - formula=x + (-C|--celsius) unit='Grad Zelsius' ; formula='x - 273.15' ;; + (-F|--fahrenheit) unit='Grad Fahrenheit'; formula='x * 9/5 - 459.67' ;; + (-R|--rankine) unit='Grad Renkin' ; formula='x * 9/5' ;; + (-K|--kelvin) unit='Kelvin' ; formula='x' ;; + (*) + echo 'Error 1: you are made of stupid!' + exit 23 ;; esac if test -f $temper -a -x $temper; then @@ -43,13 +35,8 @@ outside_temp() { ` + 273.15; ${1-x}" | bc } -espeak_inside() { - echo Die Krebs-tempera-tur beträgt $@ | to_espeak -} - -espeak_outside() { - echo Die Außen-tempera-tur beträgt $@ | to_espeak -} +espeak_inside() { echo Die Krebs-tempera-tur beträgt $@ | to_espeak; } +espeak_outside() { echo Die Außen-tempera-tur beträgt $@ | to_espeak; } to_espeak() { sed ' -- cgit v1.2.3