Skip to content

Commit ef01a45

Browse files
committed
v3.1.0
- Removed GPIO module from HAL, that was specific to IoT Starter Kit platform. GPIO configuration will be done from application script instead. - Removed CFG_BRD configuration from library.cfg, not needed anymore.
1 parent 519d088 commit ef01a45

File tree

12 files changed

+209
-528
lines changed

12 files changed

+209
-528
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.2
1+
3.1.0

libloragw/Makefile

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@ else
2424
$(error No SPI physical layer selected, check ../target.cfg file.)
2525
endif
2626

27-
ifeq ($(CFG_BRD),iot_sk_1301_868)
28-
CFG_BRD_MSG := SX1301 IoT Starter Kit board with SX1257 radios, 868 MHz filters
29-
CFG_BRD_OPT := CFG_BRD_1301IOTSK868
30-
else
31-
$(info [Info] No specific board selected.)
32-
CFG_BRD_MSG := None
33-
CFG_BRD_OPT := CFG_BRD_NONE
34-
endif
35-
3627
### linking options
3728

3829
ifeq ($(CFG_SPI),native)
@@ -65,9 +56,6 @@ inc/config.h: ../VERSION library.cfg
6556
# SPI interface
6657
@echo "SPI interface : $(CFG_SPI_MSG)"
6758
@echo " #define $(CFG_SPI_OPT) 1" >> $@
68-
# Board misc. parameters
69-
@echo "Board misc. param : $(CFG_BRD_MSG)"
70-
@echo " #define $(CFG_BRD_OPT) 1" >> $@
7159
# Debug options
7260
@echo " #define DEBUG_AUX $(DEBUG_AUX)" >> $@
7361
@echo " #define DEBUG_SPI $(DEBUG_SPI)" >> $@
@@ -87,8 +75,6 @@ obj/loragw_aux.o: src/loragw_aux.c inc/loragw_aux.h inc/config.h
8775
ifeq ($(CFG_SPI),native)
8876
obj/loragw_spi.o: src/loragw_spi.native.c inc/loragw_spi.h inc/config.h
8977
$(CC) -c $(CFLAGS) $< -o $@
90-
obj/loragw_gpio.o: src/loragw_gpio.native.c inc/loragw_gpio.h inc/config.h
91-
$(CC) -c $(CFLAGS) $< -o $@
9278
else ifeq ($(CFG_SPI),ftdi)
9379
obj/loragw_spi.o: src/loragw_spi.ftdi.c inc/loragw_spi.h inc/config.h
9480
$(CC) -c $(CFLAGS) $< -o $@
@@ -106,7 +92,7 @@ obj/loragw_gps.o: src/loragw_gps.c inc/loragw_gps.h inc/config.h
10692
### static library
10793

10894
ifeq ($(CFG_SPI),native)
109-
libloragw.a: obj/loragw_hal.o obj/loragw_gps.o obj/loragw_reg.o obj/loragw_spi.o obj/loragw_aux.o obj/loragw_gpio.o
95+
libloragw.a: obj/loragw_hal.o obj/loragw_gps.o obj/loragw_reg.o obj/loragw_spi.o obj/loragw_aux.o
11096
else ifeq ($(CFG_SPI),ftdi)
11197
libloragw.a: obj/loragw_hal.o obj/loragw_gps.o obj/loragw_reg.o obj/loragw_spi.o obj/loragw_aux.o
11298
endif

libloragw/inc/loragw_gpio.h

Lines changed: 0 additions & 81 deletions
This file was deleted.

libloragw/inc/loragw_hal.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,6 @@ Maintainer: Sylvain Miermont
7575
IF_LORA_STD, \
7676
IF_FSK_STD } /* configuration of available IF chains and modems on the hardware */
7777

78-
/* board-specific parameters */
79-
#if (CFG_BRD_1301IOTSK868 == 1)
80-
#if (CFG_SPI_NATIVE == 1)
81-
#define LGW_SX1301_RESET_PIN 7 /* reset pin for SX1301 (GPIO7 <-> pin 26 on RPi connector) */
82-
#else
83-
/* NOT SUPPORTED */
84-
#endif
85-
#endif
86-
8778
/* values available for the 'modulation' parameters */
8879
/* NOTE: arbitrary values */
8980
#define MOD_UNDEFINED 0

libloragw/library.cfg

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@
99

1010
CFG_SPI= native
1111

12-
### Board misc parameters ###
13-
# Used to configure misc board options.
14-
# iot_sk_1301_868 IoT SX1301 Starter Kit, with 868 MHz filter
15-
# Keep empty for no calibration parameters (neutral values will be used).
16-
17-
CFG_BRD= iot_sk_1301_868
18-
1912
### Debug options ###
2013
# Set the DEBUG_* to 1 to activate debug mode in individual modules.
2114
# Warning: that makes the module *very verbose*, do not use for production
@@ -25,4 +18,3 @@ DEBUG_SPI= 0
2518
DEBUG_REG= 0
2619
DEBUG_HAL= 0
2720
DEBUG_GPS= 0
28-
DEBUG_GPIO= 0

libloragw/readme.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ steps, typically to allow for supply voltages or clocks to stabilize after been
123123
switched on.
124124

125125
An accuracy of 1 ms or less is ideal.
126-
If your system doesn't allow that level of accuracy, make sure that the actual
126+
If your system does not allow that level of accuracy, make sure that the actual
127127
delay is *longer* that the time specified when the function is called (ie.
128128
wait_ms(X) **MUST NOT** before X milliseconds under any circumstance).
129129

@@ -186,8 +186,6 @@ The other settings available in library.cfg are:
186186
which is to be opened on your host is the same as the one defined in
187187
libloragw/src/loragw_spi.native.c
188188

189-
* CFG_BRD configures board misc parameters.
190-
191189
### 3.3. Building procedures ###
192190

193191
For cross-compilation set the CROSS_COMPILE variable in the Makefile with the

libloragw/src/loragw_gpio.native.c

Lines changed: 0 additions & 167 deletions
This file was deleted.

libloragw/src/loragw_hal.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,8 @@ const uint32_t rf_rx_bandwidth[LGW_RF_CHAIN_NB] = LGW_RF_RX_BANDWIDTH;
124124
#define CFG_SPI_STR "spi?"
125125
#endif
126126

127-
#if (CFG_BRD_1301IOTSK868 == 1)
128-
#define CFG_BRD_STR "iot_sk_1301_868"
129-
/* === ADD CUSTOMIZATION FOR YOUR OWN BOARD HERE ===
130-
#elif (CFG_BRD_MYBOARD == 1)
131-
*/
132-
#elif (CFG_BRD_NONE == 1)
133-
#define CFG_BRD_STR "no_brd"
134-
#else
135-
#define CFG_BRD_STR "brd?"
136-
#endif
137-
138127
/* Version string, used to identify the library version/options once compiled */
139-
const char lgw_version_string[] = "Version: " LIBLORAGW_VERSION "; Options: " CFG_SPI_STR " " CFG_BRD_STR ";";
128+
const char lgw_version_string[] = "Version: " LIBLORAGW_VERSION "; Options: " CFG_SPI_STR ";";
140129

141130
/* -------------------------------------------------------------------------- */
142131
/* --- PRIVATE VARIABLES ---------------------------------------------------- */

0 commit comments

Comments
 (0)