From 041e7d2663f466d72dda711c5849039f348c5f2e Mon Sep 17 00:00:00 2001 From: Alfonso Gamboa Date: Sat, 4 Jun 2022 04:11:59 -0700 Subject: [PATCH] add volume control --- SD_ROOT/wz_mini/etc/init.d/v3_init.sh | 8 ++++---- SD_ROOT/wz_mini/usr/bin/upgrade-run.sh | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/SD_ROOT/wz_mini/etc/init.d/v3_init.sh b/SD_ROOT/wz_mini/etc/init.d/v3_init.sh index 5accc74..9c01db9 100755 --- a/SD_ROOT/wz_mini/etc/init.d/v3_init.sh +++ b/SD_ROOT/wz_mini/etc/init.d/v3_init.sh @@ -68,11 +68,11 @@ else echo "first boot, initializing" if [[ "$V2" == "true" ]]; then insmod /opt/wz_mini/lib/modules/3.10.14_v2/kernel/audio.ko - LD_LIBRARY_PATH='/opt/wz_mini/lib' /opt/wz_mini/bin/audioplay_t20 /opt/wz_mini/usr/share/audio/init_v2.wav 70 + LD_LIBRARY_PATH='/opt/wz_mini/lib' /opt/wz_mini/bin/audioplay_t20 /opt/wz_mini/usr/share/audio/init_v2.wav $AUDIO_PROMPT_VOLUME rmmod audio else insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/audio.ko spk_gpio=$GPIO alc_mode=0 mic_gain=0 - /opt/wz_mini/bin/audioplay_t31 /opt/wz_mini/usr/share/audio/init.wav 50 + /opt/wz_mini/bin/audioplay_t31 /opt/wz_mini/usr/share/audio/init.wav $AUDIO_PROMPT_VOLUME rmmod audio fi fi @@ -132,11 +132,11 @@ chmod 400 /etc/shadow if [[ -e /opt/wz_mini/swap.gz ]]; then if [[ "$V2" == "true" ]]; then insmod /opt/wz_mini/lib/modules/3.10.14_v2/kernel/audio.ko - LD_LIBRARY_PATH='/opt/wz_mini/lib' /opt/wz_mini/bin/audioplay_t20 /opt/wz_mini/usr/share/audio/swap_v2.wav 70 + LD_LIBRARY_PATH='/opt/wz_mini/lib' /opt/wz_mini/bin/audioplay_t20 /opt/wz_mini/usr/share/audio/swap_v2.wav $AUDIO_PROMPT_VOLUME rmmod audio else insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/audio.ko spk_gpio=$GPIO alc_mode=0 mic_gain=0 - /opt/wz_mini/bin/audioplay_t31 /opt/wz_mini/usr/share/audio/swap.wav 50 + /opt/wz_mini/bin/audioplay_t31 /opt/wz_mini/usr/share/audio/swap.wav $AUDIO_PROMPT_VOLUME rmmod audio fi echo "swap archive present, extracting" diff --git a/SD_ROOT/wz_mini/usr/bin/upgrade-run.sh b/SD_ROOT/wz_mini/usr/bin/upgrade-run.sh index d92aa90..2bfbefb 100755 --- a/SD_ROOT/wz_mini/usr/bin/upgrade-run.sh +++ b/SD_ROOT/wz_mini/usr/bin/upgrade-run.sh @@ -51,6 +51,10 @@ reboot upgrade_mode_start() { +export WZMINI_CFG=/opt/wz_mini/wz_mini.conf + +[ -f $WZMINI_CFG ] && source $WZMINI_CFG + set -x #WCV3 AUDIO GPIO @@ -79,11 +83,11 @@ fi if [[ "$V2" == "true" ]]; then insmod /opt/wz_mini/lib/modules/3.10.14_v2/kernel/audio.ko - LD_LIBRARY_PATH='/opt/wz_mini/lib' /opt/wz_mini/bin/audioplay_t20 /opt/wz_mini/usr/share/audio/upgrade_mode_v2.wav 70 + LD_LIBRARY_PATH='/opt/wz_mini/lib' /opt/wz_mini/bin/audioplay_t20 /opt/wz_mini/usr/share/audio/upgrade_mode_v2.wav $AUDIO_PROMPT_VOLUME rmmod audio else insmod /opt/wz_mini/lib/modules/3.10.14__isvp_swan_1.0__/kernel/audio.ko spk_gpio=$GPIO alc_mode=0 mic_gain=0 - /opt/wz_mini/bin/audioplay_t31 /opt/wz_mini/usr/share/audio/upgrade_mode.wav 50 + /opt/wz_mini/bin/audioplay_t31 /opt/wz_mini/usr/share/audio/upgrade_mode.wav $AUDIO_PROMPT_VOLUME rmmod audio fi