[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-89-gbbb3792
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-89-gbbb3792
|
From: jscheer <js...@us...> - 2010-11-09 13:38:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via bbb379204464e29eba453299174d7d2a1c50791b (commit)
from 54df84e69338318a33141c3402943d16f932abb3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bbb379204464e29eba453299174d7d2a1c50791b
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Nov 9 14:37:52 2010 +0100
[TEST] Use script gpio_helpers.sh in reset_wi2wi.sh
[TEST] Translate console messages in English for PPS test scripts.
-----------------------------------------------------------------------
Summary of changes:
target/pps/scripts/init_wpa.sh | 12 +++++-----
target/pps/scripts/reset_wi2wi.sh | 34 +----------------------------
target/pps/scripts/test_ether_gadget.sh | 2 +-
target/pps/scripts/test_ether_smsc95xx.sh | 2 +-
target/pps/scripts/test_wifi.sh | 2 +-
5 files changed, 10 insertions(+), 42 deletions(-)
diff --git a/target/pps/scripts/init_wpa.sh b/target/pps/scripts/init_wpa.sh
index 6997b89..f838353 100644
--- a/target/pps/scripts/init_wpa.sh
+++ b/target/pps/scripts/init_wpa.sh
@@ -52,13 +52,13 @@ wpa_supplicant -ieth1 -c /etc/wpa_supplicant/wpa_supplicant.conf -Dwext -B dhcli
ifconfig eth1 192.168.0.251
sleep 1
-echo -e "\nPour verifier le port wifi, veuiller tester la commande \"ping 192.168.0.251\" sur le PC hote\n"
-echo -e "\nPour redemarrer le WPA Supplicant, avant de lancer la commande \"sh init_wpa.sh\", ou pour larreter, executer \"sh stop_wpa.sh\"\n"
+echo -e "\nTo check the wifi port (eth1), please enter the command \"ping 192.168.0.251\" on the host PC\n"
+echo -e "\nTo restart the WPA Supplicant, before entering the command \"sh init_wpa.sh\", or to stop it, run \"sh stop_wpa.sh\"\n"
else #[ "$SSID" != "" -a "$PSK" != "" ]; print usage
-echo -e '\nLes variables $SSID et $PSK ne sont pas definies dans /etc/wpa_supplicant/networkConfig.
-Pour executer correctement le WPA Supplicant, vous devez renseigner ces variables de la facon suivante :
+echo -e '\nThe variables $SSID and $PSK are not initialized in /etc/wpa_supplicant/networkConfig.
+To correctly run WPA Supplicant, you must fill these variables in like this:
export SSID=mon_ssid
export PSK=ma_passphrase\n'
@@ -66,8 +66,8 @@ fi
else #[ -f /etc/wpa_supplicant/networkConfig ]; print usage
-echo -e 'Le fichier /etc/wpa_supplicant/networkConfig nexiste pas.
-Pour executer correctement le WPA Supplicant, vous devez creer ce fichier et y definir les variables $SSID et $PSK de la facon suivante :
+echo -e '\nThe file /etc/wpa_supplicant/networkConfig doesnt exist.
+To correctly run WPA Supplicant, you have to create this file and declare the variables $SSID and $PSK like this:
export SSID=mon_ssid
export PSK=ma_passphrase\n'
diff --git a/target/pps/scripts/reset_wi2wi.sh b/target/pps/scripts/reset_wi2wi.sh
index e6a0e01..c1f7341 100644
--- a/target/pps/scripts/reset_wi2wi.sh
+++ b/target/pps/scripts/reset_wi2wi.sh
@@ -14,39 +14,7 @@
# Written by: Jérémie Scheer,,,
#
-GPIO_DEV_DIR=/dev/gpio
-
-setbit()
-{
- PORT=$1
- NB=$2
- VAL=$3
- cat $PORT | sed "s/[0-1]\([0-1]\{$NB\}\)$/$VAL\1/" > $PORT
-}
-
-gpio_set_value()
-{
- GPIO=$1
- VALUE=$2
- if [ "$VALUE" == "1" ]; then
- echo -ne "\x01" > $GPIO_DEV_DIR/$GPIO
- else
- echo -ne "\x00" > $GPIO_DEV_DIR/$GPIO
- fi
-}
-
-# Sets $1 as GPIO; $2 == 1 -> outpout, 0 -> input
-gpio_mode()
-{
- GPIO=`echo $1 | cut -c 3-4`
- VALUE=$2
- PORT=`echo $1 | cut -c 2`
- PORT_DIR="/proc/driver/gpio/port"$PORT"dir"
- PORT_MODE="/proc/driver/gpio/port"$PORT"mode"
-
- setbit $PORT_MODE $GPIO 1
- setbit $PORT_DIR $GPIO $VALUE
-}
+source /usr/bin/gpio_helpers.sh
gpio_mode PE11 1
gpio_set_value PE11 0
diff --git a/target/pps/scripts/test_ether_gadget.sh b/target/pps/scripts/test_ether_gadget.sh
index 4c4f787..168be97 100644
--- a/target/pps/scripts/test_ether_gadget.sh
+++ b/target/pps/scripts/test_ether_gadget.sh
@@ -26,5 +26,5 @@ ifconfig eth1 down 2>/dev/null
ifconfig usb0 192.168.10.1
-echo -e "\nPour verifier le port usb gadget (usb0) , veuiller browser sur 192.168.10.1\n"
+echo -e "\nTo check the USB Gadget port (usb0), please browse on 192.168.10.1\n"
diff --git a/target/pps/scripts/test_ether_smsc95xx.sh b/target/pps/scripts/test_ether_smsc95xx.sh
index 087d869..655682b 100644
--- a/target/pps/scripts/test_ether_smsc95xx.sh
+++ b/target/pps/scripts/test_ether_smsc95xx.sh
@@ -27,5 +27,5 @@ ifconfig eth1 down 2>/dev/null
ifconfig usb0 192.168.0.251
-echo -e "\nPour verifier le port usb1 , veuiller browser sur 192.168.0.251\n"
+echo -e "\nTo check the port usb1, please browse on 192.168.0.251\n"
diff --git a/target/pps/scripts/test_wifi.sh b/target/pps/scripts/test_wifi.sh
index 43f4222..1266525 100644
--- a/target/pps/scripts/test_wifi.sh
+++ b/target/pps/scripts/test_wifi.sh
@@ -28,4 +28,4 @@ iwconfig eth1 mode managed essid armadeus key restricted 93d7-e853-22e8-8784-0b
ifconfig eth1 192.168.0.251
sleep 1
-echo -e "\nPour verifier le port wifi, veuiller browser sur 192.168.0.251\n"
+echo -e "\nTo check the wifi port, please browse on 192.168.0.251\n"
hooks/post-receive
--
armadeus
|
