diff --git a/VERSION b/VERSION index ee74734a..627a3f43 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0 +4.1.1 diff --git a/fpga/readme.md b/fpga/readme.md index 196d113a..ad763a19 100644 --- a/fpga/readme.md +++ b/fpga/readme.md @@ -16,15 +16,18 @@ Reference Design board (SX1301AP2-PCB_E336) flash memory. The different images contain the following features: -* SX1301_FPGA_200K_NOTCH_LBT_SPECTRAL_SCAN_863_v33.hex: +* SX1301_FPGA_200K_NOTCH_LBT_SPECTRAL_SCAN_915_v33.hex: - 200KHz Notch filter for TX (not programmable) - - Listen-Before-Talk for 863+MHz frequency range + - Listen-Before-Talk for 915+MHz frequency range (Japan) - Background Spectral Scan (limited) -* SX1301_FPGA_200K_NOTCH_LBT_SPECTRAL_SCAN_915_v33.hex: +* SX1301_FPGA_200K_NOTCH_LBT_SPECTRAL_SCAN_863_v33.hex: - 200KHz Notch filter for TX (not programmable) - - Listen-Before-Talk for 915+MHz frequency range + - Listen-Before-Talk for 863+MHz frequency range - Background Spectral Scan (limited) +Note: This image is the same as the 915+MHz version. It is just meant for +testing "Japan-like" LBT feature on a EU868 board. It does not provide certified +LBT for European band. * SX1301_FPGA_NOTCH_PROG_SPECTRAL_SCAN_v31.hex: - Programmable notch filter for TX diff --git a/libloragw/src/loragw_lbt.c b/libloragw/src/loragw_lbt.c index 2b1bcf4b..4adcef20 100644 --- a/libloragw/src/loragw_lbt.c +++ b/libloragw/src/loragw_lbt.c @@ -177,7 +177,7 @@ int lbt_setup(void) { DEBUG_PRINTF("ERROR: Failed to configure FPGA for LBT channel %d (freq offset)\n", i); return LGW_LBT_ERROR; } - if (lbt_channel_cfg[i].freq_hz == 5000) { /* configured to 128 by default */ + if (lbt_channel_cfg[i].scan_time_us == 5000) { /* configured to 128 by default */ x = lgw_fpga_reg_w(LGW_FPGA_LBT_SCAN_TIME_CH0+i, 1); if (x != LGW_REG_SUCCESS) { DEBUG_PRINTF("ERROR: Failed to configure FPGA for LBT channel %d (freq offset)\n", i); diff --git a/readme.md b/readme.md index f285b695..cfeee0e2 100644 --- a/readme.md +++ b/readme.md @@ -70,6 +70,12 @@ chip through GPIO, before starting any application using the concentrator. 4. Changelog ------------- +### v4.1.1 ### + +* HAL: Fixed bug in "Listen-Before-Talk" which was preventing from configuring +the Scan Time to 5ms. +* MISC: Added GPIO number to reset_lgw.sh command arguments. + ### v4.1.0 ### * HAL: Reworked "Listen-Before-Talk" feature to have more flexibility to define diff --git a/reset_lgw.sh b/reset_lgw.sh index 64cb3d1b..77de63e4 100755 --- a/reset_lgw.sh +++ b/reset_lgw.sh @@ -1,7 +1,7 @@ #!/bin/sh -# This script is intended to be used on IoT Starter Kit platform only, it -# performs the following actions: +# This script is intended to be used on IoT Starter Kit platform, it performs +# the following actions: # - export/unpexort GPIO7 used to reset the SX1301 chip # # Usage examples: @@ -9,7 +9,14 @@ # ./reset_lgw.sh start # The reset pin of SX1301 is wired with RPi GPIO7 -IOT_SK_SX1301_RESET_PIN=7 +# If used on another platform, the GPIO number can be given as parameter. +if [ -z "$2" ]; then + IOT_SK_SX1301_RESET_PIN=7 +else + IOT_SK_SX1301_RESET_PIN=$2 +fi + +echo "Accessing concentrator reset pin through GPIO$IOT_SK_SX1301_RESET_PIN..." WAIT_GPIO() { sleep 0.1 @@ -47,7 +54,7 @@ case "$1" in iot_sk_term ;; *) - echo "Usage: $0 {start|stop}" + echo "Usage: $0 {start|stop} []" exit 1 ;; esac