4.2.5

RAKWireless · Sep 18, 2020 · 12efc98 · 12efc98
1 parent 90da5bc
commit 12efc98
Show file tree

Hide file tree

Showing 72 changed files with 1,477 additions and 105 deletions.
diff --git a/README.md b/README.md
@@ -14,8 +14,14 @@ This project currently provides support for the below platforms.
 * RAK7243/RAK7244
 * RAK2246
 * RAK2287
+* RAK2285
 
 ##	Changelog
+2020-09-01 V4.2.5
+
+* 1.Add AS920_923.
+* 2.EU433 changed to 8 consecutive channels.
+
 2020-07-20 V4.2.4
 
 * 1.Add other region global_conf.json for RAK2287.

diff --git a/ap/install.sh b/ap/install.sh
diff --git a/ap/set_ssid b/ap/set_ssid
diff --git a/...onf/chirpstack-network-server.as_923.toml → ...chirpstack-network-server.as_920_923.toml b/...onf/chirpstack-network-server.as_923.toml → ...chirpstack-network-server.as_920_923.toml
diff --git a/chirpstack/chirpstack-network-server_conf/chirpstack-network-server.as_923_925.toml b/chirpstack/chirpstack-network-server_conf/chirpstack-network-server.as_923_925.toml
@@ -0,0 +1,198 @@
+# This configuration configures ChirpStack Network Server for the EU868 band using a MQTT
+# broker to communicate with the gateways. Many options and defaults have been
+# omitted for simplicity.
+# 
+# For other bands, see the ./examples/ sub-directory.
+#
+# See https://www.chirpstack.io/network-server/install/config/ for a full
+# configuration example and documentation.
+
+
+# PostgreSQL settings.
+#
+# Please note that PostgreSQL 9.5+ is required.
+[postgresql]
+# PostgreSQL dsn (e.g.: postgres://user:password@hostname/database?sslmode=disable).
+#
+# Besides using an URL (e.g. 'postgres://user:password@hostname/database?sslmode=disable')
+# it is also possible to use the following format:
+# 'user=chirpstack_ns dbname=chirpstack_ns sslmode=disable'.
+#
+# The following connection parameters are supported:
+#
+# * dbname - The name of the database to connect to
+# * user - The user to sign in as
+# * password - The user's password
+# * host - The host to connect to. Values that start with / are for unix domain sockets. (default is localhost)
+# * port - The port to bind to. (default is 5432)
+# * sslmode - Whether or not to use SSL (default is require, this is not the default for libpq)
+# * fallback_application_name - An application_name to fall back to if one isn't provided.
+# * connect_timeout - Maximum wait for connection, in seconds. Zero or not specified means wait indefinitely.
+# * sslcert - Cert file location. The file must contain PEM encoded data.
+# * sslkey - Key file location. The file must contain PEM encoded data.
+# * sslrootcert - The location of the root certificate file. The file must contain PEM encoded data.
+#
+# Valid values for sslmode are:
+#
+# * disable - No SSL
+# * require - Always SSL (skip verification)
+# * verify-ca - Always SSL (verify that the certificate presented by the server was signed by a trusted CA)
+# * verify-full - Always SSL (verify that the certification presented by the server was signed by a trusted CA and the server host name matches the one in the certificate)
+dsn="postgres://chirpstack_ns:dbpassword@localhost/chirpstack_ns?sslmode=disable"
+
+
+# Redis settings
+#
+# Please note that Redis 2.6.0+ is required.
+[redis]
+# Redis url (e.g. redis://user:password@hostname/0)
+#
+# For more information about the Redis URL format, see:
+# https://www.iana.org/assignments/uri-schemes/prov/redis
+url="redis://localhost:6379"
+
+
+# Network-server settings.
+[network_server]
+# Network identifier (NetID, 3 bytes) encoded as HEX (e.g. 010203)
+net_id="000000"
+
+
+  # LoRaWAN regional band configuration.
+  #
+  # Note that you might want to consult the LoRaWAN Regional Parameters
+  # specification for valid values that apply to your region.
+  # See: https://www.lora-alliance.org/lorawan-for-developers
+  [network_server.band]
+  name="AS923"
+
+
+  # LoRaWAN network related settings.
+  [network_server.network_settings]
+  enabled_uplink_channels=[]
+  # Disable ADR
+  #
+  # When set, this globally disables ADR.
+  disable_adr=true
+
+    # Extra channel configuration.
+    #
+    # Use this for LoRaWAN regions where it is possible to extend the by default
+    # available channels with additional channels (e.g. the EU band).
+    # The first 5 channels will be configured as part of the OTAA join-response
+    # (using the CFList field).
+    # The other channels (or channel / data-rate changes) will be (re)configured
+    # using the NewChannelReq mac-command.
+    #
+#    [[network_server.network_settings.extra_channels]]
+#    frequency=867100000
+#    min_dr=0
+#    max_dr=5
+
+#    [[network_server.network_settings.extra_channels]]
+#    frequency=867300000
+#    min_dr=0
+#    max_dr=5
+
+#    [[network_server.network_settings.extra_channels]]
+#    frequency=867500000
+#    min_dr=0
+#    max_dr=5
+
+#    [[network_server.network_settings.extra_channels]]
+#    frequency=867700000
+#    min_dr=0
+#    max_dr=5
+
+#    [[network_server.network_settings.extra_channels]]
+#    frequency=867900000
+#    min_dr=0
+#    max_dr=5
+
+
+    # Class B settings
+    [network_server.network_settings.class_b]
+    # Ping-slot data-rate.
+    ping_slot_dr=0
+
+    # Ping-slot frequency (Hz)
+    #
+    # Set this to 0 to use the default frequency plan for the configured region
+    # (which could be frequency hopping).
+    ping_slot_frequency=0
+
+
+  # Network-server API
+  #
+  # This is the network-server API that is used by ChirpStack Application Server or other
+  # custom components interacting with ChirpStack Network Server.
+  [network_server.api]
+  # ip:port to bind the api server
+  bind="0.0.0.0:8000"
+
+
+  # Backend defines the gateway backend settings.
+  #
+  # The gateway backend handles the communication with the gateway(s) part of
+  # the LoRaWAN network.
+  [network_server.gateway.backend]
+  # Backend
+  type="mqtt"
+
+
+    # MQTT gateway backend settings.
+    #
+    # This is the backend communicating with the LoRa gateways over a MQTT broker.
+    [network_server.gateway.backend.mqtt]
+    # MQTT topic templates for the different MQTT topics.
+    #
+    # The meaning of these topics are documented at:
+    # https://www.chirpstack.io/gateway-bridge/
+    #
+    # The default values match the default expected configuration of the
+    # ChirpStack Gateway Bridge MQTT backend. Therefore only change these values when
+    # absolutely needed.
+
+    # Event topic template.
+    event_topic="gateway/+/event/+"
+
+    # Command topic template.
+    #
+    # Use:
+    #   * "{{ .GatewayID }}" as an substitution for the LoRa gateway ID
+    #   * "{{ .CommandType }}" as an substitution for the command type
+    command_topic_template="gateway/{{ .GatewayID }}/command/{{ .CommandType }}"
+
+    # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
+    server="tcp://localhost:1883"
+
+    # Connect with the given username (optional)
+    username=""
+
+    # Connect with the given password (optional)
+    password=""
+
+
+# Metrics collection settings.
+[metrics]
+# Timezone
+#
+# The timezone is used for correctly aggregating the metrics (e.g. per hour,
+# day or month).
+# Example: "Europe/Amsterdam" or "Local" for the the system's local time zone.
+timezone="Local"
+
+
+# Join-server settings.
+[join_server]
+
+  # Default join-server settings.
+  #
+  # This join-server will be used when resolving the JoinEUI is set to false
+  # or as a fallback when resolving the JoinEUI fails.
+  [join_server.default]
+  # hostname:port of the default join-server
+  #
+  # This API is provided by ChirpStack Application Server.
+  server="http://localhost:8003"
+
diff --git a/chirpstack/install.sh b/chirpstack/install.sh
diff --git a/choose_model.sh b/choose_model.sh
diff --git a/first_boot/expand_rootfs.sh b/first_boot/expand_rootfs.sh
diff --git a/first_boot/init_loraserver_db b/first_boot/init_loraserver_db
diff --git a/first_boot/install.sh b/first_boot/install.sh
diff --git a/first_boot/set_ssid b/first_boot/set_ssid
diff --git a/install.sh b/install.sh
diff --git a/lora/install.sh b/lora/install.sh
diff --git a/lora/install_for_img.sh b/lora/install_for_img.sh
diff --git a/lora/install_normal.sh b/lora/install_normal.sh
diff --git a/lora/print_lora_log.sh b/lora/print_lora_log.sh
diff --git a/...k2245/global_conf/global_conf.as_923.json → ...5/global_conf/global_conf.as_923_925.json b/...k2245/global_conf/global_conf.as_923.json → ...5/global_conf/global_conf.as_923_925.json
diff --git a/lora/rak2245/global_conf/global_conf.eu_433.json b/lora/rak2245/global_conf/global_conf.eu_433.json
@@ -39,35 +39,35 @@
             "if": 0
         },
         "chan_multiSF_3": {
+            /* Lora MAC channel, 125kHz, all SF, 433.775 MHz */
+            "enable": true,
+            "radio": 1,
+            "if": 200000
+        },
+        "chan_multiSF_4": {
             /* Lora MAC channel, 125kHz, all SF, 433.975 MHz */
             "enable": true,
             "radio": 0,
             "if": -400000
         },
-        "chan_multiSF_4": {
+        "chan_multiSF_5": {
             /* Lora MAC channel, 125kHz, all SF, 434.175 MHz */
             "enable": true,
             "radio": 0,
             "if": -200000
         },
-        "chan_multiSF_5": {
+        "chan_multiSF_6": {
             /* Lora MAC channel, 125kHz, all SF, 434.375 MHz */
             "enable": true,
             "radio": 0,
             "if": 0
         },
-        "chan_multiSF_6": {
+        "chan_multiSF_7": {
             /* Lora MAC channel, 125kHz, all SF, 434.575 MHz */
             "enable": true,
             "radio": 0,
             "if": 200000
         },
-        "chan_multiSF_7": {
-            /* Lora MAC channel, 125kHz, all SF, 434.775 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 400000
-        },
         "chan_Lora_std": {
             /* Lora MAC channel, 250kHz, SF7, 434.175 MHz */
             "enable": true,