diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm index 6a9c8c0e6..7fc7ad7b8 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm @@ -79,6 +79,9 @@ uci:foreach("openmptcprouter","server", function(s) nbserver=nbserver+1 end) + if nbserver == 0 then + uci:set("openmptcprouter","vps","server") + end uci:foreach("openmptcprouter","server", function(s) servername = s[".name"] %> diff --git a/z8102/Makefile b/z8102/Makefile index 4d1c7dfb4..238edc0af 100644 --- a/z8102/Makefile +++ b/z8102/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=z8102 -PKG_VERSION:=0.1 -PKG_RELEASE:=2 +PKG_VERSION:=0.2 +PKG_RELEASE:=1 PKG_MAINTAINER:=Yannick Chabanois @@ -18,6 +18,7 @@ define Package/z8102 SECTION:=OMR CATEGORY:=OpenMPTCProuter TITLE:=Install scripts for z8102 + DEPENDS:=+gpiod-tools PKGARCH:=all endef diff --git a/z8102/files/etc/init.d/z8102 b/z8102/files/etc/init.d/z8102 index e08ee0b2d..8a5a615de 100755 --- a/z8102/files/etc/init.d/z8102 +++ b/z8102/files/etc/init.d/z8102 @@ -12,33 +12,40 @@ log() { start_service() { # sim 1 - i=461 - echo $i > /sys/class/gpio/export - echo "out" > /sys/class/gpio/gpio${i}/direction - echo "0" > /sys/class/gpio/gpio${i}/value + #i=461 + #echo $i > /sys/class/gpio/export + #echo "out" > /sys/class/gpio/gpio${i}/direction + #echo "0" > /sys/class/gpio/gpio${i}/value + gpioset `gpiofind "sim1"`=0 # sim 2 - i=462 - echo $i > /sys/class/gpio/export - echo "out" > /sys/class/gpio/gpio${i}/direction - echo "0" > /sys/class/gpio/gpio${i}/value + #i=462 + #echo $i > /sys/class/gpio/export + #echo "out" > /sys/class/gpio/gpio${i}/direction + #echo "0" > /sys/class/gpio/gpio${i}/value + gpioset `gpiofind "sim2"`=0 # stop modem 1 - i=459 - echo $i > /sys/class/gpio/export - echo "out" > /sys/class/gpio/gpio${i}/direction - echo "0" > /sys/class/gpio/gpio${i}/value + #i=459 + #echo $i > /sys/class/gpio/export + #echo "out" > /sys/class/gpio/gpio${i}/direction + #echo "0" > /sys/class/gpio/gpio${i}/value + gpioset `gpiofind "modem1"`=0 + # stop modem 2 - i=460 - echo $i > /sys/class/gpio/export - echo "out" > /sys/class/gpio/gpio${i}/direction - echo "0" > /sys/class/gpio/gpio${i}/value + #i=460 + #echo $i > /sys/class/gpio/export + #echo "out" > /sys/class/gpio/gpio${i}/direction + #echo "0" > /sys/class/gpio/gpio${i}/value + gpioset `gpiofind "modem2"`=0 sleep 1 # run modem 1 - i=459 - echo "1" > /sys/class/gpio/gpio${i}/value + #i=459 + #echo "1" > /sys/class/gpio/gpio${i}/value + gpioset `gpiofind "modem1"`=1 sleep 3 # run modem 2 - i=460 - echo "1" > /sys/class/gpio/gpio${i}/value + #i=460 + #echo "1" > /sys/class/gpio/gpio${i}/value + gpioset `gpiofind "modem2"`=1 } diff --git a/z8102/files/usr/lib/custom/wdg.sh b/z8102/files/usr/lib/custom/wdg.sh index c583dac72..95c4d6802 100755 --- a/z8102/files/usr/lib/custom/wdg.sh +++ b/z8102/files/usr/lib/custom/wdg.sh @@ -1,13 +1,15 @@ #!/bin/sh -i=457 -echo $i > /sys/class/gpio/export -echo "out" > /sys/class/gpio/gpio${i}/direction +#i=457 +#echo $i > /sys/class/gpio/export +#echo "out" > /sys/class/gpio/gpio${i}/direction while true do - echo "1" > /sys/class/gpio/gpio${i}/value + #echo "1" > /sys/class/gpio/gpio${i}/value + gpioset `gpiofind "watchdog"`=1 sleep 1 - echo "0" > /sys/class/gpio/gpio${i}/value + #echo "0" > /sys/class/gpio/gpio${i}/value + gpioset `gpiofind "watchdog"`=0 sleep 1 done \ No newline at end of file