From f888298570ab64c2bae289b6602c963dc48c3b8c Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 17 Oct 2019 13:03:35 -0500
Subject: Fix timeout value for LAT1

---
 recipes-core/multitech/config/chat_wrapper | 14 +++++++++-----
 recipes-core/multitech/config_2.3.bb       |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/recipes-core/multitech/config/chat_wrapper b/recipes-core/multitech/config/chat_wrapper
index b15a949..3c05622 100755
--- a/recipes-core/multitech/config/chat_wrapper
+++ b/recipes-core/multitech/config/chat_wrapper
@@ -66,10 +66,10 @@ ${LOG} "Using Context ${CONTEXTNUM} based on chat script: ${CONTEXT}"
 # At this point if there is no context number, we can skip everything else.
 
 # Get Modem's context settings
-MCONTEXT=$(/usr/bin/radio-cmd ${RADIOOPTION} -t10 'AT+CGDCONT?' 2>&1 | tr -d '\r')
+MCONTEXT=$(/usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+CGDCONT?' 2>&1 | tr -d '\r')
 if [[ $MCONTEXT =~ [Ee][Rr][Rr][Oo][Rr] ]] ; then
     RADIOOPTION="${RADIOOPTION2}"
-    MCONTEXT=$(/usr/bin/radio-cmd ${RADIOOPTION} -t10 'AT+CGDCONT?' 2>&1 | tr -d '\r')
+    MCONTEXT=$(/usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+CGDCONT?' 2>&1 | tr -d '\r')
 fi
 	
 if ! [[ $MCONTEXT =~ \+CGDCONT:[[:space:]]+${CONTEXTNUM},\"([^\"]*)\",\"([^\"]*)\",\"([^\"]*)\",([0-9]+),([0-9]+)([^$'\n']*) ]] ; then
@@ -137,9 +137,13 @@ if [[ $MPDP != $PDP ]] || [[ $MAPN != $APN ]] || \
    ${LOG} "$MCONTEXT"
    ${LOG} "Dropping registration with carrier to set context"
    # Need to deregister
-   /usr/bin/radio-cmd ${RADIOOPTION} -t10 'AT+COPS=2'
-   /usr/bin/radio-cmd ${RADIOOPTION} -t10 "AT+CGDCONT=${CONTEXTNUM},\"${PDP}\",\"${APN}\",\"${ADDR}\",$DCOMP,${HCOMP}${FULLBOAT}"
-   /usr/bin/radio-cmd ${RADIOOPTION} -t10 'AT+COPS=0'
+   /usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+COPS=2'
+   CMDSTR="AT+CGDCONT=${CONTEXTNUM},${PDP},${APN},${ADDR},$DCOMP,${HCOMP}${FULLBOAT}"
+   ${LOG} "Issued command /usr/bin/radio-cmd ${RADIOOPTION} -t10000 ..."
+   ${LOG} "... ${CMDSTR}"
+   LOGMSG=$(/usr/bin/radio-cmd ${RADIOOPTION} -t10000 "${CMDSTR}" 2>&1)
+   ${LOG} "Got response ${LOGMSG}"
+   /usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+COPS=0'
    ${LOG} "New context is set.  Wait up to $REGWAITTIME seconds to register"
    # Wait for registration
    uptime=$(cat /proc/uptime)
diff --git a/recipes-core/multitech/config_2.3.bb b/recipes-core/multitech/config_2.3.bb
index 0cbae96..9a4dabf 100644
--- a/recipes-core/multitech/config_2.3.bb
+++ b/recipes-core/multitech/config_2.3.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 RDEPENDS_${PN} += "bash"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 PACKAGE_ARCH = "all"
-PR = "r4"
+PR = "r5"
 PACKAGES =+ "${PN}-mths"
 inherit update-rc.d
 
-- 
cgit v1.2.3