diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c762aa01..bcdc7579a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: build: strategy: matrix: - OMR_TARGET: [bpi-r1, bpi-r2, bpi-r3, bpi-r4, bpi-r4-poe, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64, ubnt-erx, r4s, r7800, rutx12, rutx50, r5s, qnap-301w, rpi5, z8102ax_128m, z8102ax_64m, gl-mt6000, r5c] + OMR_TARGET: [bpi-r1, bpi-r2, bpi-r3, bpi-r4, bpi-r4-poe, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64, ubnt-erx, r4s, r7800, rutx12, rutx50, r5s, qnap-301w, rpi5, z8102ax_128m, z8102ax_64m, gl-mt6000, r5c, z8109ax_128m] OMR_KERNEL: [6.6, 6.12] runs-on: ubuntu-latest continue-on-error: true diff --git a/z8102/files/etc/init.d/z8102 b/z8102/files/etc/init.d/z8102 index f7afb900f..8a2ca4113 100755 --- a/z8102/files/etc/init.d/z8102 +++ b/z8102/files/etc/init.d/z8102 @@ -9,85 +9,35 @@ log() { logger -t "z8102" "$@" } -modem1() +modem_reset() { - # 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 - if [ -e /sys/class/gpio/sim1/value ]; then - echo "0" > /sys/class/gpio/sim1/value + modemnb=$1 + # sim + if [ -e /sys/class/gpio/sim${modemnb}/value ]; then + echo "0" > /sys/class/gpio/sim${modemnb}/value elif [ -f /usr/bin/gpiofind ]; then - gpioset `gpiofind "sim1"`=0 + gpioset `gpiofind "sim=${modemnb}"`=0 else - gpioset -t0 sim1=0 + gpioset -t0 sim${modemnb}=0 fi - # 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 - if [ -e /sys/class/gpio/modem1/value ]; then - echo "0" > /sys/class/gpio/modem1/value + # stop modem + if [ -e /sys/class/gpio/modem${modemnb}/value ]; then + echo "0" > /sys/class/gpio/modem${modemnb}/value elif [ -f /usr/bin/gpiofind ]; then - gpioset `gpiofind "modem1"`=0 + gpioset `gpiofind "modem${modemnb}"`=0 else - gpioset -t0 modem1=0 + gpioset -t0 modem${modemnb}=0 fi sleep 1 - # run modem 1 - #i=459 - #echo "1" > /sys/class/gpio/gpio${i}/value - if [ -e /sys/class/gpio/modem1/value ]; then - echo "1" > /sys/class/gpio/modem1/value + # run modem + if [ -e /sys/class/gpio/modem${modemnb}/value ]; then + echo "1" > /sys/class/gpio/modem${modemnb}/value elif [ -f /usr/bin/gpiofind ]; then - gpioset `gpiofind "modem1"`=1 + gpioset `gpiofind "modem${modemnb}"`=1 else - gpioset -t0 modem1=1 - fi -} - -modem2() -{ - # 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 - if [ -e /sys/class/gpio/sim2/value ]; then - echo "0" > /sys/class/gpio/sim2/value - elif [ -f /usr/bin/gpiofind ]; then - gpioset `gpiofind "sim2"`=0 - else - gpioset -t0 sim2=0 - fi - - # 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 - if [ -e /sys/class/gpio/modem2/value ]; then - echo "0" > /sys/class/gpio/modem2/value - elif [ -f /usr/bin/gpiofind ]; then - gpioset `gpiofind "modem2"`=0 - else - gpioset -t0 modem2=0 - fi - - sleep 1 - # run modem 2 - #i=460 - #echo "1" > /sys/class/gpio/gpio${i}/value - if [ -e /sys/class/gpio/modem2/value ]; then - echo "1" > /sys/class/gpio/modem2/value - elif [ -f /usr/bin/gpiofind ]; then - gpioset `gpiofind "modem2"`=1 - else - gpioset -t0 modem2=1 + gpioset -t0 modem${modemnb}=1 fi } @@ -96,18 +46,28 @@ start_service() modem="$1" if [ -z "$modem" ]; then log "Enable SIMs and reboot modems..." - modem1 - modem2 + modem_reset 1 + modem_reset 2 + if [ -n "$(cat /etc/board.json | grep z8109)" ]; then + modem_reset 3 + modem_reset 4 + fi elif [ "$modem" = "modem1" ]; then log "Enable SIM1 and reboot modem1..." - modem1 + modem_reset 1 elif [ "$modem" = "modem2" ]; then log "Enable SIM2 and reboot modem2..." - modem2 + modem_reset 2 + elif [ "$modem" = "modem3" ]; then + log "Enable SIM3 and reboot modem3..." + modem_reset 3 + elif [ "$modem" = "modem4" ]; then + log "Enable SIM4 and reboot modem4..." + modem_reset 4 fi } restart() { - start_service "@" -} \ No newline at end of file + start_service "$@" +}