v1.1.0v1.1.0

- Fixed bug 'no TX on radio B' (rfch 1)
- Added feature: concentrator processing delay compensation in the receive() function for accurate 'end of packet' even timestamping
- Added feature: TX 'start delay' compensation in the send() function to emit packet exactly on target timestamp
- Added feature: timestamp counter verification in send() function, return an error if scheduling was too late
- Switched license to 'Revised BSD'

29 files changed, 289 insertions, 70 deletions

diff --git a/libloragw/Makefile b/libloragw/Makefile
index 6c004f1..b910c92 100644
--- a/libloragw/Makefile
+++ b/libloragw/Makefile
@@ -61,7 +61,7 @@ endif
 obj/loragw_reg.o: .conf_ok src/loragw_reg.c inc/loragw_reg.h inc/loragw_spi.h
 	$(CC) -c $(C99FLAGS) src/loragw_reg.c -o obj/loragw_reg.o $(FLAG_REG)
 
-obj/loragw_hal.o: .conf_ok src/loragw_hal.c src/arb_fw.var src/agc_fw.var inc/loragw_hal.h inc/loragw_reg.h inc/loragw_spi.h inc/loragw_aux.h
+obj/loragw_hal.o: .conf_ok VERSION src/loragw_hal.c src/arb_fw.var src/agc_fw.var inc/loragw_hal.h inc/loragw_reg.h inc/loragw_spi.h inc/loragw_aux.h
 	$(CC) -c $(C99FLAGS) src/loragw_hal.c -o obj/loragw_hal.o -D LGW_PHY="\"$(LGW_PHY)\"" $(FLAG_HAL)
 
 # test programs
diff --git a/libloragw/VERSION b/libloragw/VERSION
index 94fa4e6..3440bb1 100644
--- a/libloragw/VERSION
+++ b/libloragw/VERSION
@@ -1,5 +1,5 @@
 /* Software library version: */
-#define VERSION_LIBRARY			"1.0.0"
+#define VERSION_LIBRARY			"1.1.0"
 
 /* API version */
 #define VERSION_API				"1.0"
diff --git a/libloragw/doc/CHANGELOG.TXT b/libloragw/doc/CHANGELOG.TXT
index ba5866e..4a7d489 100644
--- a/libloragw/doc/CHANGELOG.TXT
+++ b/libloragw/doc/CHANGELOG.TXT
@@ -1,6 +1,15 @@
 Lora Gateway HAL changelog
 ==========================
 
+ v1.1.0
+---------------------
+
+ * Fixed bug 'no TX on radio B' (rfch 1)
+ * Added feature: concentrator processing delay compensation in the receive() function for accurate 'end of packet' even timestamping
+ * Added feature: TX 'start delay' compensation in the send() function to emit packet exactly on target timestamp
+ * Added feature: timestamp counter verification in send() function, return an error if scheduling was too late
+ * Switched license to 'Revised BSD'
+
  v1.0.0 (from beta 8)
 ---------------------
 
diff --git a/libloragw/doc/LICENSE.TXT b/libloragw/doc/LICENSE.TXT
index e406dcb..ff287f3 100644
--- a/libloragw/doc/LICENSE.TXT
+++ b/libloragw/doc/LICENSE.TXT
@@ -1,8 +1,24 @@
-Copyright (C) 2013 SEMTECH S.A.
+Copyright (c) 2013, SEMTECH S.A.
+All rights reserved.
 
- THE FOLLOWING SOFTWARE IS PROVIDED: (1) "AS IS" WITH NO WARRANTY; AND 
-(2)TO ENABLE ACCESS TO CODING INFORMATION TO GUIDE AND FACILITATE CUSTOMER.
-CONSEQUENTLY, SEMTECH SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT OR
-CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
-OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING INFORMATION
-CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Semtech corporation nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL SEMTECH S.A. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libloragw/inc/loragw_aux.h b/libloragw/inc/loragw_aux.h
index 09f543f..daaf3e3 100644
--- a/libloragw/inc/loragw_aux.h
+++ b/libloragw/inc/loragw_aux.h
@@ -7,7 +7,10 @@
     ©2013 Semtech-Cycleo
 
 Description:
-	Lora gateway Hardware Abstraction Layer
+	Lora gateway auxiliary functions
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/libloragw/inc/loragw_hal.h b/libloragw/inc/loragw_hal.h
index 0739f37..41d1d98 100644
--- a/libloragw/inc/loragw_hal.h
+++ b/libloragw/inc/loragw_hal.h
@@ -8,6 +8,9 @@
 
 Description:
 	Lora gateway Hardware Abstraction Layer
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/libloragw/inc/loragw_reg.h b/libloragw/inc/loragw_reg.h
index 870780f..3b74bc3 100644
--- a/libloragw/inc/loragw_reg.h
+++ b/libloragw/inc/loragw_reg.h
@@ -11,6 +11,9 @@ Description:
 	Registers are addressed by name.
 	Multi-bytes registers are handled automatically.
 	Read-modify-write is handled automatically.
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/libloragw/inc/loragw_spi.h b/libloragw/inc/loragw_spi.h
index 68d8bcf..c03df41 100644
--- a/libloragw/inc/loragw_spi.h
+++ b/libloragw/inc/loragw_spi.h
@@ -12,6 +12,9 @@ Description:
 	Single-byte read/write and burst read/write.
 	Does not handle pagination.
 	Could be used with multiple SPI ports in parallel (explicit file descriptor)
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/libloragw/src/agc_fw.var b/libloragw/src/agc_fw.var
index a85a22e..34f34c5 100644
--- a/libloragw/src/agc_fw.var
+++ b/libloragw/src/agc_fw.var
@@ -8,6 +8,9 @@
 
 Description:
 	AGC firmware
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Mathieu Leurent
 */
 
 static uint8_t agc_firmware[MCU_AGC_FW_BYTE] = {
diff --git a/libloragw/src/arb_fw.var b/libloragw/src/arb_fw.var
index fae1ef3..eefa285 100644
--- a/libloragw/src/arb_fw.var
+++ b/libloragw/src/arb_fw.var
@@ -8,6 +8,9 @@
 
 Description:
 	Arbiter firmware
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Ludovic Champion
 */
 
 static uint8_t arb_firmware[MCU_ARB_FW_BYTE] = {
diff --git a/libloragw/src/loragw_aux.c b/libloragw/src/loragw_aux.c
index 1c7e354..f1a0999 100644
--- a/libloragw/src/loragw_aux.c
+++ b/libloragw/src/loragw_aux.c
@@ -8,6 +8,9 @@
 
 Description:
 	Lora gateway auxiliary functions
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/libloragw/src/loragw_hal.c b/libloragw/src/loragw_hal.c
index 881abd4..5d9138d 100644
--- a/libloragw/src/loragw_hal.c
+++ b/libloragw/src/loragw_hal.c
@@ -8,6 +8,9 @@
 
 Description:
 	Lora gateway Hardware Abstraction Layer
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
@@ -93,6 +96,8 @@ F_register(24bit) = F_rf (Hz) / F_step(Hz)
 #define		MIN_FSK_PREAMBLE		3
 #define		PLL_LOCK_MAX_ATTEMPTS	6
 
+#define		TX_START_DELAY		1000
+
 /* -------------------------------------------------------------------------- */
 /* --- PRIVATE VARIABLES ---------------------------------------------------- */
 
@@ -292,11 +297,7 @@ int setup_sx1257(uint8_t rf_chain, uint32_t freq_hz) {
 		return -1;
 	}
 		
-	if (rf_chain == 0) { /* Enable 'clock out' for radio A only */
-		sx125x_write(rf_chain, 0x10, SX125x_TX_DAC_CLK_SEL + 2);
-	} else {
-		sx125x_write(rf_chain, 0x10, SX125x_TX_DAC_CLK_SEL);
-	}
+	sx125x_write(rf_chain, 0x10, SX125x_TX_DAC_CLK_SEL + 2); /* Enable 'clock out' for both radios */
 	sx125x_write(rf_chain, 0x26, 0X2D); /* Disable gm of oscillator block */
 	
 	/* Tx gain and trim */
@@ -426,7 +427,7 @@ void lgw_constant_adjust(void) {
 	lgw_reg_w(LGW_FSK_PATTERN_TIMEOUT_CFG,128); /* sync timeout (allow 8 bytes preamble + 8 bytes sync word, default 0 */
 	
 	/* TX general parameters */
-	lgw_reg_w(LGW_TX_START_DELAY,1000); /* default 0 */
+	lgw_reg_w(LGW_TX_START_DELAY, TX_START_DELAY); /* default 0 */
 	
 	/* TX Lora */
 	// lgw_reg_w(LGW_TX_MODE,0); /* default 0 */
@@ -749,9 +750,13 @@ int lgw_receive(uint8_t max_pkt, struct lgw_pkt_rx_s *pkt_data) {
 	int nb_pkt_fetch; /* loop variable and return value */
 	struct lgw_pkt_rx_s *p; /* pointer to the current structure in the struct array */
 	uint8_t buff[255+RX_METADATA_NB]; /* buffer to store the result of SPI read bursts */
-	int s; /* size of the payload, uses to address metadata */
+	int sz; /* size of the payload, uses to address metadata */
 	int ifmod; /* type of if_chain/modem a packet was received by */
 	int stat_fifo; /* the packet status as indicated in the FIFO */
+	uint32_t raw_timestamp; /* timestamp when internal 'RX finished' was triggered */
+	uint32_t timestamp_correction; /* correction to account for processing delay */
+	uint8_t sf, cr, bw; /* used to calculate timestamp correction */
+	uint8_t crc_en, ppm; /* used to calculate timestamp correction */
 	
 	/* check if the gateway is running */
 	if (lgw_is_started == false) {
@@ -784,40 +789,52 @@ int lgw_receive(uint8_t max_pkt, struct lgw_pkt_rx_s *pkt_data) {
 		DEBUG_PRINTF("FIFO content: %x %x %x %x %x\n",buff[0],buff[1],buff[2],buff[3],buff[4]);
 		
 		p->size = buff[4];
-		s = p->size;
+		sz = p->size;
 		stat_fifo = buff[3]; /* will be used later, need to save it before overwriting buff */
 		
 		/* get payload + metadata */
-		lgw_reg_rb(LGW_RX_DATA_BUF_DATA, buff, s+RX_METADATA_NB);
+		lgw_reg_rb(LGW_RX_DATA_BUF_DATA, buff, sz+RX_METADATA_NB);
 		
 		/* copy payload to result struct */
-		memcpy((void *)p->payload, (void *)buff, s);
+		memcpy((void *)p->payload, (void *)buff, sz);
 		
 		/* process metadata */
-		p->if_chain = buff[s+0];
+		p->if_chain = buff[sz+0];
 		ifmod = ifmod_config[p->if_chain];
 		DEBUG_PRINTF("[%d %d]\n", p->if_chain, ifmod);
 		
 		if ((ifmod == IF_LORA_MULTI) || (ifmod == IF_LORA_STD)) {
 			DEBUG_MSG("Note: Lora packet\n");
 			switch(stat_fifo & 0x07) {
-				case 5: p->status = STAT_CRC_OK; break;
-				case 7: p->status = STAT_CRC_BAD; break;
-				case 1: p->status = STAT_NO_CRC; break;
-				default: p->status = STAT_UNDEFINED;
+				case 5:
+					p->status = STAT_CRC_OK;
+					crc_en = 1;
+					break;
+				case 7:
+					p->status = STAT_CRC_BAD;
+					crc_en = 1;
+					break;
+				case 1:
+					p->status = STAT_NO_CRC;
+					crc_en = 0;
+					break;
+				default:
+					p->status = STAT_UNDEFINED;
+					crc_en = 0;
 			}
 			p->modulation = MOD_LORA;
-			p->snr = ((float)((int8_t)buff[s+2]))/4;
-			p->snr_min = ((float)((int8_t)buff[s+3]))/4;
-			p->snr_max = ((float)((int8_t)buff[s+4]))/4;
+			p->snr = ((float)((int8_t)buff[sz+2]))/4;
+			p->snr_min = ((float)((int8_t)buff[sz+3]))/4;
+			p->snr_max = ((float)((int8_t)buff[sz+4]))/4;
 			if (ifmod == IF_LORA_MULTI) {
-				p->rssi = RSSI_OFFSET_LORA_MULTI + (float)buff[s+5];
+				p->rssi = RSSI_OFFSET_LORA_MULTI + (float)buff[sz+5];
 				p->bandwidth = BW_125KHZ; /* fixed in hardware */
 			} else {
-				p->rssi = RSSI_OFFSET_LORA_STD + (float)buff[s+5];
+				p->rssi = RSSI_OFFSET_LORA_STD + (float)buff[sz+5];
 				p->bandwidth = lora_rx_bw; /* get the parameter from the config variable */
 			}
-			switch ((buff[s+1] >> 4) & 0x0F) {
+			sf = (buff[sz+1] >> 4) & 0x0F;
+			switch (sf) {
 				case 7: p->datarate = DR_LORA_SF7; break;
 				case 8: p->datarate = DR_LORA_SF8; break;
 				case 9: p->datarate = DR_LORA_SF9; break;
@@ -826,13 +843,51 @@ int lgw_receive(uint8_t max_pkt, struct lgw_pkt_rx_s *pkt_data) {
 				case 12: p->datarate = DR_LORA_SF12; break;
 				default: p->datarate = DR_UNDEFINED;
 			}
-			switch ((buff[s+1] >> 1) & 0x07) {
+			cr = (buff[sz+1] >> 1) & 0x07;
+			switch (cr) {
 				case 1: p->coderate = CR_LORA_4_5; break;
 				case 2: p->coderate = CR_LORA_4_6; break;
 				case 3: p->coderate = CR_LORA_4_7; break;
 				case 4: p->coderate = CR_LORA_4_8; break;
 				default: p->coderate = CR_UNDEFINED;
 			}
+			
+			/* timestamp correction code */
+			if (ifmod == IF_LORA_STD) { /* if packet was received on the stand-alone lora modem */
+				switch (lora_rx_bw) {
+					case BW_125KHZ:
+						timestamp_correction = 64;
+						bw = 1;
+						break;
+					case BW_250KHZ:
+						timestamp_correction = 32;
+						bw = 2;
+						break;
+					case BW_500KHZ:
+						timestamp_correction = 16;
+						bw = 4;
+						break;
+					default:
+						DEBUG_PRINTF("ERROR: UNEXPECTED VALUE %d IN SWITCH STATEMENT\n", p->bandwidth);	
+						timestamp_correction = 0;
+						bw = 0;
+				}
+			} else { /* packet was received on one of the sensor channels = 125kHz */
+				timestamp_correction = 114;
+				bw = 1;
+			}
+			if (SET_PPM_ON(p->bandwidth,p->datarate)) {
+				ppm = 1;
+			} else {
+				ppm = 0;
+			}	
+			if ((2*(sz + 2*crc_en) - sf +7) <= 0) { /* payload fits entirely in first 8 symbols */
+				timestamp_correction += (((1<<(sf-1)) * (sf+1)) + (3*(1<<(sf-4))))/bw;
+				timestamp_correction += 32 * (2*(sz+2*crc_en) + 5)/bw;
+			} else {
+				timestamp_correction += (((1<<(sf-1)) * (sf+1)) + ((4.0-ppm)/4.0*(1<<(sf-2))))/bw;
+				timestamp_correction += (16 + 4*cr) * (((2*(sz+2*crc_en)-sf + 6) % (sf-2*ppm) +1) / bw);
+			}
 		} else if (ifmod == IF_FSK_STD) {
 			DEBUG_MSG("Note: FSK packet\n");
 			switch(stat_fifo & 0x07) {
@@ -842,13 +897,14 @@ int lgw_receive(uint8_t max_pkt, struct lgw_pkt_rx_s *pkt_data) {
 				default: p->status = STAT_UNDEFINED;
 			}
 			p->modulation = MOD_FSK;
-			p->rssi = (RSSI_OFFSET_FSK + (float)buff[s+5])/RSSI_SLOPE_FSK;
+			p->rssi = (RSSI_OFFSET_FSK + (float)buff[sz+5])/RSSI_SLOPE_FSK;
 			p->snr = NAN;
 			p->snr_min = NAN;
 			p->snr_max = NAN;
 			p->bandwidth = fsk_rx_bw;
 			p->datarate = fsk_rx_dr;
 			p->coderate = CR_UNDEFINED;
+			timestamp_correction = 0; // TODO: implement FSK timestamp correction
 		} else {
 			DEBUG_MSG("ERROR: UNEXPECTED PACKET ORIGIN\n");
 			p->status = STAT_UNDEFINED;
@@ -860,10 +916,12 @@ int lgw_receive(uint8_t max_pkt, struct lgw_pkt_rx_s *pkt_data) {
 			p->bandwidth = BW_UNDEFINED;
 			p->datarate = DR_UNDEFINED;
 			p->coderate = CR_UNDEFINED;
+			timestamp_correction = 0;
 		}
 		
-		p->count_us = (uint32_t)buff[s+6] + ((uint32_t)buff[s+7] << 8) + ((uint32_t)buff[s+8] << 16) + ((uint32_t)buff[s+9] << 24);
-		p->crc = (uint16_t)buff[s+10] + ((uint16_t)buff[s+11] << 8);
+		raw_timestamp = (uint32_t)buff[sz+6] + ((uint32_t)buff[sz+7] << 8) + ((uint32_t)buff[sz+8] << 16) + ((uint32_t)buff[sz+9] << 24);
+		p->count_us = raw_timestamp - timestamp_correction;
+		p->crc = (uint16_t)buff[sz+10] + ((uint16_t)buff[sz+11] << 8);
 		
 		/* get back info from configuration so that application doesn't have to keep track of it */
 		p->rf_chain = (uint8_t)if_rf_chain[p->if_chain];
@@ -887,6 +945,8 @@ int lgw_send(struct lgw_pkt_tx_s pkt_data) {
 	int transfer_size = 0; /* data to transfer from host to TX databuffer */
 	int payload_offset = 0; /* start of the payload content in the databuffer */
 	uint8_t power_nibble = 0; /* 4-bit value to set the firmware TX power */
+	uint32_t current_tstamp; /* current timestamp, to check for missed TX deadlines */
+	uint32_t deadline_tstamp; /* packet must be scheduled before that timestamp value is reached */
 	
 	/* check if the gateway is running */
 	if (lgw_is_started == false) {
@@ -1095,6 +1155,13 @@ int lgw_send(struct lgw_pkt_tx_s pkt_data) {
 			
 		case TIMESTAMPED:
 			lgw_reg_w(LGW_TX_TRIG_DELAYED, 1);
+			lgw_reg_r(LGW_TIMESTAMP, (int32_t *)&current_tstamp); /* unusable value if GPS is enabled */
+			deadline_tstamp = pkt_data.count_us - TX_START_DELAY; /* time at which the controller with start TX sequence */
+			if ((deadline_tstamp - current_tstamp) > 0x7FFFFFFF) {
+				lgw_reg_w(LGW_TX_TRIG_DELAYED, 0); /* cancel TX if deadline was missed */
+				DEBUG_MSG("ERROR: MISSED TX DEADLINE\n");
+			    return LGW_HAL_ERROR; // should return a specific error message
+			}
 			break;
 			
 		case ON_GPS:
diff --git a/libloragw/src/loragw_reg.c b/libloragw/src/loragw_reg.c
index 68bba55..369c216 100644
--- a/libloragw/src/loragw_reg.c
+++ b/libloragw/src/loragw_reg.c
@@ -11,6 +11,9 @@ Description:
 	Registers are addressed by name.
 	Multi-bytes registers are handled automatically.
 	Read-modify-write is handled automatically.
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/libloragw/src/loragw_spi.ftdi.c b/libloragw/src/loragw_spi.ftdi.c
index 8a16cca..35bc951 100644
--- a/libloragw/src/loragw_spi.ftdi.c
+++ b/libloragw/src/loragw_spi.ftdi.c
@@ -12,6 +12,9 @@ Description:
 	Single-byte read/write and burst read/write.
 	Does not handle pagination.
 	Could be used with multiple SPI ports in parallel (explicit file descriptor)
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/libloragw/src/loragw_spi.native.c b/libloragw/src/loragw_spi.native.c
index 64e9427..cf8aa9d 100644
--- a/libloragw/src/loragw_spi.native.c
+++ b/libloragw/src/loragw_spi.native.c
@@ -12,6 +12,9 @@ Description:
 	Single-byte read/write and burst read/write.
 	Does not handle pagination.
 	Could be used with multiple SPI ports in parallel (explicit file descriptor)
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/libloragw/tst/test_loragw_hal.c b/libloragw/tst/test_loragw_hal.c
index 6afcc45..c777597 100644
--- a/libloragw/tst/test_loragw_hal.c
+++ b/libloragw/tst/test_loragw_hal.c
@@ -8,6 +8,9 @@
 
 Description:
 	Minimum test program for the loragw_hal 'library'
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/libloragw/tst/test_loragw_reg.c b/libloragw/tst/test_loragw_reg.c
index 21ff8ee..fb047fb 100644
--- a/libloragw/tst/test_loragw_reg.c
+++ b/libloragw/tst/test_loragw_reg.c
@@ -8,6 +8,9 @@
 
 Description:
 	Minimum test program for the loragw_spi 'library'
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/libloragw/tst/test_loragw_spi.c b/libloragw/tst/test_loragw_spi.c
index e288df5..b3e8a3e 100644
--- a/libloragw/tst/test_loragw_spi.c
+++ b/libloragw/tst/test_loragw_spi.c
@@ -9,6 +9,9 @@
 Description:
 	Minimum test program for the loragw_spi 'library'
 	Use logic analyser to check the results.
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/loragw_band_survey/LICENSE.TXT b/loragw_band_survey/LICENSE.TXT
index e406dcb..ff287f3 100644
--- a/loragw_band_survey/LICENSE.TXT
+++ b/loragw_band_survey/LICENSE.TXT
@@ -1,8 +1,24 @@
-Copyright (C) 2013 SEMTECH S.A.
+Copyright (c) 2013, SEMTECH S.A.
+All rights reserved.
 
- THE FOLLOWING SOFTWARE IS PROVIDED: (1) "AS IS" WITH NO WARRANTY; AND 
-(2)TO ENABLE ACCESS TO CODING INFORMATION TO GUIDE AND FACILITATE CUSTOMER.
-CONSEQUENTLY, SEMTECH SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT OR
-CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
-OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING INFORMATION
-CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Semtech corporation nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL SEMTECH S.A. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/loragw_band_survey/src/loragw_band_survey.c b/loragw_band_survey/src/loragw_band_survey.c
index dc37eef..eefd814 100644
--- a/loragw_band_survey/src/loragw_band_survey.c
+++ b/loragw_band_survey/src/loragw_band_survey.c
@@ -8,6 +8,9 @@
 
 Description:
 	Configure Lora concentrator board and record received packets in a log file
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/loragw_band_survey/src/rssi_fw.var b/loragw_band_survey/src/rssi_fw.var
index 8e3befc..4fdcb9e 100644
--- a/loragw_band_survey/src/rssi_fw.var
+++ b/loragw_band_survey/src/rssi_fw.var
@@ -8,6 +8,9 @@
 
 Description:
 	firmware for RSSI survey
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Mathieu Leurent
 */
 
 static uint8_t rssi_firmware[MCU_AGC_FW_BYTE] = {
diff --git a/loragw_pkt_logger/LICENSE.TXT b/loragw_pkt_logger/LICENSE.TXT
index b46b1f5..2007c51 100644
--- a/loragw_pkt_logger/LICENSE.TXT
+++ b/loragw_pkt_logger/LICENSE.TXT
@@ -1,4 +1,4 @@
- --- For the parson library (parson.c and parson.h) ---
+--- For the parson library (parson.c and parson.h) ---
  
  Parson ( http://kgabis.github.com/parson/ )
  Copyright (c) 2012 Krzysztof Gabis
@@ -21,13 +21,29 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
- --- For the rest of the code ---
- 
-Copyright (C) 2013 SEMTECH S.A.
+ --- For the rest of the code : Revised BSD License ---
+
+Copyright (c) 2013, SEMTECH S.A.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Semtech corporation nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
 
- THE FOLLOWING SOFTWARE IS PROVIDED: (1) "AS IS" WITH NO WARRANTY; AND 
-(2)TO ENABLE ACCESS TO CODING INFORMATION TO GUIDE AND FACILITATE CUSTOMER.
-CONSEQUENTLY, SEMTECH SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT OR
-CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
-OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING INFORMATION
-CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL SEMTECH S.A. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/loragw_pkt_logger/src/loragw_pkt_logger.c b/loragw_pkt_logger/src/loragw_pkt_logger.c
index b3200ba..f5f6b30 100644
--- a/loragw_pkt_logger/src/loragw_pkt_logger.c
+++ b/loragw_pkt_logger/src/loragw_pkt_logger.c
@@ -8,6 +8,9 @@
 
 Description:
 	Configure Lora concentrator and record received packets in a log file
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/loragw_pkt_logger/src/parson.c b/loragw_pkt_logger/src/parson.c
index 54eae2c..b273ba1 100644
--- a/loragw_pkt_logger/src/parson.c
+++ b/loragw_pkt_logger/src/parson.c
@@ -500,7 +500,9 @@ JSON_Value * json_parse_file(const char *filename) {
     rewind(fp);
     file_contents = (char*)parson_malloc(sizeof(char) * (file_size + 1));
     if (!file_contents) { fclose(fp); return NULL; }
-    if (fread(file_contents, file_size, 1, fp) < 1) { fclose(fp); return NULL; }
+    if (fread(file_contents, file_size, 1, fp) < 1) {
+        if (ferror(fp)) { fclose(fp); return NULL; }
+    }
     fclose(fp);
     file_contents[file_size] = '\0';
     output_value = json_parse_string(file_contents);
diff --git a/loragw_spi_stress/LICENSE.TXT b/loragw_spi_stress/LICENSE.TXT
index e406dcb..ff287f3 100644
--- a/loragw_spi_stress/LICENSE.TXT
+++ b/loragw_spi_stress/LICENSE.TXT
@@ -1,8 +1,24 @@
-Copyright (C) 2013 SEMTECH S.A.
+Copyright (c) 2013, SEMTECH S.A.
+All rights reserved.
 
- THE FOLLOWING SOFTWARE IS PROVIDED: (1) "AS IS" WITH NO WARRANTY; AND 
-(2)TO ENABLE ACCESS TO CODING INFORMATION TO GUIDE AND FACILITATE CUSTOMER.
-CONSEQUENTLY, SEMTECH SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT OR
-CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
-OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING INFORMATION
-CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Semtech corporation nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL SEMTECH S.A. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/loragw_spi_stress/src/loragw_spi_stress.c b/loragw_spi_stress/src/loragw_spi_stress.c
index 45d445f..2c9f2e2 100644
--- a/loragw_spi_stress/src/loragw_spi_stress.c
+++ b/loragw_spi_stress/src/loragw_spi_stress.c
@@ -8,6 +8,9 @@
 
 Description:
 	SPI stress test
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */
 
 
diff --git a/loragw_tx_test/LICENSE.TXT b/loragw_tx_test/LICENSE.TXT
index e406dcb..ff287f3 100644
--- a/loragw_tx_test/LICENSE.TXT
+++ b/loragw_tx_test/LICENSE.TXT
@@ -1,8 +1,24 @@
-Copyright (C) 2013 SEMTECH S.A.
+Copyright (c) 2013, SEMTECH S.A.
+All rights reserved.
 
- THE FOLLOWING SOFTWARE IS PROVIDED: (1) "AS IS" WITH NO WARRANTY; AND 
-(2)TO ENABLE ACCESS TO CODING INFORMATION TO GUIDE AND FACILITATE CUSTOMER.
-CONSEQUENTLY, SEMTECH SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT OR
-CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
-OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING INFORMATION
-CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Semtech corporation nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL SEMTECH S.A. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/loragw_tx_test/README.TXT b/loragw_tx_test/README.TXT
index ca02b16..435b162 100644
--- a/loragw_tx_test/README.TXT
+++ b/loragw_tx_test/README.TXT
@@ -34,27 +34,34 @@ with any later version of the library assuming the API is downward-compatible.
 3. Usage
 ---------
 
-The application runs until the specified number of packets have been send.
+The application runs until the specified number of packets have been sent.
 Press Ctrl+C to stop the application before that.
 
 Use the -f option followed by a real number (decimal point and scientific
 'E notation' are OK) to specify the modulation central frequency.
+
 Use the -s option to specify the Spreading Factor of Lora modulation (values 7
 to 12 are valid).
+
 Use the -b option to set Lora modulation bandwidth in kHz (accepted values: 125,
 250 or 500).
+
 Use the -p option to set the concentrator TX power in dBm. Not all values are
 supported by hardware (typically 14 et 20 dBm are supported, other values might
 not give expected power). Check with a RF power meter before connecting any
 sensitive equipment.
+
 Use the -t option to specify the number of milliseconds of pause between
 packets. Using zero will result in a quasi-continuous emission.
-Use the -x to specify how many packets should be sent.
+
+Use the -x option to specify how many packets should be sent.
+
+Use the -i option to invert the Lora modulation polarity.
 
 The packets are 20 bytes long, and protected by the smallest supported ECC.
 
 The payload content is:
-[T][E][S][T][packet counter MSB][packet counter MSB] followed by ASCII padding.
+[T][E][S][T][packet counter MSB][packet counter LSB] followed by ASCII padding.
 All Lora data is whitened, so the padding has no influence whatsoever on the
 packet error rate.
 
diff --git a/loragw_tx_test/src/loragw_tx_test.c b/loragw_tx_test/src/loragw_tx_test.c
index d1c5403..09e2a45 100644
--- a/loragw_tx_test/src/loragw_tx_test.c
+++ b/loragw_tx_test/src/loragw_tx_test.c
@@ -8,6 +8,9 @@
 
 Description:
 	Send a bunch of packets on a settable frequency
+
+License: Revised BSD License, see LICENSE.TXT file include in the project
+Maintainer: Sylvain Miermont
 */