From 7cbe3b9244dce4e13cd1af1e98d1d97eb65f03d9 Mon Sep 17 00:00:00 2001 From: vulet Date: Wed, 22 Jul 2020 07:54:32 +0800 Subject: [PATCH 1/3] adjust as923 region --- lora/rak2287_spi/global_conf/global_conf.as_923.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lora/rak2287_spi/global_conf/global_conf.as_923.json b/lora/rak2287_spi/global_conf/global_conf.as_923.json index 8696948..0364291 100644 --- a/lora/rak2287_spi/global_conf/global_conf.as_923.json +++ b/lora/rak2287_spi/global_conf/global_conf.as_923.json @@ -50,19 +50,19 @@ "chan_multiSF_1": {"enable": true, "radio": 0, "if": -200000}, /* Freq : 923.4 MHz*/ "chan_multiSF_2": {"enable": true, "radio": 0, "if": 0}, /* Freq : 923.6 MHz*/ "chan_multiSF_3": {"enable": true, "radio": 0, "if": 200000}, /* Freq : 923.8 MHz*/ - "chan_multiSF_4": {"enable": true, "radio": 1, "if": 400000}, /* Freq : 924.0 MHz*/ + "chan_multiSF_4": {"enable": true, "radio": 0, "if": 400000}, /* Freq : 924.0 MHz*/ "chan_multiSF_5": {"enable": true, "radio": 1, "if": -400000}, /* Freq : 924.2 MHz*/ "chan_multiSF_6": {"enable": true, "radio": 1, "if": -200000}, /* Freq : 924.4 MHz*/ "chan_multiSF_7": {"enable": true, "radio": 1, "if": 0}, /* Freq : 924.5 MHz*/ "chan_Lora_std": {"enable": true, "radio": 1, "if": -100000, "bandwidth": 250000, "spread_factor": 7, /* Freq : 904.6 MHz*/ "implicit_hdr": false, "implicit_payload_length": 17, "implicit_crc_en": false, "implicit_coderate": 1}, - "chan_FSK": {"enable": true, "radio": 1, "if": 20000, "bandwidth": 125000, "datarate": 50000} /* Freq : 924.8 MHz*/ + "chan_FSK": {"enable": true, "radio": 1, "if": 200000, "bandwidth": 125000, "datarate": 50000} /* Freq : 924.8 MHz*/ }, "gateway_conf": { "gateway_ID": "AA555A0000000000", /* change with default server address/ports */ - "server_address": "router.us.thethings.network", + "server_address": "router.as2.thethings.network", "serv_port_up": 1700, "serv_port_down": 1700, /* adjust the following parameters for your network */ From 12efc98a2735f7eb9bf2cbdab28f7d69029a2aeb Mon Sep 17 00:00:00 2001 From: ZhuQI Date: Fri, 18 Sep 2020 14:46:22 +0800 Subject: [PATCH 2/3] 4.2.5 --- README.md | 6 + ap/install.sh | 0 ap/set_ssid | 0 ...chirpstack-network-server.as_920_923.toml} | 0 .../chirpstack-network-server.as_923_925.toml | 198 ++++++++++++++++ chirpstack/install.sh | 0 choose_model.sh | 0 first_boot/expand_rootfs.sh | 0 first_boot/init_loraserver_db | 0 first_boot/install.sh | 0 first_boot/set_ssid | 0 install.sh | 0 lora/install.sh | 0 lora/install_for_img.sh | 0 lora/install_normal.sh | 0 lora/print_lora_log.sh | 0 ...s_923.json => global_conf.as_923_925.json} | 0 .../global_conf/global_conf.eu_433.json | 18 +- .../global_conf/global_conf_as920_923.json | 196 ++++++++++++++++ lora/rak2245/install.sh | 0 ...s_923.json => global_conf.as_923_925.json} | 2 +- .../global_conf/global_conf.eu_433.json | 18 +- .../global_conf/global_conf_as920_923.json | 154 +++++++++++++ lora/rak2246/install.sh | 0 ...s_923.json => global_conf.as_923_925.json} | 0 .../global_conf/global_conf.eu_433.json | 18 +- .../global_conf/global_conf_as920_923.json | 211 ++++++++++++++++++ lora/rak2247_spi/install.sh | 0 lora/rak2247_usb/Makefile-gw | 0 lora/rak2247_usb/Makefile-gw-lib | 0 ...s_923.json => global_conf.as_923_925.json} | 0 .../global_conf/global_conf.eu_433.json | 18 +- .../global_conf/global_conf_as920_923.json | 211 ++++++++++++++++++ lora/rak2247_usb/install.sh | 0 lora/rak2247_usb/library.cfg | 0 lora/rak2247_usb/loragw_spi.ftdi.c | 0 .../global_conf/global_conf.as_920_923.json | 98 ++++++++ ...s_923.json => global_conf.as_923_925.json} | 0 lora/rak2285/install.sh | 0 lora/rak2285/reset_lgw.sh | 0 .../global_conf/global_conf.as_920_923.json | 98 ++++++++ ...s_923.json => global_conf.as_923_925.json} | 0 lora/rak2287_spi/install.sh | 0 lora/rak2287_spi/reset_lgw.sh | 0 ...s_923.json => global_conf.as_923_925.json} | 0 .../global_conf/global_conf.eu_433.json | 18 +- .../global_conf/global_conf_as920_923.json | 196 ++++++++++++++++ lora/rak7243/install.sh | 0 lora/rak7243/ppp.sh | 0 lora/set_eui.sh | 0 lora/start.sh | 0 lora/update_gwid.sh | 0 lte/install.sh | 0 lte/ppp-creator.sh | 0 lte/ppp.sh | 0 lte/pppd.sh | 0 rak/gateway-config | 116 +++++----- rak/gateway-version | 0 rak/install.sh | 0 rak/rak/bin/active_lte_module.sh | 0 rak/rak/bin/rak_for_ttn.sh | 0 rak/rak/bin/rak_script | 0 rak/rak/first_boot/copy_pkt_fwd | 0 rak/rak/first_boot/expand_rootfs.sh | 0 rak/rak/first_boot/init_loraserver_db | 0 rak/rak/first_boot/set_ssid | 0 rak/rak/rak_gw_model.json | 2 +- rak/rak/rak_install_info.json | 4 - rak/rak/shell_script/rak_common.sh | 0 rak_config.json | 0 sysconf/install.sh | 0 sysconf/set_ip.sh | 0 72 files changed, 1477 insertions(+), 105 deletions(-) mode change 100755 => 100644 ap/install.sh mode change 100755 => 100644 ap/set_ssid rename chirpstack/chirpstack-network-server_conf/{chirpstack-network-server.as_923.toml => chirpstack-network-server.as_920_923.toml} (100%) create mode 100644 chirpstack/chirpstack-network-server_conf/chirpstack-network-server.as_923_925.toml mode change 100755 => 100644 chirpstack/install.sh mode change 100755 => 100644 choose_model.sh mode change 100755 => 100644 first_boot/expand_rootfs.sh mode change 100755 => 100644 first_boot/init_loraserver_db mode change 100755 => 100644 first_boot/install.sh mode change 100755 => 100644 first_boot/set_ssid mode change 100755 => 100644 install.sh mode change 100755 => 100644 lora/install.sh mode change 100755 => 100644 lora/install_for_img.sh mode change 100755 => 100644 lora/install_normal.sh mode change 100755 => 100644 lora/print_lora_log.sh rename lora/rak2245/global_conf/{global_conf.as_923.json => global_conf.as_923_925.json} (100%) create mode 100644 lora/rak2245/global_conf/global_conf_as920_923.json mode change 100755 => 100644 lora/rak2245/install.sh rename lora/rak2246/global_conf/{global_conf.as_923.json => global_conf.as_923_925.json} (99%) create mode 100644 lora/rak2246/global_conf/global_conf_as920_923.json mode change 100755 => 100644 lora/rak2246/install.sh rename lora/rak2247_spi/global_conf/{global_conf.as_923.json => global_conf.as_923_925.json} (100%) create mode 100644 lora/rak2247_spi/global_conf/global_conf_as920_923.json mode change 100755 => 100644 lora/rak2247_spi/install.sh mode change 100755 => 100644 lora/rak2247_usb/Makefile-gw mode change 100755 => 100644 lora/rak2247_usb/Makefile-gw-lib rename lora/rak2247_usb/global_conf/{global_conf.as_923.json => global_conf.as_923_925.json} (100%) create mode 100644 lora/rak2247_usb/global_conf/global_conf_as920_923.json mode change 100755 => 100644 lora/rak2247_usb/install.sh mode change 100755 => 100644 lora/rak2247_usb/library.cfg mode change 100755 => 100644 lora/rak2247_usb/loragw_spi.ftdi.c create mode 100644 lora/rak2285/global_conf/global_conf.as_920_923.json rename lora/rak2285/global_conf/{global_conf.as_923.json => global_conf.as_923_925.json} (100%) mode change 100755 => 100644 lora/rak2285/install.sh mode change 100755 => 100644 lora/rak2285/reset_lgw.sh create mode 100644 lora/rak2287_spi/global_conf/global_conf.as_920_923.json rename lora/rak2287_spi/global_conf/{global_conf.as_923.json => global_conf.as_923_925.json} (100%) mode change 100755 => 100644 lora/rak2287_spi/install.sh mode change 100755 => 100644 lora/rak2287_spi/reset_lgw.sh rename lora/rak7243/global_conf/{global_conf.as_923.json => global_conf.as_923_925.json} (100%) create mode 100644 lora/rak7243/global_conf/global_conf_as920_923.json mode change 100755 => 100644 lora/rak7243/install.sh mode change 100755 => 100644 lora/rak7243/ppp.sh mode change 100755 => 100644 lora/set_eui.sh mode change 100755 => 100644 lora/start.sh mode change 100755 => 100644 lora/update_gwid.sh mode change 100755 => 100644 lte/install.sh mode change 100755 => 100644 lte/ppp-creator.sh mode change 100755 => 100644 lte/ppp.sh mode change 100755 => 100644 lte/pppd.sh mode change 100755 => 100644 rak/gateway-config mode change 100755 => 100644 rak/gateway-version mode change 100755 => 100644 rak/install.sh mode change 100755 => 100644 rak/rak/bin/active_lte_module.sh mode change 100755 => 100644 rak/rak/bin/rak_for_ttn.sh mode change 100755 => 100644 rak/rak/bin/rak_script mode change 100755 => 100644 rak/rak/first_boot/copy_pkt_fwd mode change 100755 => 100644 rak/rak/first_boot/expand_rootfs.sh mode change 100755 => 100644 rak/rak/first_boot/init_loraserver_db mode change 100755 => 100644 rak/rak/first_boot/set_ssid delete mode 100644 rak/rak/rak_install_info.json mode change 100755 => 100644 rak/rak/shell_script/rak_common.sh delete mode 100644 rak_config.json mode change 100755 => 100644 sysconf/install.sh mode change 100755 => 100644 sysconf/set_ip.sh diff --git a/README.md b/README.md index 5d72552..da83c1a 100644 --- 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 old mode 100755 new mode 100644 diff --git a/ap/set_ssid b/ap/set_ssid old mode 100755 new mode 100644 diff --git a/chirpstack/chirpstack-network-server_conf/chirpstack-network-server.as_923.toml b/chirpstack/chirpstack-network-server_conf/chirpstack-network-server.as_920_923.toml similarity index 100% rename from chirpstack/chirpstack-network-server_conf/chirpstack-network-server.as_923.toml rename to chirpstack/chirpstack-network-server_conf/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 new file mode 100644 index 0000000..a6f1990 --- /dev/null +++ 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 old mode 100755 new mode 100644 diff --git a/choose_model.sh b/choose_model.sh old mode 100755 new mode 100644 diff --git a/first_boot/expand_rootfs.sh b/first_boot/expand_rootfs.sh old mode 100755 new mode 100644 diff --git a/first_boot/init_loraserver_db b/first_boot/init_loraserver_db old mode 100755 new mode 100644 diff --git a/first_boot/install.sh b/first_boot/install.sh old mode 100755 new mode 100644 diff --git a/first_boot/set_ssid b/first_boot/set_ssid old mode 100755 new mode 100644 diff --git a/install.sh b/install.sh old mode 100755 new mode 100644 diff --git a/lora/install.sh b/lora/install.sh old mode 100755 new mode 100644 diff --git a/lora/install_for_img.sh b/lora/install_for_img.sh old mode 100755 new mode 100644 diff --git a/lora/install_normal.sh b/lora/install_normal.sh old mode 100755 new mode 100644 diff --git a/lora/print_lora_log.sh b/lora/print_lora_log.sh old mode 100755 new mode 100644 diff --git a/lora/rak2245/global_conf/global_conf.as_923.json b/lora/rak2245/global_conf/global_conf.as_923_925.json similarity index 100% rename from lora/rak2245/global_conf/global_conf.as_923.json rename to lora/rak2245/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 index 6ffc1b3..895934d 100644 --- 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, diff --git a/lora/rak2245/global_conf/global_conf_as920_923.json b/lora/rak2245/global_conf/global_conf_as920_923.json new file mode 100644 index 0000000..ac588df --- /dev/null +++ b/lora/rak2245/global_conf/global_conf_as920_923.json @@ -0,0 +1,196 @@ +{ + "gateway_conf":{ + "gateway_ID":"0000000000000000", + "server_address":"router.as2.thethings.network", + "serv_port_up":1700, + "serv_port_down":1700, + "forward_crc_disabled":false, + "forward_crc_error":false, + "forward_crc_valid":true, + "keepalive_interval":10, + "stat_interval":30, + "push_timeout_ms":100, + "fake_gps":false, + "autoquit_threshold":30, + "gps_tty_path":"/dev/ttyAMA0", + "beacon_freq_hz":923400000, + "beacon_freq_nb":1, + "beacon_freq_step":600000, + "beacon_datarate":9, + "beacon_bw_hz":125000, + "beacon_power":20, + "beacon_period":0 + }, + "SX1301_conf": + { + "lorawan_public":true, + "clksrc":1, + "antenna_gain":0, + "radio_0":{ + "enable":true, + "type":"SX1257", + "freq":923000000, + "rssi_offset":-166, + "tx_enable":true, + "tx_freq_min":921800000, + "tx_freq_max":923600000 + }, + "radio_1":{ + "enable":true, + "type":"SX1257", + "freq":922000000, + "rssi_offset":-166, + "tx_enable":false + }, + "chan_multiSF_0":{ + "enable":true, + "radio":0, + "if":200000 + }, + "chan_multiSF_1":{ + "enable":true, + "radio":0, + "if":400000 + }, + "chan_multiSF_2":{ + "enable":true, + "radio":1, + "if":200000 + }, + "chan_multiSF_3":{ + "enable":true, + "radio":1, + "if":400000 + }, + "chan_multiSF_4":{ + "enable":true, + "radio":0, + "if":-400000 + }, + "chan_multiSF_5":{ + "enable":true, + "radio":0, + "if":-200000 + }, + "chan_multiSF_6":{ + "enable":true, + "radio":1, + "if":0 + }, + "chan_multiSF_7":{ + "enable":true, + "radio":0, + "if":0 + }, + "chan_Lora_std":{ + "enable":true, + "radio":1, + "if":100000, + "bandwidth":250000, + "spread_factor":7 + }, + "chan_FSK":{ + "enable":true, + "radio":1, + "if":-200000, + "bandwidth":125000, + "datarate":50000 + }, + "tx_lut_0":{ + "pa_gain":0, + "mix_gain":9, + "rf_power":-6, + "dig_gain":0 + }, + "tx_lut_1":{ + "pa_gain":0, + "mix_gain":11, + "rf_power":-3, + "dig_gain":0 + }, + "tx_lut_2":{ + "pa_gain":0, + "mix_gain":15, + "rf_power":0, + "dig_gain":0 + }, + "tx_lut_3":{ + "pa_gain":1, + "mix_gain":8, + "rf_power":3, + "dig_gain":0 + }, + "tx_lut_4":{ + "pa_gain":1, + "mix_gain":10, + "rf_power":6, + "dig_gain":0 + }, + "tx_lut_5":{ + "pa_gain":1, + "mix_gain":13, + "rf_power":10, + "dig_gain": 1 + }, + "tx_lut_6":{ + "pa_gain":1, + "mix_gain":14, + "rf_power":11, + "dig_gain":0 + }, + "tx_lut_7":{ + "pa_gain":2, + "mix_gain":10, + "rf_power":12, + "dig_gain":0 + }, + "tx_lut_8":{ + "pa_gain":2, + "mix_gain":10, + "rf_power":13, + "dig_gain":0 + }, + "tx_lut_9":{ + "pa_gain":2, + "mix_gain":11, + "rf_power":14, + "dig_gain": 1 + }, + "tx_lut_10":{ + "pa_gain":2, + "mix_gain": 12, + "rf_power":16, + "dig_gain":0 + }, + "tx_lut_11":{ + "pa_gain":3, + "mix_gain":9, + "rf_power":20, + "dig_gain": 1 + }, + "tx_lut_12":{ + "pa_gain":3, + "mix_gain":11, + "rf_power":23, + "dig_gain": 1 + }, + "tx_lut_13":{ + "pa_gain":3, + "mix_gain":12, + "rf_power":25, + "dig_gain": 1 + }, + "tx_lut_14":{ + "pa_gain":3, + "mix_gain":13, + "rf_power":26, + "dig_gain": 1 + }, + "tx_lut_15":{ + "pa_gain":3, + "mix_gain":13, + "rf_power":27, + "dig_gain":0 + } + } +} diff --git a/lora/rak2245/install.sh b/lora/rak2245/install.sh old mode 100755 new mode 100644 diff --git a/lora/rak2246/global_conf/global_conf.as_923.json b/lora/rak2246/global_conf/global_conf.as_923_925.json similarity index 99% rename from lora/rak2246/global_conf/global_conf.as_923.json rename to lora/rak2246/global_conf/global_conf.as_923_925.json index f3afbba..65d32ff 100644 --- a/lora/rak2246/global_conf/global_conf.as_923.json +++ b/lora/rak2246/global_conf/global_conf.as_923_925.json @@ -85,7 +85,7 @@ "bandwidth": 125000, "datarate": 50000 }, - "tx_lut_0": { + "tx_lut_0": { "pa_gain": 0, "mix_gain": 8, "rf_power": 3, diff --git a/lora/rak2246/global_conf/global_conf.eu_433.json b/lora/rak2246/global_conf/global_conf.eu_433.json index 715772c..243a2af 100644 --- a/lora/rak2246/global_conf/global_conf.eu_433.json +++ b/lora/rak2246/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, diff --git a/lora/rak2246/global_conf/global_conf_as920_923.json b/lora/rak2246/global_conf/global_conf_as920_923.json new file mode 100644 index 0000000..89b6702 --- /dev/null +++ b/lora/rak2246/global_conf/global_conf_as920_923.json @@ -0,0 +1,154 @@ +{ + "gateway_conf":{ + "gateway_ID":"0000000000000000", + "server_address":"router.as2.thethings.network", + "serv_port_up":1700, + "serv_port_down":1700, + "forward_crc_disabled":false, + "forward_crc_error":false, + "forward_crc_valid":true, + "keepalive_interval":10, + "stat_interval":30, + "push_timeout_ms":100, + "fake_gps":false, + "autoquit_threshold":30, + "gps_tty_path":"/dev/ttyAMA0", + "beacon_freq_hz":923400000, + "beacon_freq_nb":1, + "beacon_freq_step":600000, + "beacon_datarate":9, + "beacon_bw_hz":125000, + "beacon_power":20, + "beacon_period":0 + }, + "SX1301_conf": + { + "lorawan_public":true, + "clksrc":1, + "antenna_gain":0, + "radio_0":{ + "enable":true, + "type":"SX1257", + "freq":923000000, + "rssi_offset":-166, + "tx_enable":true, + "tx_freq_min":921800000, + "tx_freq_max":923600000 + }, + "radio_1":{ + "enable":true, + "type":"SX1257", + "freq":922000000, + "rssi_offset":-166, + "tx_enable":false + }, + "chan_multiSF_0":{ + "enable":true, + "radio":0, + "if":200000 + }, + "chan_multiSF_1":{ + "enable":true, + "radio":0, + "if":400000 + }, + "chan_multiSF_2":{ + "enable":true, + "radio":1, + "if":200000 + }, + "chan_multiSF_3":{ + "enable":true, + "radio":1, + "if":400000 + }, + "chan_multiSF_4":{ + "enable":true, + "radio":0, + "if":-400000 + }, + "chan_multiSF_5":{ + "enable":true, + "radio":0, + "if":-200000 + }, + "chan_multiSF_6":{ + "enable":true, + "radio":1, + "if":0 + }, + "chan_multiSF_7":{ + "enable":true, + "radio":0, + "if":0 + }, + "chan_Lora_std":{ + "enable":true, + "radio":1, + "if":100000, + "bandwidth":250000, + "spread_factor":7 + }, + "chan_FSK":{ + "enable":true, + "radio":1, + "if":-200000, + "bandwidth":125000, + "datarate":50000 + }, + "tx_lut_0": { + "pa_gain": 0, + "mix_gain": 8, + "rf_power": 3, + "dig_gain": 3 + }, + "tx_lut_1": { + "pa_gain": 0, + "mix_gain": 8, + "rf_power": 7, + "dig_gain": 2 + }, + "tx_lut_2": { + "pa_gain": 0, + "mix_gain": 9, + "rf_power": 10, + "dig_gain": 1 + }, + "tx_lut_3": { + "pa_gain": 0, + "mix_gain": 9, + "rf_power": 11, + "dig_gain": 0 + }, + "tx_lut_4": { + "pa_gain": 0, + "mix_gain": 10, + "rf_power": 12, + "dig_gain": 1 + }, + "tx_lut_5": { + "pa_gain": 0, + "mix_gain": 10, + "rf_power": 13, + "dig_gain": 0 + }, + "tx_lut_6": { + "pa_gain": 0, + "mix_gain": 11, + "rf_power": 14, + "dig_gain": 0 + }, + "tx_lut_7": { + "pa_gain": 0, + "mix_gain": 12, + "rf_power": 16, + "dig_gain": 0 + }, + "tx_lut_8": { + "pa_gain": 3, + "mix_gain": 15, + "rf_power": 20, + "dig_gain": 0 + } + } +} diff --git a/lora/rak2246/install.sh b/lora/rak2246/install.sh old mode 100755 new mode 100644 diff --git a/lora/rak2247_spi/global_conf/global_conf.as_923.json b/lora/rak2247_spi/global_conf/global_conf.as_923_925.json similarity index 100% rename from lora/rak2247_spi/global_conf/global_conf.as_923.json rename to lora/rak2247_spi/global_conf/global_conf.as_923_925.json diff --git a/lora/rak2247_spi/global_conf/global_conf.eu_433.json b/lora/rak2247_spi/global_conf/global_conf.eu_433.json index 5fdb65f..158dcef 100644 --- a/lora/rak2247_spi/global_conf/global_conf.eu_433.json +++ b/lora/rak2247_spi/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, diff --git a/lora/rak2247_spi/global_conf/global_conf_as920_923.json b/lora/rak2247_spi/global_conf/global_conf_as920_923.json new file mode 100644 index 0000000..c415ddf --- /dev/null +++ b/lora/rak2247_spi/global_conf/global_conf_as920_923.json @@ -0,0 +1,211 @@ +{ + "gateway_conf":{ + "gateway_ID":"0000000000000000", + "server_address":"router.as2.thethings.network", + "serv_port_up":1700, + "serv_port_down":1700, + "forward_crc_disabled":false, + "forward_crc_error":false, + "forward_crc_valid":true, + "keepalive_interval":10, + "stat_interval":30, + "push_timeout_ms":100, + "fake_gps":false, + "autoquit_threshold":30, + "beacon_freq_hz":923400000, + "beacon_freq_nb":1, + "beacon_freq_step":600000, + "beacon_datarate":9, + "beacon_bw_hz":125000, + "beacon_power":20, + "beacon_period":0 + }, + "SX1301_conf": + { + "lorawan_public":true, + "clksrc":1, + "antenna_gain":0, + "radio_0":{ + "enable":true, + "type":"SX1257", + "freq":923000000, + "rssi_offset":-166, + "tx_enable":true, + "tx_freq_min":921800000, + "tx_freq_max":923600000 + }, + "radio_1":{ + "enable":true, + "type":"SX1257", + "freq":922000000, + "rssi_offset":-166, + "tx_enable":false + }, + "chan_multiSF_0":{ + "enable":true, + "radio":0, + "if":200000 + }, + "chan_multiSF_1":{ + "enable":true, + "radio":0, + "if":400000 + }, + "chan_multiSF_2":{ + "enable":true, + "radio":1, + "if":200000 + }, + "chan_multiSF_3":{ + "enable":true, + "radio":1, + "if":400000 + }, + "chan_multiSF_4":{ + "enable":true, + "radio":0, + "if":-400000 + }, + "chan_multiSF_5":{ + "enable":true, + "radio":0, + "if":-200000 + }, + "chan_multiSF_6":{ + "enable":true, + "radio":1, + "if":0 + }, + "chan_multiSF_7":{ + "enable":true, + "radio":0, + "if":0 + }, + "chan_Lora_std":{ + "enable":true, + "radio":1, + "if":100000, + "bandwidth":250000, + "spread_factor":7 + }, + "chan_FSK":{ + "enable":true, + "radio":1, + "if":-200000, + "bandwidth":125000, + "datarate":50000 + }, + "tx_lut_0": { + "desc": "TX gain table, index 0", + "pa_gain": 0, + "mix_gain": 8, + "rf_power": -6, + "dig_gain": 0 + }, + "tx_lut_1": { + "desc": "TX gain table, index 1", + "pa_gain": 0, + "mix_gain": 10, + "rf_power": -3, + "dig_gain": 0 + }, + "tx_lut_2": { + "desc": "TX gain table, index 2", + "pa_gain": 0, + "mix_gain": 14, + "rf_power": 0, + "dig_gain": 0 + }, + "tx_lut_3": { + "desc": "TX gain table, index 3", + "pa_gain": 1, + "mix_gain": 8, + "rf_power": 3, + "dig_gain": 2 + }, + "tx_lut_4": { + "desc": "TX gain table, index 4", + "pa_gain": 1, + "mix_gain": 8, + "rf_power": 6, + "dig_gain": 1 + }, + "tx_lut_5": { + "desc": "TX gain table, index 5", + "pa_gain": 1, + "mix_gain": 9, + "rf_power": 10, + "dig_gain": 1 + }, + "tx_lut_6": { + "desc": "TX gain table, index 6", + "pa_gain": 1, + "mix_gain": 9, + "rf_power": 11, + "dig_gain": 0 + }, + "tx_lut_7": { + "desc": "TX gain table, index 7", + "pa_gain": 2, + "mix_gain": 8, + "rf_power": 12, + "dig_gain": 0 + }, + "tx_lut_8": { + "desc": "TX gain table, index 8", + "pa_gain": 2, + "mix_gain": 9, + "rf_power": 13, + "dig_gain": 1 + }, + "tx_lut_9": { + "desc": "TX gain table, index 9", + "pa_gain": 2, + "mix_gain": 9, + "rf_power": 14, + "dig_gain": 0 + }, + "tx_lut_10": { + "desc": "TX gain table, index 10", + "pa_gain": 2, + "mix_gain": 10, + "rf_power": 16, + "dig_gain": 0 + }, + "tx_lut_11": { + "desc": "TX gain table, index 11", + "pa_gain": 3, + "mix_gain": 8, + "rf_power": 20, + "dig_gain": 0 + }, + "tx_lut_12": { + "desc": "TX gain table, index 12", + "pa_gain": 3, + "mix_gain": 10, + "rf_power": 23, + "dig_gain": 0 + }, + "tx_lut_13": { + "desc": "TX gain table, index 13", + "pa_gain": 3, + "mix_gain": 12, + "rf_power": 25, + "dig_gain": 0 + }, + "tx_lut_14": { + "desc": "TX gain table, index 14", + "pa_gain": 3, + "mix_gain": 13, + "rf_power": 26, + "dig_gain": 0 + }, + "tx_lut_15": { + "desc": "TX gain table, index 15", + "pa_gain": 3, + "mix_gain": 13, + "rf_power": 27, + "dig_gain": 0 + } + } +} diff --git a/lora/rak2247_spi/install.sh b/lora/rak2247_spi/install.sh old mode 100755 new mode 100644 diff --git a/lora/rak2247_usb/Makefile-gw b/lora/rak2247_usb/Makefile-gw old mode 100755 new mode 100644 diff --git a/lora/rak2247_usb/Makefile-gw-lib b/lora/rak2247_usb/Makefile-gw-lib old mode 100755 new mode 100644 diff --git a/lora/rak2247_usb/global_conf/global_conf.as_923.json b/lora/rak2247_usb/global_conf/global_conf.as_923_925.json similarity index 100% rename from lora/rak2247_usb/global_conf/global_conf.as_923.json rename to lora/rak2247_usb/global_conf/global_conf.as_923_925.json diff --git a/lora/rak2247_usb/global_conf/global_conf.eu_433.json b/lora/rak2247_usb/global_conf/global_conf.eu_433.json index a51211d..820f894 100644 --- a/lora/rak2247_usb/global_conf/global_conf.eu_433.json +++ b/lora/rak2247_usb/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, diff --git a/lora/rak2247_usb/global_conf/global_conf_as920_923.json b/lora/rak2247_usb/global_conf/global_conf_as920_923.json new file mode 100644 index 0000000..c415ddf --- /dev/null +++ b/lora/rak2247_usb/global_conf/global_conf_as920_923.json @@ -0,0 +1,211 @@ +{ + "gateway_conf":{ + "gateway_ID":"0000000000000000", + "server_address":"router.as2.thethings.network", + "serv_port_up":1700, + "serv_port_down":1700, + "forward_crc_disabled":false, + "forward_crc_error":false, + "forward_crc_valid":true, + "keepalive_interval":10, + "stat_interval":30, + "push_timeout_ms":100, + "fake_gps":false, + "autoquit_threshold":30, + "beacon_freq_hz":923400000, + "beacon_freq_nb":1, + "beacon_freq_step":600000, + "beacon_datarate":9, + "beacon_bw_hz":125000, + "beacon_power":20, + "beacon_period":0 + }, + "SX1301_conf": + { + "lorawan_public":true, + "clksrc":1, + "antenna_gain":0, + "radio_0":{ + "enable":true, + "type":"SX1257", + "freq":923000000, + "rssi_offset":-166, + "tx_enable":true, + "tx_freq_min":921800000, + "tx_freq_max":923600000 + }, + "radio_1":{ + "enable":true, + "type":"SX1257", + "freq":922000000, + "rssi_offset":-166, + "tx_enable":false + }, + "chan_multiSF_0":{ + "enable":true, + "radio":0, + "if":200000 + }, + "chan_multiSF_1":{ + "enable":true, + "radio":0, + "if":400000 + }, + "chan_multiSF_2":{ + "enable":true, + "radio":1, + "if":200000 + }, + "chan_multiSF_3":{ + "enable":true, + "radio":1, + "if":400000 + }, + "chan_multiSF_4":{ + "enable":true, + "radio":0, + "if":-400000 + }, + "chan_multiSF_5":{ + "enable":true, + "radio":0, + "if":-200000 + }, + "chan_multiSF_6":{ + "enable":true, + "radio":1, + "if":0 + }, + "chan_multiSF_7":{ + "enable":true, + "radio":0, + "if":0 + }, + "chan_Lora_std":{ + "enable":true, + "radio":1, + "if":100000, + "bandwidth":250000, + "spread_factor":7 + }, + "chan_FSK":{ + "enable":true, + "radio":1, + "if":-200000, + "bandwidth":125000, + "datarate":50000 + }, + "tx_lut_0": { + "desc": "TX gain table, index 0", + "pa_gain": 0, + "mix_gain": 8, + "rf_power": -6, + "dig_gain": 0 + }, + "tx_lut_1": { + "desc": "TX gain table, index 1", + "pa_gain": 0, + "mix_gain": 10, + "rf_power": -3, + "dig_gain": 0 + }, + "tx_lut_2": { + "desc": "TX gain table, index 2", + "pa_gain": 0, + "mix_gain": 14, + "rf_power": 0, + "dig_gain": 0 + }, + "tx_lut_3": { + "desc": "TX gain table, index 3", + "pa_gain": 1, + "mix_gain": 8, + "rf_power": 3, + "dig_gain": 2 + }, + "tx_lut_4": { + "desc": "TX gain table, index 4", + "pa_gain": 1, + "mix_gain": 8, + "rf_power": 6, + "dig_gain": 1 + }, + "tx_lut_5": { + "desc": "TX gain table, index 5", + "pa_gain": 1, + "mix_gain": 9, + "rf_power": 10, + "dig_gain": 1 + }, + "tx_lut_6": { + "desc": "TX gain table, index 6", + "pa_gain": 1, + "mix_gain": 9, + "rf_power": 11, + "dig_gain": 0 + }, + "tx_lut_7": { + "desc": "TX gain table, index 7", + "pa_gain": 2, + "mix_gain": 8, + "rf_power": 12, + "dig_gain": 0 + }, + "tx_lut_8": { + "desc": "TX gain table, index 8", + "pa_gain": 2, + "mix_gain": 9, + "rf_power": 13, + "dig_gain": 1 + }, + "tx_lut_9": { + "desc": "TX gain table, index 9", + "pa_gain": 2, + "mix_gain": 9, + "rf_power": 14, + "dig_gain": 0 + }, + "tx_lut_10": { + "desc": "TX gain table, index 10", + "pa_gain": 2, + "mix_gain": 10, + "rf_power": 16, + "dig_gain": 0 + }, + "tx_lut_11": { + "desc": "TX gain table, index 11", + "pa_gain": 3, + "mix_gain": 8, + "rf_power": 20, + "dig_gain": 0 + }, + "tx_lut_12": { + "desc": "TX gain table, index 12", + "pa_gain": 3, + "mix_gain": 10, + "rf_power": 23, + "dig_gain": 0 + }, + "tx_lut_13": { + "desc": "TX gain table, index 13", + "pa_gain": 3, + "mix_gain": 12, + "rf_power": 25, + "dig_gain": 0 + }, + "tx_lut_14": { + "desc": "TX gain table, index 14", + "pa_gain": 3, + "mix_gain": 13, + "rf_power": 26, + "dig_gain": 0 + }, + "tx_lut_15": { + "desc": "TX gain table, index 15", + "pa_gain": 3, + "mix_gain": 13, + "rf_power": 27, + "dig_gain": 0 + } + } +} diff --git a/lora/rak2247_usb/install.sh b/lora/rak2247_usb/install.sh old mode 100755 new mode 100644 diff --git a/lora/rak2247_usb/library.cfg b/lora/rak2247_usb/library.cfg old mode 100755 new mode 100644 diff --git a/lora/rak2247_usb/loragw_spi.ftdi.c b/lora/rak2247_usb/loragw_spi.ftdi.c old mode 100755 new mode 100644 diff --git a/lora/rak2285/global_conf/global_conf.as_920_923.json b/lora/rak2285/global_conf/global_conf.as_920_923.json new file mode 100644 index 0000000..eaaaee3 --- /dev/null +++ b/lora/rak2285/global_conf/global_conf.as_920_923.json @@ -0,0 +1,98 @@ +{ + "SX130x_conf": { + "spidev_path": "/dev/spidev0.0", + "lorawan_public": true, + "clksrc": 0, + "antenna_gain": 0, /* antenna gain, in dBi */ + "full_duplex": false, + "precision_timestamp": { + "enable": false, + "max_ts_metrics": 255, + "nb_symbols": 1 + }, + "radio_0": { + "enable": true, + "type": "SX1250", + "freq": 923000000, + "rssi_offset": -215.4, + "rssi_tcomp": {"coeff_a": 0, "coeff_b": 0, "coeff_c": 20.41, "coeff_d": 2162.56, "coeff_e": 0}, + "tx_enable": true, + "tx_freq_min": 923200000, + "tx_freq_max": 925000000, + "tx_gain_lut":[ + {"rf_power": 12, "pa_gain": 1, "pwr_idx": 1}, + {"rf_power": 13, "pa_gain": 1, "pwr_idx": 2}, + {"rf_power": 14, "pa_gain": 1, "pwr_idx": 3}, + {"rf_power": 15, "pa_gain": 1, "pwr_idx": 4}, + {"rf_power": 16, "pa_gain": 1, "pwr_idx": 5}, + {"rf_power": 17, "pa_gain": 1, "pwr_idx": 6}, + {"rf_power": 18, "pa_gain": 1, "pwr_idx": 8}, + {"rf_power": 19, "pa_gain": 1, "pwr_idx": 13}, + {"rf_power": 20, "pa_gain": 1, "pwr_idx": 10}, + {"rf_power": 21, "pa_gain": 1, "pwr_idx": 15}, + {"rf_power": 22, "pa_gain": 1, "pwr_idx": 12}, + {"rf_power": 23, "pa_gain": 1, "pwr_idx": 13}, + {"rf_power": 24, "pa_gain": 1, "pwr_idx": 14}, + {"rf_power": 25, "pa_gain": 1, "pwr_idx": 16}, + {"rf_power": 26, "pa_gain": 1, "pwr_idx": 17}, + {"rf_power": 27, "pa_gain": 1, "pwr_idx": 19} + ] + }, + "radio_1": { + "enable": true, + "type": "SX1250", + "freq": 922000000, + "rssi_offset": -215.4, + "rssi_tcomp": {"coeff_a": 0, "coeff_b": 0, "coeff_c": 20.41, "coeff_d": 2162.56, "coeff_e": 0}, + "tx_enable": false + }, + "chan_multiSF_0": {"enable": true, "radio": 0, "if": 200000}, /* Freq : 922.6 MHz*/ + "chan_multiSF_1": {"enable": true, "radio": 0, "if": 400000}, /* Freq : 922.8 MHz*/ + "chan_multiSF_2": {"enable": true, "radio": 1, "if": 200000}, /* Freq : 923.0 MHz*/ + "chan_multiSF_3": {"enable": true, "radio": 1, "if": 400000}, /* Freq : 923.2 MHz*/ + "chan_multiSF_4": {"enable": true, "radio": 0, "if": -400000}, /* Freq : 924.0 MHz*/ + "chan_multiSF_5": {"enable": true, "radio": 0, "if": -200000}, /* Freq : 924.2 MHz*/ + "chan_multiSF_6": {"enable": true, "radio": 1, "if": 0}, /* Freq : 924.4 MHz*/ + "chan_multiSF_7": {"enable": true, "radio": 0, "if": 0}, /* Freq : 924.5 MHz*/ + "chan_Lora_std": {"enable": true, "radio": 1, "if": 100000, "bandwidth": 250000, "spread_factor": 7, /* Freq : 904.6 MHz*/ + "implicit_hdr": false, "implicit_payload_length": 17, "implicit_crc_en": false, "implicit_coderate": 1}, + "chan_FSK": {"enable": true, "radio": 1, "if": -200000, "bandwidth": 125000, "datarate": 50000} /* Freq : 924.8 MHz*/ + }, + + "gateway_conf": { + "gateway_ID": "AA555A0000000000", + /* change with default server address/ports */ + "server_address": "router.us.thethings.network", + "serv_port_up": 1700, + "serv_port_down": 1700, + /* adjust the following parameters for your network */ + "keepalive_interval": 10, + "stat_interval": 30, + "push_timeout_ms": 100, + /* forward only valid packets */ + "forward_crc_valid": true, + "forward_crc_error": false, + "forward_crc_disabled": false, + /* GPS configuration */ + "gps_tty_path": "/dev/ttyAMA0", + /* GPS reference coordinates */ + "ref_latitude": 0.0, + "ref_longitude": 0.0, + "ref_altitude": 0, + /* Beaconing parameters */ + "beacon_period": 0, /* disable class B beacon */ + "beacon_freq_hz": 869525000, + "beacon_datarate": 9, + "beacon_bw_hz": 125000, + "beacon_power": 14, + "beacon_infodesc": 0 + }, + + "debug_conf": { + "ref_payload":[ + {"id": "0xCAFE1234"}, + {"id": "0xCAFE2345"} + ], + "log_file": "loragw_hal.log" + } +} diff --git a/lora/rak2285/global_conf/global_conf.as_923.json b/lora/rak2285/global_conf/global_conf.as_923_925.json similarity index 100% rename from lora/rak2285/global_conf/global_conf.as_923.json rename to lora/rak2285/global_conf/global_conf.as_923_925.json diff --git a/lora/rak2285/install.sh b/lora/rak2285/install.sh old mode 100755 new mode 100644 diff --git a/lora/rak2285/reset_lgw.sh b/lora/rak2285/reset_lgw.sh old mode 100755 new mode 100644 diff --git a/lora/rak2287_spi/global_conf/global_conf.as_920_923.json b/lora/rak2287_spi/global_conf/global_conf.as_920_923.json new file mode 100644 index 0000000..eaaaee3 --- /dev/null +++ b/lora/rak2287_spi/global_conf/global_conf.as_920_923.json @@ -0,0 +1,98 @@ +{ + "SX130x_conf": { + "spidev_path": "/dev/spidev0.0", + "lorawan_public": true, + "clksrc": 0, + "antenna_gain": 0, /* antenna gain, in dBi */ + "full_duplex": false, + "precision_timestamp": { + "enable": false, + "max_ts_metrics": 255, + "nb_symbols": 1 + }, + "radio_0": { + "enable": true, + "type": "SX1250", + "freq": 923000000, + "rssi_offset": -215.4, + "rssi_tcomp": {"coeff_a": 0, "coeff_b": 0, "coeff_c": 20.41, "coeff_d": 2162.56, "coeff_e": 0}, + "tx_enable": true, + "tx_freq_min": 923200000, + "tx_freq_max": 925000000, + "tx_gain_lut":[ + {"rf_power": 12, "pa_gain": 1, "pwr_idx": 1}, + {"rf_power": 13, "pa_gain": 1, "pwr_idx": 2}, + {"rf_power": 14, "pa_gain": 1, "pwr_idx": 3}, + {"rf_power": 15, "pa_gain": 1, "pwr_idx": 4}, + {"rf_power": 16, "pa_gain": 1, "pwr_idx": 5}, + {"rf_power": 17, "pa_gain": 1, "pwr_idx": 6}, + {"rf_power": 18, "pa_gain": 1, "pwr_idx": 8}, + {"rf_power": 19, "pa_gain": 1, "pwr_idx": 13}, + {"rf_power": 20, "pa_gain": 1, "pwr_idx": 10}, + {"rf_power": 21, "pa_gain": 1, "pwr_idx": 15}, + {"rf_power": 22, "pa_gain": 1, "pwr_idx": 12}, + {"rf_power": 23, "pa_gain": 1, "pwr_idx": 13}, + {"rf_power": 24, "pa_gain": 1, "pwr_idx": 14}, + {"rf_power": 25, "pa_gain": 1, "pwr_idx": 16}, + {"rf_power": 26, "pa_gain": 1, "pwr_idx": 17}, + {"rf_power": 27, "pa_gain": 1, "pwr_idx": 19} + ] + }, + "radio_1": { + "enable": true, + "type": "SX1250", + "freq": 922000000, + "rssi_offset": -215.4, + "rssi_tcomp": {"coeff_a": 0, "coeff_b": 0, "coeff_c": 20.41, "coeff_d": 2162.56, "coeff_e": 0}, + "tx_enable": false + }, + "chan_multiSF_0": {"enable": true, "radio": 0, "if": 200000}, /* Freq : 922.6 MHz*/ + "chan_multiSF_1": {"enable": true, "radio": 0, "if": 400000}, /* Freq : 922.8 MHz*/ + "chan_multiSF_2": {"enable": true, "radio": 1, "if": 200000}, /* Freq : 923.0 MHz*/ + "chan_multiSF_3": {"enable": true, "radio": 1, "if": 400000}, /* Freq : 923.2 MHz*/ + "chan_multiSF_4": {"enable": true, "radio": 0, "if": -400000}, /* Freq : 924.0 MHz*/ + "chan_multiSF_5": {"enable": true, "radio": 0, "if": -200000}, /* Freq : 924.2 MHz*/ + "chan_multiSF_6": {"enable": true, "radio": 1, "if": 0}, /* Freq : 924.4 MHz*/ + "chan_multiSF_7": {"enable": true, "radio": 0, "if": 0}, /* Freq : 924.5 MHz*/ + "chan_Lora_std": {"enable": true, "radio": 1, "if": 100000, "bandwidth": 250000, "spread_factor": 7, /* Freq : 904.6 MHz*/ + "implicit_hdr": false, "implicit_payload_length": 17, "implicit_crc_en": false, "implicit_coderate": 1}, + "chan_FSK": {"enable": true, "radio": 1, "if": -200000, "bandwidth": 125000, "datarate": 50000} /* Freq : 924.8 MHz*/ + }, + + "gateway_conf": { + "gateway_ID": "AA555A0000000000", + /* change with default server address/ports */ + "server_address": "router.us.thethings.network", + "serv_port_up": 1700, + "serv_port_down": 1700, + /* adjust the following parameters for your network */ + "keepalive_interval": 10, + "stat_interval": 30, + "push_timeout_ms": 100, + /* forward only valid packets */ + "forward_crc_valid": true, + "forward_crc_error": false, + "forward_crc_disabled": false, + /* GPS configuration */ + "gps_tty_path": "/dev/ttyAMA0", + /* GPS reference coordinates */ + "ref_latitude": 0.0, + "ref_longitude": 0.0, + "ref_altitude": 0, + /* Beaconing parameters */ + "beacon_period": 0, /* disable class B beacon */ + "beacon_freq_hz": 869525000, + "beacon_datarate": 9, + "beacon_bw_hz": 125000, + "beacon_power": 14, + "beacon_infodesc": 0 + }, + + "debug_conf": { + "ref_payload":[ + {"id": "0xCAFE1234"}, + {"id": "0xCAFE2345"} + ], + "log_file": "loragw_hal.log" + } +} diff --git a/lora/rak2287_spi/global_conf/global_conf.as_923.json b/lora/rak2287_spi/global_conf/global_conf.as_923_925.json similarity index 100% rename from lora/rak2287_spi/global_conf/global_conf.as_923.json rename to lora/rak2287_spi/global_conf/global_conf.as_923_925.json diff --git a/lora/rak2287_spi/install.sh b/lora/rak2287_spi/install.sh old mode 100755 new mode 100644 diff --git a/lora/rak2287_spi/reset_lgw.sh b/lora/rak2287_spi/reset_lgw.sh old mode 100755 new mode 100644 diff --git a/lora/rak7243/global_conf/global_conf.as_923.json b/lora/rak7243/global_conf/global_conf.as_923_925.json similarity index 100% rename from lora/rak7243/global_conf/global_conf.as_923.json rename to lora/rak7243/global_conf/global_conf.as_923_925.json diff --git a/lora/rak7243/global_conf/global_conf.eu_433.json b/lora/rak7243/global_conf/global_conf.eu_433.json index 8e94bc3..6cfc744 100644 --- a/lora/rak7243/global_conf/global_conf.eu_433.json +++ b/lora/rak7243/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, diff --git a/lora/rak7243/global_conf/global_conf_as920_923.json b/lora/rak7243/global_conf/global_conf_as920_923.json new file mode 100644 index 0000000..1777139 --- /dev/null +++ b/lora/rak7243/global_conf/global_conf_as920_923.json @@ -0,0 +1,196 @@ +{ + "gateway_conf":{ + "gateway_ID":"0000000000000000", + "server_address":"router.as2.thethings.network", + "serv_port_up":1700, + "serv_port_down":1700, + "forward_crc_disabled":false, + "forward_crc_error":false, + "forward_crc_valid":true, + "keepalive_interval":10, + "stat_interval":30, + "push_timeout_ms":100, + "fake_gps":false, + "autoquit_threshold":30, + "gps_tty_path":"/dev/i2c-1", + "beacon_freq_hz":923400000, + "beacon_freq_nb":1, + "beacon_freq_step":600000, + "beacon_datarate":9, + "beacon_bw_hz":125000, + "beacon_power":20, + "beacon_period":0 + }, + "SX1301_conf": + { + "lorawan_public":true, + "clksrc":1, + "antenna_gain":0, + "radio_0":{ + "enable":true, + "type":"SX1257", + "freq":923000000, + "rssi_offset":-166, + "tx_enable":true, + "tx_freq_min":921800000, + "tx_freq_max":923600000 + }, + "radio_1":{ + "enable":true, + "type":"SX1257", + "freq":922000000, + "rssi_offset":-166, + "tx_enable":false + }, + "chan_multiSF_0":{ + "enable":true, + "radio":0, + "if":200000 + }, + "chan_multiSF_1":{ + "enable":true, + "radio":0, + "if":400000 + }, + "chan_multiSF_2":{ + "enable":true, + "radio":1, + "if":200000 + }, + "chan_multiSF_3":{ + "enable":true, + "radio":1, + "if":400000 + }, + "chan_multiSF_4":{ + "enable":true, + "radio":0, + "if":-400000 + }, + "chan_multiSF_5":{ + "enable":true, + "radio":0, + "if":-200000 + }, + "chan_multiSF_6":{ + "enable":true, + "radio":1, + "if":0 + }, + "chan_multiSF_7":{ + "enable":true, + "radio":0, + "if":0 + }, + "chan_Lora_std":{ + "enable":true, + "radio":1, + "if":100000, + "bandwidth":250000, + "spread_factor":7 + }, + "chan_FSK":{ + "enable":true, + "radio":1, + "if":-200000, + "bandwidth":125000, + "datarate":50000 + }, + "tx_lut_0":{ + "pa_gain":0, + "mix_gain":9, + "rf_power":-6, + "dig_gain":0 + }, + "tx_lut_1":{ + "pa_gain":0, + "mix_gain":11, + "rf_power":-3, + "dig_gain":0 + }, + "tx_lut_2":{ + "pa_gain":0, + "mix_gain":15, + "rf_power":0, + "dig_gain":0 + }, + "tx_lut_3":{ + "pa_gain":1, + "mix_gain":8, + "rf_power":3, + "dig_gain":0 + }, + "tx_lut_4":{ + "pa_gain":1, + "mix_gain":10, + "rf_power":6, + "dig_gain":0 + }, + "tx_lut_5":{ + "pa_gain":1, + "mix_gain":13, + "rf_power":10, + "dig_gain": 1 + }, + "tx_lut_6":{ + "pa_gain":1, + "mix_gain":14, + "rf_power":11, + "dig_gain":0 + }, + "tx_lut_7":{ + "pa_gain":2, + "mix_gain":10, + "rf_power":12, + "dig_gain":0 + }, + "tx_lut_8":{ + "pa_gain":2, + "mix_gain":10, + "rf_power":13, + "dig_gain":0 + }, + "tx_lut_9":{ + "pa_gain":2, + "mix_gain":11, + "rf_power":14, + "dig_gain": 1 + }, + "tx_lut_10":{ + "pa_gain":2, + "mix_gain": 12, + "rf_power":16, + "dig_gain":0 + }, + "tx_lut_11":{ + "pa_gain":3, + "mix_gain":9, + "rf_power":20, + "dig_gain": 1 + }, + "tx_lut_12":{ + "pa_gain":3, + "mix_gain":11, + "rf_power":23, + "dig_gain": 1 + }, + "tx_lut_13":{ + "pa_gain":3, + "mix_gain":12, + "rf_power":25, + "dig_gain": 1 + }, + "tx_lut_14":{ + "pa_gain":3, + "mix_gain":13, + "rf_power":26, + "dig_gain": 1 + }, + "tx_lut_15":{ + "pa_gain":3, + "mix_gain":13, + "rf_power":27, + "dig_gain":0 + } + } +} diff --git a/lora/rak7243/install.sh b/lora/rak7243/install.sh old mode 100755 new mode 100644 diff --git a/lora/rak7243/ppp.sh b/lora/rak7243/ppp.sh old mode 100755 new mode 100644 diff --git a/lora/set_eui.sh b/lora/set_eui.sh old mode 100755 new mode 100644 diff --git a/lora/start.sh b/lora/start.sh old mode 100755 new mode 100644 diff --git a/lora/update_gwid.sh b/lora/update_gwid.sh old mode 100755 new mode 100644 diff --git a/lte/install.sh b/lte/install.sh old mode 100755 new mode 100644 diff --git a/lte/ppp-creator.sh b/lte/ppp-creator.sh old mode 100755 new mode 100644 diff --git a/lte/ppp.sh b/lte/ppp.sh old mode 100755 new mode 100644 diff --git a/lte/pppd.sh b/lte/pppd.sh old mode 100755 new mode 100644 diff --git a/rak/gateway-config b/rak/gateway-config old mode 100755 new mode 100644 index b3d85ae..b960f45 --- a/rak/gateway-config +++ b/rak/gateway-config @@ -103,33 +103,9 @@ do_setup_ttn_channel_plan() { default_item=1 if [ "${GW_MODEL}" = "RAK2287" ] || [ "${GW_MODEL}" = "RAK2285" ]; then FUN=$(dialog --title "TTN Channel-plan configuration" --default-item $default_item --menu "Select the Channel-plan:" 18 60 12 \ - 1 "AS_923" \ - 2 "AU_915_928" \ - 3 "EU_863_870" \ - 4 "IN_865_867" \ - 5 "KR_920_923" \ - 6 "RU_864_870" \ - 7 "US_902_928" \ - 3>&1 1>&2 2>&3) - RET=$? - if [ $RET -eq 1 ]; then - : - elif [ $RET -eq 0 ]; then - case "$FUN" in - 1) do_copy_global_conf "ttn" "as_923" 1;; - 2) do_copy_global_conf "ttn" "au_915_928" 2;; - 3) do_copy_global_conf "ttn" "eu_863_870" 4;; - 4) do_copy_global_conf "ttn" "in_865_867" 5;; - 5) do_copy_global_conf "ttn" "kr_920_923" 6;; - 6) do_copy_global_conf "ttn" "ru_864_870" 7;; - 7) do_copy_global_conf "ttn" "us_902_928" 8;; - esac - fi - else - FUN=$(dialog --title "TTN Channel-plan configuration" --default-item $default_item --menu "Select the Channel-plan:" 18 60 12 \ - 1 "AS_923" \ - 2 "AU_915_928" \ - 3 "CN_470_510" \ + 1 "AS_923(920_923)" \ + 2 "AS_923(923_925)" \ + 3 "AU_915_928" \ 4 "EU_863_870" \ 5 "IN_865_867" \ 6 "KR_920_923" \ @@ -141,9 +117,9 @@ do_setup_ttn_channel_plan() { : elif [ $RET -eq 0 ]; then case "$FUN" in - 1) do_copy_global_conf "ttn" "as_923" 1;; - 2) do_copy_global_conf "ttn" "au_915_928" 2;; - 3) do_copy_global_conf "ttn" "cn_470_510" 3;; + 1) do_copy_global_conf "ttn" "as_920_923" 1;; + 2) do_copy_global_conf "ttn" "as_923_925" 1;; + 3) do_copy_global_conf "ttn" "au_915_928" 2;; 4) do_copy_global_conf "ttn" "eu_863_870" 4;; 5) do_copy_global_conf "ttn" "in_865_867" 5;; 6) do_copy_global_conf "ttn" "kr_920_923" 6;; @@ -151,6 +127,34 @@ do_setup_ttn_channel_plan() { 8) do_copy_global_conf "ttn" "us_902_928" 8;; esac fi + else + FUN=$(dialog --title "TTN Channel-plan configuration" --default-item $default_item --menu "Select the Channel-plan:" 18 60 12 \ + 1 "AS_923(920_923)" \ + 2 "AS_923(923_925)" \ + 3 "AU_915_928" \ + 4 "CN_470_510" \ + 5 "EU_863_870" \ + 6 "IN_865_867" \ + 7 "KR_920_923" \ + 8 "RU_864_870" \ + 9 "US_902_928" \ + 3>&1 1>&2 2>&3) + RET=$? + if [ $RET -eq 1 ]; then + : + elif [ $RET -eq 0 ]; then + case "$FUN" in + 1) do_copy_global_conf "ttn" "as_920_923" 1;; + 2) do_copy_global_conf "ttn" "as_923_925" 1;; + 3) do_copy_global_conf "ttn" "au_915_928" 2;; + 4) do_copy_global_conf "ttn" "cn_470_510" 3;; + 5) do_copy_global_conf "ttn" "eu_863_870" 4;; + 6) do_copy_global_conf "ttn" "in_865_867" 5;; + 7) do_copy_global_conf "ttn" "kr_920_923" 6;; + 8) do_copy_global_conf "ttn" "ru_864_870" 7;; + 9) do_copy_global_conf "ttn" "us_902_928" 8;; + esac + fi fi } @@ -186,31 +190,34 @@ do_setup_LoRaServer_channel_plan() { default_item=1 if [ "${GW_MODEL}" = "RAK2287" ] || [ "${GW_MODEL}" = "RAK2285" ]; then FUN=$(dialog --title "TTN Channel-plan configuration" --default-item $default_item --menu "Select the Channel-plan:" 18 60 12 \ - 1 "AS_923" \ - 2 "AU_915_928" \ - 3 "EU_863_870" \ - 4 "IN_865_867" \ - 5 "KR_920_923" \ - 6 "RU_864_870" \ - 7 "US_902_928" \ + 1 "AS_923(920_923)" \ + 2 "AS_923(923_925)" \ + 3 "AU_915_928" \ + 4 "EU_863_870" \ + 5 "IN_865_867" \ + 6 "KR_920_923" \ + 7 "RU_864_870" \ + 8 "US_902_928" \ 3>&1 1>&2 2>&3) RET=$? if [ $RET -eq 1 ]; then : elif [ $RET -eq 0 ]; then case "$FUN" in - 1) do_copy_global_conf "chirpstack" "as_923" 1;; - 2) do_copy_global_conf "chirpstack" "au_915_928" 2;; - 3) do_copy_global_conf "chirpstack" "eu_863_870" 5;; - 4) do_copy_global_conf "chirpstack" "in_865_867" 6;; - 5) do_copy_global_conf "chirpstack" "kr_920_923" 7;; - 6) do_copy_global_conf "chirpstack" "ru_864_870" 8;; - 7) do_copy_global_conf "chirpstack" "us_902_928" 9;; + 1) do_copy_global_conf "chirpstack" "as_920_923" 1;; + 2) do_copy_global_conf "chirpstack" "as_923_925" 1;; + 3) do_copy_global_conf "chirpstack" "au_915_928" 2;; + 4) do_copy_global_conf "chirpstack" "eu_863_870" 5;; + 5) do_copy_global_conf "chirpstack" "in_865_867" 6;; + 6) do_copy_global_conf "chirpstack" "kr_920_923" 7;; + 7) do_copy_global_conf "chirpstack" "ru_864_870" 8;; + 8) do_copy_global_conf "chirpstack" "us_902_928" 9;; esac fi else FUN=$(dialog --title "Server Channel-plan configuration" --default-item $default_item --menu "Server Channel-plan:" 18 60 12 \ - 1 "AS_923" \ + 1 "AS_923(920_923)" \ + 1 "AS_923(923_925)" \ 2 "AU_915_928" \ 3 "CN_470_510" \ 4 "EU_433" \ @@ -223,15 +230,16 @@ do_setup_LoRaServer_channel_plan() { RET=$? if [ $RET -eq 0 ]; then case "$FUN" in - 1) do_copy_global_conf "chirpstack" "as_923" 1;; - 2) do_copy_global_conf "chirpstack" "au_915_928" 2;; - 3) do_copy_global_conf "chirpstack" "cn_470_510" 3;; - 4) do_copy_global_conf "chirpstack" "eu_433" 4;; - 5) do_copy_global_conf "chirpstack" "eu_863_870" 5;; - 6) do_copy_global_conf "chirpstack" "in_865_867" 6;; - 7) do_copy_global_conf "chirpstack" "kr_920_923" 7;; - 8) do_copy_global_conf "chirpstack" "ru_864_870" 8;; - 9) do_copy_global_conf "chirpstack" "us_902_928" 9;; + 1) do_copy_global_conf "chirpstack" "as_920_923" 1;; + 2) do_copy_global_conf "chirpstack" "as_923_925" 1;; + 3) do_copy_global_conf "chirpstack" "au_915_928" 2;; + 4) do_copy_global_conf "chirpstack" "cn_470_510" 3;; + 5) do_copy_global_conf "chirpstack" "eu_433" 4;; + 6) do_copy_global_conf "chirpstack" "eu_863_870" 5;; + 7) do_copy_global_conf "chirpstack" "in_865_867" 6;; + 8) do_copy_global_conf "chirpstack" "kr_920_923" 7;; + 9) do_copy_global_conf "chirpstack" "ru_864_870" 8;; + 10) do_copy_global_conf "chirpstack" "us_902_928" 9;; esac fi fi diff --git a/rak/gateway-version b/rak/gateway-version old mode 100755 new mode 100644 diff --git a/rak/install.sh b/rak/install.sh old mode 100755 new mode 100644 diff --git a/rak/rak/bin/active_lte_module.sh b/rak/rak/bin/active_lte_module.sh old mode 100755 new mode 100644 diff --git a/rak/rak/bin/rak_for_ttn.sh b/rak/rak/bin/rak_for_ttn.sh old mode 100755 new mode 100644 diff --git a/rak/rak/bin/rak_script b/rak/rak/bin/rak_script old mode 100755 new mode 100644 diff --git a/rak/rak/first_boot/copy_pkt_fwd b/rak/rak/first_boot/copy_pkt_fwd old mode 100755 new mode 100644 diff --git a/rak/rak/first_boot/expand_rootfs.sh b/rak/rak/first_boot/expand_rootfs.sh old mode 100755 new mode 100644 diff --git a/rak/rak/first_boot/init_loraserver_db b/rak/rak/first_boot/init_loraserver_db old mode 100755 new mode 100644 diff --git a/rak/rak/first_boot/set_ssid b/rak/rak/first_boot/set_ssid old mode 100755 new mode 100644 diff --git a/rak/rak/rak_gw_model.json b/rak/rak/rak_gw_model.json index 8fb1220..adbe12f 100644 --- a/rak/rak/rak_gw_model.json +++ b/rak/rak/rak_gw_model.json @@ -1,5 +1,5 @@ { "gw_model": "RAK7243", - "gw_version": "4.2.4R", + "gw_version": "4.2.5R", "spi": 0 } diff --git a/rak/rak/rak_install_info.json b/rak/rak/rak_install_info.json deleted file mode 100644 index d987d97..0000000 --- a/rak/rak/rak_install_info.json +++ /dev/null @@ -1,4 +0,0 @@ -"rak_lora_model":"RAK2245", - "lte_module":"Y", - "chirpstack":"Y", - "wlan_for_ap":"Y" diff --git a/rak/rak/shell_script/rak_common.sh b/rak/rak/shell_script/rak_common.sh old mode 100755 new mode 100644 diff --git a/rak_config.json b/rak_config.json deleted file mode 100644 index e69de29..0000000 diff --git a/sysconf/install.sh b/sysconf/install.sh old mode 100755 new mode 100644 diff --git a/sysconf/set_ip.sh b/sysconf/set_ip.sh old mode 100755 new mode 100644 From 05780006ec11b88df38736fb234b12cfb7ac1887 Mon Sep 17 00:00:00 2001 From: ZhuQI Date: Mon, 9 Nov 2020 16:18:12 +0800 Subject: [PATCH 3/3] fix a name bug --- .../{global_conf_as920_923.json => global_conf.as_920_923.json} | 0 .../{global_conf_as920_923.json => global_conf.as_920_923.json} | 0 .../{global_conf_as920_923.json => global_conf.as_920_923.json} | 0 .../{global_conf_as920_923.json => global_conf.as_920_923.json} | 0 .../{global_conf_as920_923.json => global_conf.as_920_923.json} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename lora/rak2245/global_conf/{global_conf_as920_923.json => global_conf.as_920_923.json} (100%) rename lora/rak2246/global_conf/{global_conf_as920_923.json => global_conf.as_920_923.json} (100%) rename lora/rak2247_spi/global_conf/{global_conf_as920_923.json => global_conf.as_920_923.json} (100%) rename lora/rak2247_usb/global_conf/{global_conf_as920_923.json => global_conf.as_920_923.json} (100%) rename lora/rak7243/global_conf/{global_conf_as920_923.json => global_conf.as_920_923.json} (100%) diff --git a/lora/rak2245/global_conf/global_conf_as920_923.json b/lora/rak2245/global_conf/global_conf.as_920_923.json similarity index 100% rename from lora/rak2245/global_conf/global_conf_as920_923.json rename to lora/rak2245/global_conf/global_conf.as_920_923.json diff --git a/lora/rak2246/global_conf/global_conf_as920_923.json b/lora/rak2246/global_conf/global_conf.as_920_923.json similarity index 100% rename from lora/rak2246/global_conf/global_conf_as920_923.json rename to lora/rak2246/global_conf/global_conf.as_920_923.json diff --git a/lora/rak2247_spi/global_conf/global_conf_as920_923.json b/lora/rak2247_spi/global_conf/global_conf.as_920_923.json similarity index 100% rename from lora/rak2247_spi/global_conf/global_conf_as920_923.json rename to lora/rak2247_spi/global_conf/global_conf.as_920_923.json diff --git a/lora/rak2247_usb/global_conf/global_conf_as920_923.json b/lora/rak2247_usb/global_conf/global_conf.as_920_923.json similarity index 100% rename from lora/rak2247_usb/global_conf/global_conf_as920_923.json rename to lora/rak2247_usb/global_conf/global_conf.as_920_923.json diff --git a/lora/rak7243/global_conf/global_conf_as920_923.json b/lora/rak7243/global_conf/global_conf.as_920_923.json similarity index 100% rename from lora/rak7243/global_conf/global_conf_as920_923.json rename to lora/rak7243/global_conf/global_conf.as_920_923.json