From 8645d2f76b087d38f8cdd67d96ed08b6bc60c9c1 Mon Sep 17 00:00:00 2001 From: F5OEO Date: Tue, 18 Oct 2016 10:09:49 +0000 Subject: [PATCH] Add setting of I/Q pins --- scripts/a.sh | 6 +++--- scripts/langfr.sh | 5 +++++ scripts/langgb.sh | 4 ++++ scripts/menu.sh | 23 ++++++++++++++++++++++- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/scripts/a.sh b/scripts/a.sh index 50a182f..c6e0f81 100755 --- a/scripts/a.sh +++ b/scripts/a.sh @@ -68,15 +68,15 @@ PIDVIDEO=$(get_config_var pidvideo $CONFIGFILE) PIDPMT=$(get_config_var pidpmt $CONFIGFILE) SERVICEID=$(get_config_var serviceid $CONFIGFILE) LOCATOR=$(get_config_var locator $CONFIGFILE) - +PIN_I=$(get_config_var gpio_i $CONFIGFILE) +PIN_Q=$(get_config_var gpio_q $CONFIGFILE) ANALOGCAMNAME=$(get_config_var analogcamname $CONFIGFILE) VNCADDR=$(get_config_var vncaddr $CONFIGFILE) #v4l2-ctl --overlay=0 -PIN_I=12 -PIN_Q=13 + detect_audio diff --git a/scripts/langfr.sh b/scripts/langfr.sh index 6ee58fb..c35936b 100644 --- a/scripts/langfr.sh +++ b/scripts/langfr.sh @@ -21,6 +21,11 @@ StrInputSetupVNCName="IP du PC avec VNC (mot de passe datv)" StrInputSetupVNCTitle="Configuration VNC" StrInputSetupDESKTOP="Ecran du rasberry" +StrPIN_IContext="GPIO pour I {12,18,40} (12 par defaut:pin32)" +StrPIN_ITitle="Sortie GPIO pour I" +StrPIN_QContext="GPIO pour Q {13,19,41}(13 par defaut:pin33)" +StrPIN_QTitle="Sortie GPIO pour Q" + ######## CALL MENU ###################" StrCallContext="Paramètrage indicatif" StrCallTitle="Indicatif" diff --git a/scripts/langgb.sh b/scripts/langgb.sh index 4673073..78b739b 100644 --- a/scripts/langgb.sh +++ b/scripts/langgb.sh @@ -20,6 +20,10 @@ StrInputSetupVNC="Display PC via VNC" StrInputSetupVNCName="IP of PC using VNC (password datv)" StrInputSetupVNCTitle="VNC setup" StrInputSetupDESKTOP="Rasberry display" +StrPIN_IContext="Q GPIO {12,18,40} (12 is default:pin32)" +StrPIN_ITitle="I output GPIO" +StrPIN_QContext="Q GPIO {13,19,41}(13 is defaut:pin33)" +StrPIN_QTitle="Q output GPIO" ######## CALL MENU ###################" StrCallContext="CALL Setup" StrCallTitle="CALL" diff --git a/scripts/menu.sh b/scripts/menu.sh index e3d87bf..49b1578 100755 --- a/scripts/menu.sh +++ b/scripts/menu.sh @@ -397,7 +397,18 @@ choutput=$(whiptail --title "$StrOutputSetupTitle" --radiolist \ if [ $? -eq 0 ]; then case "$choutput" in - IQ) ;; + IQ) + PIN_I=$(get_config_var gpio_i $CONFIGFILE) + PIN_I=$(whiptail --inputbox "$StrPIN_IContext" 8 78 $PIN_I --title "$StrPIN_ITitle" 3>&1 1>&2 2>&3) + if [ $? -eq 0 ]; then + set_config_var gpio_i "$PIN_I" $CONFIGFILE + fi + PIN_Q=$(get_config_var gpio_q $CONFIGFILE) + PIN_Q=$(whiptail --inputbox "$StrPIN_QContext" 8 78 $PIN_Q --title "$StrPIN_QTitle" 3>&1 1>&2 2>&3) + if [ $? -eq 0 ]; then + set_config_var gpio_q "$PIN_Q" $CONFIGFILE + fi + ;; QPSKRF) FREQ_OUTPUT=$(get_config_var freqoutput $CONFIGFILE) FREQ=$(whiptail --inputbox "$StrOutputRFFreqContext" 8 78 $FREQ_OUTPUT --title "$StrOutputRFFreqTitle" 3>&1 1>&2 2>&3) @@ -418,6 +429,16 @@ if [ $? -eq 0 ]; then fi ;; DIGITHIN) + PIN_I=$(get_config_var gpio_i $CONFIGFILE) + PIN_I=$(whiptail --inputbox "$StrPIN_IContext" 8 78 $PIN_I --title "$StrPIN_ITitle" 3>&1 1>&2 2>&3) + if [ $? -eq 0 ]; then + set_config_var gpio_i "$PIN_I" $CONFIGFILE + fi + PIN_Q=$(get_config_var gpio_q $CONFIGFILE) + PIN_Q=$(whiptail --inputbox "$StrPIN_QContext" 8 78 $PIN_Q --title "$StrPIN_QTitle" 3>&1 1>&2 2>&3) + if [ $? -eq 0 ]; then + set_config_var gpio_q "$PIN_Q" $CONFIGFILE + fi FREQ_OUTPUT=$(get_config_var freqoutput $CONFIGFILE) FREQ=$(whiptail --inputbox "$StrOutputRFFreqContext" 8 78 $FREQ_OUTPUT --title "$StrOutputRFFreqTitle" 3>&1 1>&2 2>&3) if [ $? -eq 0 ]; then