Skip to content

Commit

Permalink
Merge pull request #48 from RAKWireless/dev
Browse files Browse the repository at this point in the history
Only upgraded for RAK2287, added EU433 and CN470 for RAK2287.
  • Loading branch information
RAKzhuqi authored Mar 8, 2021
2 parents 487c623 + 17a9afa commit a7f0ec9
Show file tree
Hide file tree
Showing 34 changed files with 1,306 additions and 1,431 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ This project currently provides support for the below platforms.
* RAK2285

## Changelog
2021-01-21 V4.2.7

* 1.Only upgraded for RAK2287, added EU433 and CN470 for RAK2287.

2020-11-25 V4.2.6

* 1.Added support for RAK7248C.
Expand Down
31 changes: 13 additions & 18 deletions chirpstack/chirpstack-application-server.toml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -60,29 +60,24 @@ url="redis://localhost:6379"
# besides the extra integrations that can be added on a per-application
# basis.
[application_server.integration]
# Payload marshaler.
#
# This defines how the MQTT payloads are encoded. Valid options are:
# * protobuf: Protobuf encoding
# * json: JSON encoding (easier for debugging, but less compact than 'protobuf')
# * json_v3: v3 JSON (will be removed in the next major release)
marshaler="json"

# Enabled integrations.
enabled=["mqtt"]

# MQTT integration backend.
[application_server.integration.mqtt]
# MQTT topic templates for the different MQTT topics.
#
# The meaning of these topics are documented at:
# https://www.chirpstack.io/application-server/integrate/data/
#
# The following substitutions can be used:
# * "{{ .ApplicationID }}" for the application id.
# * "{{ .DevEUI }}" for the DevEUI of the device.
#
# Note: the downlink_topic_template must contain both the application id and
# DevEUI substitution!
uplink_topic_template="application/{{ .ApplicationID }}/device/{{ .DevEUI }}/rx"
downlink_topic_template="application/{{ .ApplicationID }}/device/{{ .DevEUI }}/tx"
join_topic_template="application/{{ .ApplicationID }}/device/{{ .DevEUI }}/join"
ack_topic_template="application/{{ .ApplicationID }}/device/{{ .DevEUI }}/ack"
error_topic_template="application/{{ .ApplicationID }}/device/{{ .DevEUI }}/error"
status_topic_template="application/{{ .ApplicationID }}/device/{{ .DevEUI }}/status"
location_topic_template="application/{{ .ApplicationID }}/device/{{ .DevEUI }}/location"
# Event topic template.
event_topic_template="application/{{ .ApplicationID }}/device/{{ .DevEUI }}/event/{{ .EventType }}"

# Command topic template.
command_topic_template="application/{{ .ApplicationID }}/device/{{ .DevEUI }}/command/{{ .CommandType }}"

# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://localhost:1883"
Expand Down
126 changes: 0 additions & 126 deletions lora/rak2287_spi/Makefile

This file was deleted.

11 changes: 6 additions & 5 deletions lora/rak2287_spi/global_conf_i2c/global_conf.as_920_923.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"SX130x_conf": {
"spidev_path": "/dev/spidev0.0",
"com_type": "SPI",
"com_path": "/dev/spidev0.0",
"lorawan_public": true,
"clksrc": 0,
"antenna_gain": 0, /* antenna gain, in dBi */
"full_duplex": false,
"precision_timestamp": {
"fine_timestamp": {
"enable": false,
"max_ts_metrics": 255,
"nb_symbols": 1
"mode": "all_sf" /* high_capacity or all_sf */
},
"radio_0": {
"enable": true,
Expand Down Expand Up @@ -46,6 +46,7 @@
"rssi_tcomp": {"coeff_a": 0, "coeff_b": 0, "coeff_c": 20.41, "coeff_d": 2162.56, "coeff_e": 0},
"tx_enable": false
},
"chan_multiSF_All": {"spreading_factor_enable": [ 5, 6, 7, 8, 9, 10, 11, 12 ]},
"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*/
Expand Down Expand Up @@ -80,7 +81,7 @@
"ref_longitude": 0.0,
"ref_altitude": 0,
/* Beaconing parameters */
"beacon_period": 0, /* disable class B beacon */
"beacon_period": 0, /* disable class B beacon, set to 128 enable beacon */
"beacon_freq_hz": 923400000,
"beacon_freq_nb": 1,
"beacon_freq_step": 0,
Expand Down
11 changes: 6 additions & 5 deletions lora/rak2287_spi/global_conf_i2c/global_conf.as_923_925.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"SX130x_conf": {
"spidev_path": "/dev/spidev0.0",
"com_type": "SPI",
"com_path": "/dev/spidev0.0",
"lorawan_public": true,
"clksrc": 0,
"antenna_gain": 0, /* antenna gain, in dBi */
"full_duplex": false,
"precision_timestamp": {
"fine_timestamp": {
"enable": false,
"max_ts_metrics": 255,
"nb_symbols": 1
"mode": "all_sf" /* high_capacity or all_sf */
},
"radio_0": {
"enable": true,
Expand Down Expand Up @@ -46,6 +46,7 @@
"rssi_tcomp": {"coeff_a": 0, "coeff_b": 0, "coeff_c": 20.41, "coeff_d": 2162.56, "coeff_e": 0},
"tx_enable": false
},
"chan_multiSF_All": {"spreading_factor_enable": [ 5, 6, 7, 8, 9, 10, 11, 12 ]},
"chan_multiSF_0": {"enable": true, "radio": 0, "if": -400000}, /* Freq : 923.2 MHz*/
"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*/
Expand Down Expand Up @@ -80,7 +81,7 @@
"ref_longitude": 0.0,
"ref_altitude": 0,
/* Beaconing parameters */
"beacon_period": 0, /* disable class B beacon */
"beacon_period": 0, /* disable class B beacon, set to 128 enable beacon */
"beacon_freq_hz": 923400000,
"beacon_freq_nb": 1,
"beacon_freq_step": 0,
Expand Down
11 changes: 6 additions & 5 deletions lora/rak2287_spi/global_conf_i2c/global_conf.au_915_928.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"SX130x_conf": {
"spidev_path": "/dev/spidev0.0",
"com_type": "SPI",
"com_path": "/dev/spidev0.0",
"lorawan_public": true,
"clksrc": 0,
"antenna_gain": 0, /* antenna gain, in dBi */
"full_duplex": false,
"precision_timestamp": {
"fine_timestamp": {
"enable": false,
"max_ts_metrics": 255,
"nb_symbols": 1
"mode": "all_sf" /* high_capacity or all_sf */
},
"radio_0": {
"enable": true,
Expand Down Expand Up @@ -46,6 +46,7 @@
"rssi_tcomp": {"coeff_a": 0, "coeff_b": 0, "coeff_c": 20.41, "coeff_d": 2162.56, "coeff_e": 0},
"tx_enable": false
},
"chan_multiSF_All": {"spreading_factor_enable": [ 5, 6, 7, 8, 9, 10, 11, 12 ]},
"chan_multiSF_0": {"enable": true, "radio": 0, "if": -400000}, /* Freq : 916.8 MHz*/
"chan_multiSF_1": {"enable": true, "radio": 0, "if": -200000}, /* Freq : 917.0 MHz*/
"chan_multiSF_2": {"enable": true, "radio": 0, "if": 0}, /* Freq : 917.2 MHz*/
Expand Down Expand Up @@ -80,7 +81,7 @@
"ref_longitude": 0.0,
"ref_altitude": 0,
/* Beaconing parameters */
"beacon_period": 0, /* disable class B beacon */
"beacon_period": 0, /* disable class B beacon, set to 128 enable beacon */
"beacon_freq_hz": 923300000,
"beacon_freq_nb": 8,
"beacon_freq_step": 600000,
Expand Down
103 changes: 103 additions & 0 deletions lora/rak2287_spi/global_conf_i2c/global_conf.cn_470_510.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{
"SX130x_conf": {
"com_type": "SPI",
"com_path": "/dev/spidev0.0",
"lorawan_public": true,
"clksrc": 0,
"antenna_gain": 0, /* antenna gain, in dBi */
"full_duplex": false,
"fine_timestamp": {
"enable": false,
"mode": "all_sf" /* high_capacity or all_sf */
},
"radio_0": {
"enable": true,
"type": "SX1250",
"single_input_mode": true,
"freq": 486600000,
"rssi_offset": -207.0,
"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": 470000000,
"tx_freq_max": 510000000,
"tx_gain_lut":[
{"rf_power": -6, "pa_gain": 0, "pwr_idx": 0},
{"rf_power": -3, "pa_gain": 0, "pwr_idx": 1},
{"rf_power": 0, "pa_gain": 0, "pwr_idx": 2},
{"rf_power": 3, "pa_gain": 1, "pwr_idx": 3},
{"rf_power": 6, "pa_gain": 1, "pwr_idx": 4},
{"rf_power": 10, "pa_gain": 1, "pwr_idx": 5},
{"rf_power": 11, "pa_gain": 1, "pwr_idx": 6},
{"rf_power": 12, "pa_gain": 1, "pwr_idx": 7},
{"rf_power": 13, "pa_gain": 1, "pwr_idx": 8},
{"rf_power": 14, "pa_gain": 1, "pwr_idx": 9},
{"rf_power": 16, "pa_gain": 1, "pwr_idx": 10},
{"rf_power": 20, "pa_gain": 1, "pwr_idx": 11},
{"rf_power": 23, "pa_gain": 1, "pwr_idx": 12},
{"rf_power": 25, "pa_gain": 1, "pwr_idx": 13},
{"rf_power": 26, "pa_gain": 1, "pwr_idx": 14},
{"rf_power": 27, "pa_gain": 1, "pwr_idx": 15}
]
},
"radio_1": {
"enable": true,
"type": "SX1250",
"single_input_mode": true,
"freq": 487400000,
"rssi_offset": -207.0,
"rssi_tcomp": {"coeff_a": 0, "coeff_b": 0, "coeff_c": 20.41, "coeff_d": 2162.56, "coeff_e": 0},
"tx_enable": false
},
"chan_multiSF_All": {"spreading_factor_enable": [ 5, 6, 7, 8, 9, 10, 11, 12 ]},
"chan_multiSF_0": {"enable": true, "radio": 1, "if": -300000},
"chan_multiSF_1": {"enable": true, "radio": 1, "if": -100000},
"chan_multiSF_2": {"enable": true, "radio": 1, "if": 100000},
"chan_multiSF_3": {"enable": true, "radio": 1, "if": 300000},
"chan_multiSF_4": {"enable": true, "radio": 0, "if": -300000},
"chan_multiSF_5": {"enable": true, "radio": 0, "if": -100000},
"chan_multiSF_6": {"enable": true, "radio": 0, "if": 100000},
"chan_multiSF_7": {"enable": true, "radio": 0, "if": 300000},
"chan_Lora_std": {"enable": false, "radio": 1, "if": -200000, "bandwidth": 250000, "spread_factor": 7,
"implicit_hdr": false, "implicit_payload_length": 17, "implicit_crc_en": false, "implicit_coderate": 1},
"chan_FSK": {"enable": false, "radio": 1, "if": 300000, "bandwidth": 125000, "datarate": 50000}
},

"gateway_conf": {
"gateway_ID": "0000000000000000",
/* change with default server address/ports */
"server_address": "router.cn.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/i2c-1",
/* GPS reference coordinates */
"ref_latitude": 0.0,
"ref_longitude": 0.0,
"ref_altitude": 0,
"autoquit_threshold": 20,
/* Beaconing parameters */
"beacon_period": 0, /* disable class B beacon */
"beacon_freq_hz": 508300000,
"beacon_freq_nb": 8,
"beacon_freq_step": 200000,
"beacon_datarate": 10,
"beacon_bw_hz": 125000,
"beacon_power": 27
},

"debug_conf": {
"ref_payload":[
{"id": "0xCAFE1234"},
{"id": "0xCAFE2345"}
],
"log_file": "loragw_hal.log"
}
}
Loading

0 comments on commit a7f0ec9

Please sign in to comment.