MTCAP LORA configuration table

7 files changed, 170 insertions, 69 deletions

diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
index c357414..97e2730 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
@@ -99,41 +99,41 @@
 		"tx_lut_0" : 
 		{
 			"dig_gain" : 0,
-			"mix_gain" : 11,
+			"mix_gain" : 8,
 			"pa_gain" : 0,
 			"rf_power" : -6
 		},
 		"tx_lut_1" : 
 		{
 			"dig_gain" : 0,
-			"mix_gain" : 13,
+			"mix_gain" : 10,
 			"pa_gain" : 0,
 			"rf_power" : -3
 		},
 		"tx_lut_10" : 
 		{
-			"dig_gain" : 0,
-			"mix_gain" : 15,
+			"dig_gain" : 1,
+			"mix_gain" : 12,
 			"pa_gain" : 2,
 			"rf_power" : 16
 		},
 		"tx_lut_11" : 
 		{
-			"dig_gain" : 0,
-			"mix_gain" : 10,
+			"dig_gain" : 1,
+			"mix_gain" : 8,
 			"pa_gain" : 3,
 			"rf_power" : 20
 		},
 		"tx_lut_12" : 
 		{
-			"dig_gain" : 0,
-			"mix_gain" : 12,
+			"dig_gain" : 1,
+			"mix_gain" : 10,
 			"pa_gain" : 3,
 			"rf_power" : 23
 		},
 		"tx_lut_13" : 
 		{
-			"dig_gain" : 0,
+			"dig_gain" : 2,
 			"mix_gain" : 13,
 			"pa_gain" : 3,
 			"rf_power" : 25
@@ -141,7 +141,7 @@
 		"tx_lut_14" : 
 		{
 			"dig_gain" : 0,
-			"mix_gain" : 15,
+			"mix_gain" : 13,
 			"pa_gain" : 3,
 			"rf_power" : 26
 		},
@@ -151,63 +151,63 @@
 			"mix_gain" : 15,
 			"pa_gain" : 3,
 			"rf_power" : 27
-		},
+ 		},
 		"tx_lut_2" : 
 		{
 			"dig_gain" : 0,
-			"mix_gain" : 9,
-			"pa_gain" : 1,
+			"mix_gain" : 15,
+			"pa_gain" : 0,
 			"rf_power" : 0
 		},
 		"tx_lut_3" : 
 		{
-			"dig_gain" : 0,
-			"mix_gain" : 10,
+			"dig_gain" : 3,
+			"mix_gain" : 11,
 			"pa_gain" : 1,
 			"rf_power" : 3
 		},
 		"tx_lut_4" : 
 		{
-			"dig_gain" : 0,
-			"mix_gain" : 12,
+			"dig_gain" : 2,
+			"mix_gain" : 11,
 			"pa_gain" : 1,
 			"rf_power" : 6
 		},
 		"tx_lut_5" : 
 		{
-			"dig_gain" : 0,
-			"mix_gain" : 10,
-			"pa_gain" : 2,
+			"dig_gain" : 2,
+			"mix_gain" : 15,
+			"pa_gain" : 1,
 			"rf_power" : 10
 		},
 		"tx_lut_6" : 
 		{
-			"dig_gain" : 0,
+			"dig_gain" : 3,
 			"mix_gain" : 11,
 			"pa_gain" : 2,
 			"rf_power" : 11
 		},
 		"tx_lut_7" : 
 		{
-			"dig_gain" : 0,
-			"mix_gain" : 11,
+			"dig_gain" : 1,
+			"mix_gain" : 9,
 			"pa_gain" : 2,
 			"rf_power" : 12
 		},
 		"tx_lut_8" : 
 		{
 			"dig_gain" : 0,
-			"mix_gain" : 12,
+			"mix_gain" : 9,
 			"pa_gain" : 2,
 			"rf_power" : 13
 		},
 		"tx_lut_9" : 
 		{
-			"dig_gain" : 0,
-			"mix_gain" : 13,
-			"pa_gain" : 2,
+			"dig_gain" : 3,
+			"mix_gain" : 8,
+			"pa_gain" : 3,
 			"rf_power" : 14
-		}
+                }
 	},
 	"gateway_conf": {
 		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.1/mlinux-cell-radio-ready b/recipes-core/mlinux-scripts/mlinux-scripts-1.1/mlinux-cell-radio-ready
new file mode 100644
index 0000000..9930425
--- /dev/null
+++ b/recipes-core/mlinux-scripts/mlinux-scripts-1.1/mlinux-cell-radio-ready
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+COUNTER=0
+TIMEOUT=60
+
+if [ $# -gt 1 ]; then
+    echo "usage: $0 [timeout]"
+    exit 1
+fi
+
+[ $# -eq 1 ] && TIMEOUT=$1
+
+# Wait for the radio to be ready before continuing
+while [ $COUNTER -lt $TIMEOUT ]; do
+  TYPE=$(radio-query --type)
+  MODEL=$(radio-query --model)
+  if [ $? == 0 ]; then
+    echo "Cellular radio is ready."
+    exit 0
+  fi
+  let COUNTER=COUNTER+1
+
+  echo "Waiting for radio to come up in order to identify type ..."
+
+  sleep 1
+done
+
+echo "Cellular radio is not ready."
+exit 1
diff --git a/recipes-core/multitech/config/ppp/peers/README.lna3 b/recipes-core/multitech/config/ppp/peers/README.lna3
new file mode 100644
index 0000000..19ba5a1
--- /dev/null
+++ b/recipes-core/multitech/config/ppp/peers/README.lna3
@@ -0,0 +1,25 @@
+LNA3 firmware/SIM switching instructions
+
+Put the desired SIM into the device.
+
+Set the APN using:
+
+  # mlinux-set-apn "YOURAPN"
+
+Do not put a "AT+CGDCONT" in the lna3_chat_vz script.  It will cause trouble.
+
+To switch to the Verizon firmware and chat script:
+
+  # mlinux-switch-cell-fw 1
+
+To switch to the non-Verizon firmware and chat script:
+
+  # mlinux-switch-cell-fw 0
+
+Verizon provided APN setting over the air.  If you set the APN on a Verizon SIM,
+and they push a new APN, you will need to change the APN on the device.
+
+It is best not to set the APN.  To switch from a manually set APN or incorrect APN
+to letting Verizon set the APN, remove the SIM, and put it in another device.
+Then register with the Verizon network.  With the APN setting removed, put the SIM
+back into this device.
diff --git a/recipes-core/multitech/config/ppp/peers/leu1_chat b/recipes-core/multitech/config/ppp/peers/leu1_chat
index 6f84008..23faf0e 100644
--- a/recipes-core/multitech/config/ppp/peers/leu1_chat
+++ b/recipes-core/multitech/config/ppp/peers/leu1_chat
@@ -13,7 +13,7 @@ OK 'AT+CSQ'
 # ----------------------------------
 # Set the APN for your provider here
 # ----------------------------------
-OK 'AT+CGDCONT=1,"IPV4V6","internet"'
+OK 'AT+CGDCONT=1,"IP","internet"'
 SAY "Dialing...\n"
 OK 'ATD*99***1#'
 SAY "Waiting for CONNECT...\n"
diff --git a/recipes-core/multitech/config/ppp/peers/lna3_chat b/recipes-core/multitech/config/ppp/peers/lna3_chat
index 700c682..ce7fe34 100644..120000
--- a/recipes-core/multitech/config/ppp/peers/lna3_chat
+++ b/recipes-core/multitech/config/ppp/peers/lna3_chat
@@ -1,40 +1 @@
-SAY "LNA3 chat\n"
-ECHO OFF
-ABORT 'NO DIAL TONE'
-ABORT 'NO DIALTONE'
-ABORT 'NO ANSWER'
-ABORT 'NO CARRIER'
-ABORT 'DELAYED'
-ABORT 'VOICE'
-ABORT 'BUSY'
-'' 'AT'
-OK 'ATZ'
-OK 'AT+CSQ'
-# -----------------------------------------
-# APN for your provider here
-# This should be handled automatically
-# by the script mlinux-set-apn.
-# The IP field may be changed manually.
-# There must not be an APN for
-# Verizon wireless, since verizon
-# pushes the APN from the network.
-# The default is Verizon, since
-# the AT+CGDCONT command will cause
-# a fault for a Verizon SIM and will push
-# the new APN to the network, which will
-# cause failures.
-# Correct procedure is to use
-# mlinux-set-apn "APN"
-# to set the APN when not on Verizon.
-# And to switch the firmware to Verizon:
-# mlinux-switch-cell-fw 1
-# And to switch to AT&T:
-# mlinux-switch-cell-fw 0
-# -----------------------------------------
-#comment by mlinux-set-apn OK 'AT+CGDCONT=3,"IP","internet"'
-SAY "Dialing...\n"
-OK 'ATD*99***3#'
-SAY "Waiting for CONNECT...\n"
-TIMEOUT 120
-CONNECT ''
-SAY "Connected\n"
+README.lna3
\ No newline at end of file
diff --git a/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz b/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz
new file mode 100644
index 0000000..d29039a
--- /dev/null
+++ b/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz
@@ -0,0 +1,46 @@
+#----------------------------------------
+# Do NOT use this CHAT script with
+# Verizon wireless.  It will bind
+# this SIM and device to the wrong
+# APN.
+#
+# mlinux-set-apn can be used to set
+# the APN.
+#
+# mlinux-switch-cell-fw can be used
+# to switch the firmware settings
+# and set the correct CHAT script.
+#
+# # mlinux-set-apn "APN"
+#
+# And to switch the firmware to Verizon:
+# # mlinux-switch-cell-fw 1
+#
+# And to switch to AT&T:
+# # mlinux-switch-cell-fw 0
+#----------------------------------------
+SAY "LNA3 chat not for Verizon\n"
+ECHO OFF
+ABORT 'NO DIAL TONE'
+ABORT 'NO DIALTONE'
+ABORT 'NO ANSWER'
+ABORT 'NO CARRIER'
+ABORT 'DELAYED'
+ABORT 'VOICE'
+ABORT 'BUSY'
+'' 'AT'
+OK 'ATZ'
+OK 'AT+CSQ'
+#-------------------------------------------
+# Set the non-Verizon APN on the next line
+#-------------------------------------------
+#OK 'AT+CGDCONT=3,"IP","proxy"'
+#OK 'AT+CGDCONT=3,"IP","ISP.CINGULAR"'
+#OK 'AT+CGDCONT=3,"IP","internet2.voicestream.com"'
+OK 'AT+CGDCONT=3,"IP","internet"'
+SAY "Dialing...\n"
+OK 'ATD*99***3#'
+SAY "Waiting for CONNECT...\n"
+TIMEOUT 120
+CONNECT ''
+SAY "Connected\n"
diff --git a/recipes-core/multitech/config/ppp/peers/lna3_chat_vz b/recipes-core/multitech/config/ppp/peers/lna3_chat_vz
new file mode 100644
index 0000000..58a5b30
--- /dev/null
+++ b/recipes-core/multitech/config/ppp/peers/lna3_chat_vz
@@ -0,0 +1,40 @@
+#----------------------------
+# This chat script has no
+# APN because Verizon
+# requires the chat script
+# not set the APN. 
+# This is because Verizon
+# pushes the APN from their
+# network.  Image 1 on an
+# LNA3 product is used
+# with a Verizon SIM.
+#----------------------------
+SAY "LNA3 chat Verizon\n"
+ECHO OFF
+ABORT 'NO DIAL TONE'
+ABORT 'NO DIALTONE'
+ABORT 'NO ANSWER'
+ABORT 'NO CARRIER'
+ABORT 'DELAYED'
+ABORT 'VOICE'
+ABORT 'BUSY'
+'' 'AT'
+OK 'ATZ'
+OK 'AT+CSQ'
+# -----------------------------------------
+# Do not enter the AT+CGDCONT, because it
+# will cause
+# a fault for a Verizon SIM and will push
+# the new APN to the network, which will
+# cause failures.
+# To switch the firmware to Verizon:
+# mlinux-switch-cell-fw 1
+# And to switch to AT&T (non-Verizon):
+# mlinux-switch-cell-fw 0
+# -----------------------------------------
+SAY "Dialing...\n"
+OK 'ATD*99***3#'
+SAY "Waiting for CONNECT...\n"
+TIMEOUT 120
+CONNECT ''
+SAY "Connected\n"