From c5606f336ec51066d7f70b991dd92bde91cc67c9 Mon Sep 17 00:00:00 2001
From: Harsh Sharma <harsh.sharma@multitech.com>
Date: Tue, 5 Apr 2022 17:12:08 -0500
Subject: Updated lora 1303 tag

---
 .../global_conf.json.MTAC_003_0_0.EU868            |  3 +-
 .../global_conf.json.MTAC_003_0_0.US915            |  3 +-
 .../global_conf.json.MTCAP3.EU868                  |  3 +-
 .../global_conf.json.MTCAP3.US915                  |  3 +-
 .../lora/lora-gateway-sx1303_2.0.12.bb             | 78 ----------------------
 .../lora/lora-gateway-sx1303_2.0.13.bb             | 78 ++++++++++++++++++++++
 6 files changed, 86 insertions(+), 82 deletions(-)
 delete mode 100644 recipes-connectivity/lora/lora-gateway-sx1303_2.0.12.bb
 create mode 100644 recipes-connectivity/lora/lora-gateway-sx1303_2.0.13.bb

diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868
index 40dc9a2..40fb874 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.EU868
@@ -103,7 +103,8 @@
         "forward_crc_error": false,
         "forward_crc_disabled": false,
         /* GPS configuration */
-        "gps_tty_path": "/dev/ttyS0",
+        "gps" : true,
+        "gps_tty_path": "/dev/gps0",
         /* GPS reference coordinates */
         "ref_latitude": 0.0,
         "ref_longitude": 0.0,
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915
index 3719762..ba40dca 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTAC_003_0_0.US915
@@ -90,7 +90,8 @@
         "forward_crc_error": false,
         "forward_crc_disabled": false,
         /* GPS configuration */
-        "gps_tty_path": "/dev/ttyS0",
+        "gps" : true,
+        "gps_tty_path": "/dev/gps0",
         /* GPS reference coordinates */
         "ref_latitude": 0.0,
         "ref_longitude": 0.0,
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868
index f1652ca..57d92e8 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.EU868
@@ -103,7 +103,8 @@
         "forward_crc_error": false,
         "forward_crc_disabled": false,
         /* GPS configuration */
-        "gps_tty_path": "/dev/ttyS0",
+        "gps" : false,
+        "gps_tty_path": "/dev/gps0",
         /* GPS reference coordinates */
         "ref_latitude": 0.0,
         "ref_longitude": 0.0,
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915 b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915
index 21e906d..df8b854 100644
--- a/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915
+++ b/recipes-connectivity/lora/lora-gateway-sx1303/global_conf.json.MTCAP3.US915
@@ -90,7 +90,8 @@
         "forward_crc_error": false,
         "forward_crc_disabled": false,
         /* GPS configuration */
-        "gps_tty_path": "/dev/ttyS0",
+        "gps" : false,
+        "gps_tty_path": "/dev/gps0",
         /* GPS reference coordinates */
         "ref_latitude": 0.0,
         "ref_longitude": 0.0,
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.12.bb b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.12.bb
deleted file mode 100644
index 3bf2442..0000000
--- a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.12.bb
+++ /dev/null
@@ -1,78 +0,0 @@
-DESCRIPTION = "LoRa Packet Forwarder"
-HOMEPAGE = "https://github.com/Lora-net/sx1302_hal"
-PRIORITY = "optional"
-SECTION = "console/utils"
-# Semtech license is a modified BSD-style license
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=d2119120bd616e725f4580070bd9ee19"
-DEPENDS = "logrotate"
-RDEPENDS_${PN} += "bash"
-PR = "r0"
-
-#SRCREV = "100104ee350a0e469b348ac383486d311caaf5e5"
-SRCREV = "V${PV}"
-
-SRC_URI = "git://github.com/MultiTechSystems/sx1302_hal.git;protocol=https;branch=master \
-           file://global_conf.json.MTAC_003_0_0.EU868 \
-           file://global_conf.json.MTAC_003_0_0.US915 \
-           file://global_conf.json.MTCAP3.EU868 \
-           file://global_conf.json.MTCAP3.US915 \
-"
-
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-LORA_DIR = "/opt/lora"
-
-
-CFLAGS += " -I${S}/packet_forwarder/inc -I${S}/libloragw/inc -I${S}/libtools/inc -I${S}/inc -I. -std=gnu11"
-
-do_compile() {
-  oe_runmake packet_forwarder LDFLAGS=${LDFLAGS}
-  oe_runmake util_boot LDFLAGS=${LDFLAGS}
-  oe_runmake util_chip_id FLAGS=${LDFLAGS}
-  oe_runmake util_net_downlink LDFLAGS=${LDFLAGS}
-  # oe_runmake util_spectral_scan LDFLAGS=${LDFLAGS}
-}
-
-do_install() {
-  install -d ${D}${LORA_DIR}
-  install -d ${D}${LORA_DIR}/forwarder-utils-sx1303
-  install -d ${D}${LORA_DIR}/gateway-utils-sx1303
-  install -m 755 packet_forwarder/lora_pkt_fwd ${D}${LORA_DIR}/lora_pkt_fwd_sx1303
-  install -m 755 libloragw/test_loragw* ${D}${LORA_DIR}/gateway-utils-sx1303/
-  install -m 755 util_boot/boot ${D}${LORA_DIR}/forwarder-utils-sx1303/util_boot
-  install -m 755 util_chip_id/chip_id ${D}${LORA_DIR}/forwarder-utils-sx1303/util_chip_id
-  install -m 755 util_net_downlink/net_downlink ${D}${LORA_DIR}/forwarder-utils-sx1303/util_net_downlink
-  # install -m 755 util_spectral_scan/util_spectral_scan ${D}${LORA_DIR}/forwarder-utils-sx1303/
-}
-
-do_install_append_mtcdt() {
-  install -m 644 ${WORKDIR}/global_conf.json.MTAC_003_0_0.EU868 ${D}${LORA_DIR}/global_conf.json.MTAC_003_0_0.EU868
-  install -m 644 ${WORKDIR}/global_conf.json.MTAC_003_0_0.US915 ${D}${LORA_DIR}/global_conf.json.MTAC_003_0_0.US915
-}
-
-do_install_append_mtcap() {
-  install -m 644 ${WORKDIR}/global_conf.json.MTCAP3.EU868 ${D}${LORA_DIR}/global_conf.json.MTCAP3.EU868
-  install -m 644 ${WORKDIR}/global_conf.json.MTCAP3.US915 ${D}${LORA_DIR}/global_conf.json.MTCAP3.US915
-}
-
-do_install_append_mtcdt3() {
-  install -m 644 ${WORKDIR}/global_conf.json.MTAC_003_0_0.EU868 ${D}${LORA_DIR}/global_conf.json.MTAC_003_0_0.EU868
-  install -m 644 ${WORKDIR}/global_conf.json.MTAC_003_0_0.US915 ${D}${LORA_DIR}/global_conf.json.MTAC_003_0_0.US915
-}
-
-do_install_append_mtcdt3hs() {
-  install -m 644 ${WORKDIR}/global_conf.json.MTAC_003_0_0.EU868 ${D}${LORA_DIR}/global_conf.json.MTAC_003_0_0.EU868
-  install -m 644 ${WORKDIR}/global_conf.json.MTAC_003_0_0.US915 ${D}${LORA_DIR}/global_conf.json.MTAC_003_0_0.US915
-}
-
-
-FILES_${PN} += "${LORA_DIR}"
-
-# disable this on purpose for dev purposes
-do_rm_work() {
-  echo "skipping"
-
-}
diff --git a/recipes-connectivity/lora/lora-gateway-sx1303_2.0.13.bb b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.13.bb
new file mode 100644
index 0000000..3bf2442
--- /dev/null
+++ b/recipes-connectivity/lora/lora-gateway-sx1303_2.0.13.bb
@@ -0,0 +1,78 @@
+DESCRIPTION = "LoRa Packet Forwarder"
+HOMEPAGE = "https://github.com/Lora-net/sx1302_hal"
+PRIORITY = "optional"
+SECTION = "console/utils"
+# Semtech license is a modified BSD-style license
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=d2119120bd616e725f4580070bd9ee19"
+DEPENDS = "logrotate"
+RDEPENDS_${PN} += "bash"
+PR = "r0"
+
+#SRCREV = "100104ee350a0e469b348ac383486d311caaf5e5"
+SRCREV = "V${PV}"
+
+SRC_URI = "git://github.com/MultiTechSystems/sx1302_hal.git;protocol=https;branch=master \
+           file://global_conf.json.MTAC_003_0_0.EU868 \
+           file://global_conf.json.MTAC_003_0_0.US915 \
+           file://global_conf.json.MTCAP3.EU868 \
+           file://global_conf.json.MTCAP3.US915 \
+"
+
+
+S = "${WORKDIR}/git"
+B = "${S}"
+
+LORA_DIR = "/opt/lora"
+
+
+CFLAGS += " -I${S}/packet_forwarder/inc -I${S}/libloragw/inc -I${S}/libtools/inc -I${S}/inc -I. -std=gnu11"
+
+do_compile() {
+  oe_runmake packet_forwarder LDFLAGS=${LDFLAGS}
+  oe_runmake util_boot LDFLAGS=${LDFLAGS}
+  oe_runmake util_chip_id FLAGS=${LDFLAGS}
+  oe_runmake util_net_downlink LDFLAGS=${LDFLAGS}
+  # oe_runmake util_spectral_scan LDFLAGS=${LDFLAGS}
+}
+
+do_install() {
+  install -d ${D}${LORA_DIR}
+  install -d ${D}${LORA_DIR}/forwarder-utils-sx1303
+  install -d ${D}${LORA_DIR}/gateway-utils-sx1303
+  install -m 755 packet_forwarder/lora_pkt_fwd ${D}${LORA_DIR}/lora_pkt_fwd_sx1303
+  install -m 755 libloragw/test_loragw* ${D}${LORA_DIR}/gateway-utils-sx1303/
+  install -m 755 util_boot/boot ${D}${LORA_DIR}/forwarder-utils-sx1303/util_boot
+  install -m 755 util_chip_id/chip_id ${D}${LORA_DIR}/forwarder-utils-sx1303/util_chip_id
+  install -m 755 util_net_downlink/net_downlink ${D}${LORA_DIR}/forwarder-utils-sx1303/util_net_downlink
+  # install -m 755 util_spectral_scan/util_spectral_scan ${D}${LORA_DIR}/forwarder-utils-sx1303/
+}
+
+do_install_append_mtcdt() {
+  install -m 644 ${WORKDIR}/global_conf.json.MTAC_003_0_0.EU868 ${D}${LORA_DIR}/global_conf.json.MTAC_003_0_0.EU868
+  install -m 644 ${WORKDIR}/global_conf.json.MTAC_003_0_0.US915 ${D}${LORA_DIR}/global_conf.json.MTAC_003_0_0.US915
+}
+
+do_install_append_mtcap() {
+  install -m 644 ${WORKDIR}/global_conf.json.MTCAP3.EU868 ${D}${LORA_DIR}/global_conf.json.MTCAP3.EU868
+  install -m 644 ${WORKDIR}/global_conf.json.MTCAP3.US915 ${D}${LORA_DIR}/global_conf.json.MTCAP3.US915
+}
+
+do_install_append_mtcdt3() {
+  install -m 644 ${WORKDIR}/global_conf.json.MTAC_003_0_0.EU868 ${D}${LORA_DIR}/global_conf.json.MTAC_003_0_0.EU868
+  install -m 644 ${WORKDIR}/global_conf.json.MTAC_003_0_0.US915 ${D}${LORA_DIR}/global_conf.json.MTAC_003_0_0.US915
+}
+
+do_install_append_mtcdt3hs() {
+  install -m 644 ${WORKDIR}/global_conf.json.MTAC_003_0_0.EU868 ${D}${LORA_DIR}/global_conf.json.MTAC_003_0_0.EU868
+  install -m 644 ${WORKDIR}/global_conf.json.MTAC_003_0_0.US915 ${D}${LORA_DIR}/global_conf.json.MTAC_003_0_0.US915
+}
+
+
+FILES_${PN} += "${LORA_DIR}"
+
+# disable this on purpose for dev purposes
+do_rm_work() {
+  echo "skipping"
+
+}
-- 
cgit v1.2.3