Update ChirpStack Concentratord + gateway-config script.

Author: brocaar

layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-concentratord/chirpstack-concentratord-base_3.1.0.bb

@@ -0,0 +1,53 @@
+HOMEPAGE = "https://www.chirpstack.io/"
+DESCRIPTION = "ChirpStack Concentratord"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=99e425257f8a67b7efd81dc0009ed8ff"
+PR = "r1"
+
+SRC_URI = "\
+    git://github.com/brocaar/chirpstack-concentratord.git;protocol=git;tag=v${PV} \
+    file://chirpstack-concentratord.default \
+    file://chirpstack-concentratord.init \
+    file://chirpstack-concentratord.monit \
+"
+DEPENDS = "\
+    clang-native \
+    libloragw-sx1301 \
+    libloragw-sx1302 \
+"
+
+inherit cargo update-rc.d
+
+INITSCRIPT_NAME = "chirpstack-concentratord"
+INITSCRIPT_PARAMS = "defaults"
+
+S = "${WORKDIR}/git"
+
+export BINDGEN_EXTRA_CLANG_ARGS="-I${STAGING_INCDIR}"
+
+do_install() {
+    install -d ${D}${sysconfdir}/init.d
+    install -d ${D}${sysconfdir}/monit.d
+    install -d ${D}${sysconfdir}/default
+    install -d ${D}${bindir}
+
+    if [ "${CARGO_BUILD_TYPE}" = "--release" ]; then
+        local cargo_bindir="${CARGO_RELEASE_DIR}"
+    else
+        local cargo_bindir="${CARGO_DEBUG_DIR}"
+    fi
+
+    install -m 0755 ../chirpstack-concentratord.init ${D}${sysconfdir}/init.d/chirpstack-concentratord
+    install -m 0644 ../chirpstack-concentratord.monit ${D}${sysconfdir}/monit.d/chirpstack-concentratord
+    install -m 0644 ../chirpstack-concentratord.default ${D}${sysconfdir}/default/chirpstack-concentratord
+
+    install -m 0755 ${cargo_bindir}/chirpstack-concentratord-sx1301 ${D}${bindir}
+    install -m 0755 ${cargo_bindir}/chirpstack-concentratord-sx1302 ${D}${bindir}
+    install -m 0755 ${cargo_bindir}/gateway-id ${D}${bindir}
+}
+
+PACKAGES += "${PN}-sx1301 ${PN}-sx1302"
+
+FILES_${PN} = "${sysconfdir} ${bindir}/gateway-id"
+FILES_${PN}-sx1301 = "${bindir}/chirpstack-concentratord-sx1301"
+FILES_${PN}-sx1302 = "${bindir}/chirpstack-concentratord-sx1302"

layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-concentratord/chirpstack-concentratord-sx1301_3.0.0-test.10.bb

@@ -22,9 +22,24 @@ SRC_URI_append = "\
     file://sx1301/us915_5.toml \
     file://sx1301/us915_6.toml \
     file://sx1301/us915_7.toml \
+    file://sx1302/global.toml \
+    file://sx1302/eu868.toml \
+    file://sx1302/eu868_0.toml \
+    file://sx1302/us915.toml \
+    file://sx1302/us915_0.toml \
+    file://sx1302/us915_1.toml \
+    file://sx1302/us915_2.toml \
+    file://sx1302/us915_3.toml \
+    file://sx1302/us915_4.toml \
+    file://sx1302/us915_5.toml \
+    file://sx1302/us915_6.toml \
+    file://sx1302/us915_7.toml \
 "
 
 do_install_append() {
     install -d ${D}${sysconfdir}/chirpstack-concentratord/sx1301/examples
     install -m 0644 ${WORKDIR}/sx1301/*.toml ${D}${sysconfdir}/chirpstack-concentratord/sx1301/examples
+
+    install -d ${D}${sysconfdir}/chirpstack-concentratord/sx1302/examples
+    install -m 0644 ${WORKDIR}/sx1302/* ${D}${sysconfdir}/chirpstack-concentratord/sx1302/examples
 }

layers/chirpstack/meta-chirpstack/recipes-chirpstack/chirpstack-concentratord/chirpstack-concentratord-sx1302_3.0.0-test.10.bb

@@ -10,14 +10,15 @@ do_main_menu() {
             GATEWAY_ID="not configured"
         fi
 
-        FUN=$(dialog --cr-wrap --title "ChirpStack Gateway OS" --cancel-label "Quit" --menu "Version:    $VERSION\nGateway ID: $GATEWAY_ID\n " 17 65 7 \
+        FUN=$(dialog --cr-wrap --title "ChirpStack Gateway OS" --cancel-label "Quit" --menu "Version:    $VERSION\nGateway ID: $GATEWAY_ID\n " 17 65 8 \
             1 "Setup LoRa concentrator shield" \
             2 "Edit ChirpStack Concentratord config" \
             3 "Edit ChirpStack Gateway Bridge config" \
             4 "Restart ChirpStack Concentratord" \
             5 "Restart ChirpStack Gateway Bridge" \
             6 "Configure WIFI" \
             7 "Set admin password" \
+            8 "Reload Gateway ID" \
             3>&1 1>&2 2>&3)
         RET=$?
         if [ $RET -eq 1 ]; then
@@ -32,6 +33,7 @@ do_main_menu() {
                 5) do_restart_chirpstack_gateway_bridge;;
                 6) do_configure_wifi;;
                 7) do_setup_admin_password;;
+                8) ;;
             esac
         fi
     done
@@ -125,15 +127,15 @@ do_setup_imst_lite() {
 do_setup_pislora() {
     FUN=$(dialog --title "Channel-plan configuration" --menu "Select the channel-plan:" 15 60 2 \
         1 "EU868" \
-        3 "US915" \
+        2 "US915" \
         3>&1 1>&2 2>&3)
     RET=$?
     if [ $RET -eq 1 ]; then
         do_main_menu
     elif [ $RET -eq 0 ]; then
         case "$FUN" in
-            1) do_copy_concentratord_config "sx1301" "generic_eu868" "" "eu868" "0" && do_copy_chirpstack_ns_config "eu868";;
-            2) do_select_us915_block "sx1301" "generic_us915" "";;
+            1) do_copy_concentratord_config "sx1301" "pi_supply_lora_gateway_hat_eu868" "" "eu868" "0" && do_copy_chirpstack_ns_config "eu868";;
+            2) do_select_us915_block "sx1301" "pi_supply_lora_gateway_hat_us915" "";;
         esac
     fi
 }