diff options
Diffstat (limited to 'recipes-bsp')
-rw-r--r-- | recipes-bsp/multitech/mtac-eth_1.1.1.bb | 2 | ||||
-rw-r--r-- | recipes-bsp/multitech/mtac-gpiob_1.1.2.bb | 2 | ||||
-rw-r--r-- | recipes-bsp/multitech/mtac-lora_1.1.5.bb | 2 | ||||
-rw-r--r-- | recipes-bsp/multitech/mtac-mfser_1.1.1.bb | 2 | ||||
-rw-r--r-- | recipes-bsp/multitech/mtac-pulse_1.1.1.bb | 2 | ||||
-rw-r--r-- | recipes-bsp/multitech/mtac-xdot_1.1.1.bb | 2 | ||||
-rw-r--r-- | recipes-bsp/multitech/mtac_4.0.7.bb | 3 | ||||
-rw-r--r-- | recipes-bsp/multitech/mts-id-eeprom.inc | 3 | ||||
-rw-r--r-- | recipes-bsp/multitech/mts-io-sysfs_0.1.14.bb (renamed from recipes-bsp/multitech/mts-io-sysfs_0.1.13.bb) | 3 | ||||
-rw-r--r-- | recipes-bsp/multitech/mts-io.inc | 4 | ||||
-rw-r--r-- | recipes-bsp/multitech/mts-io/mts-io.conf | 10 | ||||
-rw-r--r-- | recipes-bsp/multitech/mts-io/mts-io.mtcap.init | 38 | ||||
-rw-r--r-- | recipes-bsp/multitech/mts-io_4.5.3.bb (renamed from recipes-bsp/multitech/mts-io_4.5.1.bb) | 0 |
13 files changed, 59 insertions, 14 deletions
diff --git a/recipes-bsp/multitech/mtac-eth_1.1.1.bb b/recipes-bsp/multitech/mtac-eth_1.1.1.bb index 94b1e5f..d82da3d 100644 --- a/recipes-bsp/multitech/mtac-eth_1.1.1.bb +++ b/recipes-bsp/multitech/mtac-eth_1.1.1.bb @@ -15,7 +15,7 @@ SRCREV = "${PV}" PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}" SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac-eth.git;protocol=ssh \ + git://git.multitech.net/mtac-eth.git;protocol=git;branch=master \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb b/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb index 48a4d6e..fa675a0 100644 --- a/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb +++ b/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb @@ -17,7 +17,7 @@ SRCREV = "${PV}" PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}" SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac-gpiob.git;protocol=ssh \ + git://git.multitech.net/mtac-gpiob.git;protocol=git;branch=master \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mtac-lora_1.1.5.bb b/recipes-bsp/multitech/mtac-lora_1.1.5.bb index 34d402d..3d9d511 100644 --- a/recipes-bsp/multitech/mtac-lora_1.1.5.bb +++ b/recipes-bsp/multitech/mtac-lora_1.1.5.bb @@ -15,7 +15,7 @@ SRCREV = "${PV}" PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}" SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac-lora.git;protocol=ssh \ + git://git.multitech.net/mtac-lora.git;protocol=git;branch=master \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb index b9f5bde..c89ecd5 100644 --- a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb +++ b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb @@ -15,7 +15,7 @@ SRCREV = "${PV}" PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}" SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac-mfser.git;protocol=ssh \ + git://git.multitech.net/mtac-mfser.git;protocol=git;branch=master \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mtac-pulse_1.1.1.bb b/recipes-bsp/multitech/mtac-pulse_1.1.1.bb index 5a4c21c..4e44e9a 100644 --- a/recipes-bsp/multitech/mtac-pulse_1.1.1.bb +++ b/recipes-bsp/multitech/mtac-pulse_1.1.1.bb @@ -15,7 +15,7 @@ SRCREV = "${PV}" PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}" SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac-pulse.git;protocol=ssh \ + git://git.multitech.net/mtac-pulse.git;protocol=git;branch=master \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mtac-xdot_1.1.1.bb b/recipes-bsp/multitech/mtac-xdot_1.1.1.bb index e41865a..add2280 100644 --- a/recipes-bsp/multitech/mtac-xdot_1.1.1.bb +++ b/recipes-bsp/multitech/mtac-xdot_1.1.1.bb @@ -15,7 +15,7 @@ SRCREV = "${PV}" PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}" SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac-xdot.git;protocol=ssh \ + git://git.multitech.net/mtac-xdot.git;protocol=git;branch=master \ file://xdot-util \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mtac_4.0.7.bb b/recipes-bsp/multitech/mtac_4.0.7.bb index b032a9a..5773863 100644 --- a/recipes-bsp/multitech/mtac_4.0.7.bb +++ b/recipes-bsp/multitech/mtac_4.0.7.bb @@ -19,9 +19,8 @@ RPROVIDES_kernel-module-${PN} = "mtac" PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}" -# git://git.multitech.net/mtac.git;protocol=git SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac.git;protocol=ssh \ + git://git.multitech.net/mtac.git;protocol=git;branch=master \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mts-id-eeprom.inc b/recipes-bsp/multitech/mts-id-eeprom.inc index 0ea455a..bfe9d9f 100644 --- a/recipes-bsp/multitech/mts-id-eeprom.inc +++ b/recipes-bsp/multitech/mts-id-eeprom.inc @@ -25,8 +25,7 @@ TARGET_CFLAGS_append_mtcpmhs = " -D MTCDT3B" SRCREV = "${PV}" -# SRC_URI = "git://git.multitech.net/mts-id-eeprom.git;protocol=git" -SRC_URI = "git://git@gitlab.multitech.net/mirrors/mts-id-eeprom;protocol=ssh" +SRC_URI = "git://git.multitech.net/mts-id-eeprom;protocol=git;branch=master" SRC_URI_append_mtcdt = " file://mtcdt-fpga-v31.hex file://mtcdt-fpga-v35.hex" SRC_URI_append_mtcap = " file://mtcap-fpga-v31.hex file://mtcap-fpga-v35.hex" diff --git a/recipes-bsp/multitech/mts-io-sysfs_0.1.13.bb b/recipes-bsp/multitech/mts-io-sysfs_0.1.14.bb index 8ad2bce..074ce11 100644 --- a/recipes-bsp/multitech/mts-io-sysfs_0.1.13.bb +++ b/recipes-bsp/multitech/mts-io-sysfs_0.1.14.bb @@ -12,8 +12,7 @@ PR = "r0" SRCREV = "${PV}" -# "git://git.multitech.net/mts-io-sysfs;protocol=git;branch=master -SRC_URI = "git://git@gitlab.multitech.net/mirrors/mts-io-sysfs;protocol=ssh;branch=master \ +SRC_URI = "git://git.multitech.net/mts-io-sysfs.git;protocol=git;branch=master \ file://mts-io-sysfs.init" S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc index b81e7f0..65cb00c 100644 --- a/recipes-bsp/multitech/mts-io.inc +++ b/recipes-bsp/multitech/mts-io.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://io-module/COPYING;md5=94d55d512a9ba36caa9b7df079bae19 file://io-tool/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ " do_fetch[depends] += "virtual/kernel:do_shared_workdir" -INC_PR = "r3" +INC_PR = "r4" SRCREV = "${PV}" PR = "${INC_PR}.0-${KERNEL_MODULE_PACKAGE_SUFFIX}" @@ -19,7 +19,7 @@ RDEPENDS_${PN}-noarch_append_mtcap = " mts-io-sysfs i2c-tools" # git://git.multitech.net/mts-io.git;protocol=git SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mts-io;protocol=ssh \ + git://git.multitech.net/mts-io.git;protocol=git;branch=master \ file://led-status_heartbeat_trigger \ file://lora-led-updater \ file://mts-io.init \ diff --git a/recipes-bsp/multitech/mts-io/mts-io.conf b/recipes-bsp/multitech/mts-io/mts-io.conf index b5b4275..4ed5e31 100644 --- a/recipes-bsp/multitech/mts-io/mts-io.conf +++ b/recipes-bsp/multitech/mts-io/mts-io.conf @@ -7,3 +7,13 @@ GPSGNSSRESET=1 # 0 is off # 1 is on DEBUG=0 + +# Supercap Feature +# Do not let boot proceed until supercap is full. +# Prevents loss of data when power is out. +SUPERCAPFULL=1 + +# Maximum wait time for SUPERCAPFULL +# +SUPERCAPFULL_MAXWAIT=180 + diff --git a/recipes-bsp/multitech/mts-io/mts-io.mtcap.init b/recipes-bsp/multitech/mts-io/mts-io.mtcap.init index 19bfa4a..ff0e947 100644 --- a/recipes-bsp/multitech/mts-io/mts-io.mtcap.init +++ b/recipes-bsp/multitech/mts-io/mts-io.mtcap.init @@ -103,6 +103,42 @@ cell_init() { start_lora_led_updater() { lora-led-updater & } +gettime() { + [[ $(cat /proc/uptime) =~ ([^[:space:]]+) ]] + echo ${BASH_REMATCH[1]} +} +wait_for_supercap() { + supercap=$(mts-io-sysfs show capability/supercap 2>/dev/null) + if ((supercap != 1)) ; then + return + fi + if ((SUPERCAPFULL != 1)) ; then + break + fi + t0=$(gettime) + maxwait=$(awk "BEGIN {print ${t0}+${SUPERCAPFULL_MAXWAIT}}") + while : ; do + if (($(mts-io-sysfs show power-fail) == 1)) ; then + # If we are booting, then go down. + # This will not work with systemd. + if [[ $(ps -h -o cmd -p $PPID) =~ /bin/sh[[:space:]]/etc/init.d/rc[[:space:]]S$ ]] ; then + logger -s -t 'mts-io' -p daemon.err "No power during boot, so power off" + exec /sbin/poweroff + # NOT REACHED + fi + fi + if (($(mts-io-sysfs show supercap-full) == 1)) ; then + logger -s -t 'mts-io' -p daemon.err 'Supercap Charged' + return + fi + t1=$(gettime) + if awk "BEGIN { if($t1<$maxwait)exit 1 }" ; then + break + fi + sleep 1 + done + logger -s -t 'mts-io' -p daemon.err 'Supercap not full but timer expired -- continuing boot' +} case $1 in start) @@ -129,6 +165,8 @@ case $1 in (($WIFICAP)) && modprobe wilc1000-sdio set_hw_name set_gpslink + wait_for_supercap + ;; stop) diff --git a/recipes-bsp/multitech/mts-io_4.5.1.bb b/recipes-bsp/multitech/mts-io_4.5.3.bb index ee4fcfa..ee4fcfa 100644 --- a/recipes-bsp/multitech/mts-io_4.5.1.bb +++ b/recipes-bsp/multitech/mts-io_4.5.3.bb |