diff options
| author | Andrii Pientsov <andrii.pientsov@globallogic.com> | 2021-04-23 09:48:45 +0300 |
|---|---|---|
| committer | Andrii Pientsov <andrii.pientsov@globallogic.com> | 2021-04-23 09:48:45 +0300 |
| commit | 749b8a0b9022efbd46dd8c892fd3d2a680e2bd19 (patch) | |
| tree | e62887e880b918c626c3d7a9fd5dbfcfae0c92eb | |
| parent | 9fa3081c921e5352c9bf5229ac826f443b575e79 (diff) | |
| parent | 8565500e243c8f08e6a3cea9d7a49398e78dc997 (diff) | |
| download | meta-multitech-749b8a0b9022efbd46dd8c892fd3d2a680e2bd19.tar.gz meta-multitech-749b8a0b9022efbd46dd8c892fd3d2a680e2bd19.tar.bz2 meta-multitech-749b8a0b9022efbd46dd8c892fd3d2a680e2bd19.zip | |
Merge remote-tracking branch 'origin/dunfell' into mtre-dunfell
| -rw-r--r-- | recipes-bsp/multitech/mts-io.inc | 24 | ||||
| -rw-r--r-- | recipes-bsp/multitech/mts-io/mts-io.mtcap.init | 4 |
2 files changed, 21 insertions, 7 deletions
diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc index 2800c2b..336cbf2 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 = "r4" +INC_PR = "r5" #SRCREV = "${PV}" SRCREV = "ee3586431bed0be0cfeba3b906b0f7d32d89e211" @@ -50,7 +50,7 @@ do_compile () { } -PACKAGES = "${PN}-noarch kernel-module-${PN} ${PN}-util ${PN}-util-dbg ${PN}-dev" +PACKAGES += "${PN}-noarch kernel-module-${PN} ${PN}-util ${PN}-util-dbg ${PN}-skipcharge" RDEPENDS_${PN}-dev = "" @@ -70,8 +70,9 @@ FILES_${PN}-util += "${sbindir}/mts-util-lora2-reset" FILES_${PN}-util-dbg += "/usr/src /usr/sbin/.debug" FILES_${PN}-dev += "${includedir}/linux ${includedir}/mts-kernel-headers" -INITSCRIPT_NAME = "mts-io" -INITSCRIPT_PARAMS = "start 39 S ." +INITSCRIPT_PACKAGES = "${PN}-noarch" +INITSCRIPT_NAME_${PN}-noarch = "mts-io" +INITSCRIPT_PARAMS_${PN}-noarch = "start 39 S ." PARALLEL_MAKE = "" @@ -123,4 +124,17 @@ fakeroot do_install_append_mtcap() { fakeroot do_install_append_mtre() { # no status led on mtre echo "" > ${D}${sysconfdir}/init.d/led-status_heartbeat_trigger -}
\ No newline at end of file +} + +# skipcharge is to prevent waiting for the supercap to charge on +# units with a supercap. This is for code development and testing +# purposes only. +ALLOW_EMPTY_${PN}-skipcharge = "1" +RDEPENDS_${PN}-skipcharge = "${PN}-noarch" + +pkg_postinst_${PN}-skipcharge() { + sed -i 's/^SUPERCAPFULL=1/SUPERCAPFULL=0/' $D${sysconfdir}/default/mts-io +} +pkg_prerm_${PN}-skipcharge() { + sed -i 's/^SUPERCAPFULL=1/SUPERCAPFULL=0/' $D${sysconfdir}/default/mts-io +} diff --git a/recipes-bsp/multitech/mts-io/mts-io.mtcap.init b/recipes-bsp/multitech/mts-io/mts-io.mtcap.init index ff0e947..f8e611f 100644 --- a/recipes-bsp/multitech/mts-io/mts-io.mtcap.init +++ b/recipes-bsp/multitech/mts-io/mts-io.mtcap.init @@ -16,7 +16,6 @@ set_hw_name() { hw_name=(${hw//-/ }) } -batcap=$(mts-io-sysfs show capability/battery) set_batt_charge() { if [[ $batcap == 1 ]] ; then i2cset -m 0x60 -y 0 0x09 0x01 0x20 @@ -113,7 +112,7 @@ wait_for_supercap() { return fi if ((SUPERCAPFULL != 1)) ; then - break + return fi t0=$(gettime) maxwait=$(awk "BEGIN {print ${t0}+${SUPERCAPFULL_MAXWAIT}}") @@ -151,6 +150,7 @@ case $1 in # Point the firmware API at our i2c EEPROMs echo -n ${i2c} > /sys/module/firmware_class/parameters/path modprobe mts_io + batcap=$(mts-io-sysfs show capability/battery) setwificap set_batt_charge wifi_init1 |