Skip to content

Commit

Permalink
v3.1.0
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
mcoracin committed Jun 29, 2015
1 parent 519d088 commit ef01a45
Show file tree
Hide file tree
Showing 12 changed files with 209 additions and 528 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.2
3.1.0
16 changes: 1 addition & 15 deletions libloragw/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,6 @@ else
$(error No SPI physical layer selected, check ../target.cfg file.)
endif

ifeq ($(CFG_BRD),iot_sk_1301_868)
CFG_BRD_MSG := SX1301 IoT Starter Kit board with SX1257 radios, 868 MHz filters
CFG_BRD_OPT := CFG_BRD_1301IOTSK868
else
$(info [Info] No specific board selected.)
CFG_BRD_MSG := None
CFG_BRD_OPT := CFG_BRD_NONE
endif

### linking options

ifeq ($(CFG_SPI),native)
Expand Down Expand Up @@ -65,9 +56,6 @@ inc/config.h: ../VERSION library.cfg
# SPI interface
@echo "SPI interface : $(CFG_SPI_MSG)"
@echo " #define $(CFG_SPI_OPT) 1" >> $@
# Board misc. parameters
@echo "Board misc. param : $(CFG_BRD_MSG)"
@echo " #define $(CFG_BRD_OPT) 1" >> $@
# Debug options
@echo " #define DEBUG_AUX $(DEBUG_AUX)" >> $@
@echo " #define DEBUG_SPI $(DEBUG_SPI)" >> $@
Expand All @@ -87,8 +75,6 @@ obj/loragw_aux.o: src/loragw_aux.c inc/loragw_aux.h inc/config.h
ifeq ($(CFG_SPI),native)
obj/loragw_spi.o: src/loragw_spi.native.c inc/loragw_spi.h inc/config.h
$(CC) -c $(CFLAGS) $< -o $@
obj/loragw_gpio.o: src/loragw_gpio.native.c inc/loragw_gpio.h inc/config.h
$(CC) -c $(CFLAGS) $< -o $@
else ifeq ($(CFG_SPI),ftdi)
obj/loragw_spi.o: src/loragw_spi.ftdi.c inc/loragw_spi.h inc/config.h
$(CC) -c $(CFLAGS) $< -o $@
Expand All @@ -106,7 +92,7 @@ obj/loragw_gps.o: src/loragw_gps.c inc/loragw_gps.h inc/config.h
### static library

ifeq ($(CFG_SPI),native)
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
libloragw.a: obj/loragw_hal.o obj/loragw_gps.o obj/loragw_reg.o obj/loragw_spi.o obj/loragw_aux.o
else ifeq ($(CFG_SPI),ftdi)
libloragw.a: obj/loragw_hal.o obj/loragw_gps.o obj/loragw_reg.o obj/loragw_spi.o obj/loragw_aux.o
endif
Expand Down
81 changes: 0 additions & 81 deletions libloragw/inc/loragw_gpio.h

This file was deleted.

9 changes: 0 additions & 9 deletions libloragw/inc/loragw_hal.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,6 @@ Maintainer: Sylvain Miermont
IF_LORA_STD, \
IF_FSK_STD } /* configuration of available IF chains and modems on the hardware */

/* board-specific parameters */
#if (CFG_BRD_1301IOTSK868 == 1)
#if (CFG_SPI_NATIVE == 1)
#define LGW_SX1301_RESET_PIN 7 /* reset pin for SX1301 (GPIO7 <-> pin 26 on RPi connector) */
#else
/* NOT SUPPORTED */
#endif
#endif

/* values available for the 'modulation' parameters */
/* NOTE: arbitrary values */
#define MOD_UNDEFINED 0
Expand Down
8 changes: 0 additions & 8 deletions libloragw/library.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@

CFG_SPI= native

### Board misc parameters ###
# Used to configure misc board options.
# iot_sk_1301_868 IoT SX1301 Starter Kit, with 868 MHz filter
# Keep empty for no calibration parameters (neutral values will be used).

CFG_BRD= iot_sk_1301_868

### Debug options ###
# Set the DEBUG_* to 1 to activate debug mode in individual modules.
# Warning: that makes the module *very verbose*, do not use for production
Expand All @@ -25,4 +18,3 @@ DEBUG_SPI= 0
DEBUG_REG= 0
DEBUG_HAL= 0
DEBUG_GPS= 0
DEBUG_GPIO= 0
4 changes: 1 addition & 3 deletions libloragw/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ steps, typically to allow for supply voltages or clocks to stabilize after been
switched on.

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

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

* CFG_BRD configures board misc parameters.

### 3.3. Building procedures ###

For cross-compilation set the CROSS_COMPILE variable in the Makefile with the
Expand Down
167 changes: 0 additions & 167 deletions libloragw/src/loragw_gpio.native.c

This file was deleted.

13 changes: 1 addition & 12 deletions libloragw/src/loragw_hal.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,8 @@ const uint32_t rf_rx_bandwidth[LGW_RF_CHAIN_NB] = LGW_RF_RX_BANDWIDTH;
#define CFG_SPI_STR "spi?"
#endif

#if (CFG_BRD_1301IOTSK868 == 1)
#define CFG_BRD_STR "iot_sk_1301_868"
/* === ADD CUSTOMIZATION FOR YOUR OWN BOARD HERE ===
#elif (CFG_BRD_MYBOARD == 1)
*/
#elif (CFG_BRD_NONE == 1)
#define CFG_BRD_STR "no_brd"
#else
#define CFG_BRD_STR "brd?"
#endif

/* Version string, used to identify the library version/options once compiled */
const char lgw_version_string[] = "Version: " LIBLORAGW_VERSION "; Options: " CFG_SPI_STR " " CFG_BRD_STR ";";
const char lgw_version_string[] = "Version: " LIBLORAGW_VERSION "; Options: " CFG_SPI_STR ";";

/* -------------------------------------------------------------------------- */
/* --- PRIVATE VARIABLES ---------------------------------------------------- */
Expand Down
Loading

0 comments on commit ef01a45

Please sign in to comment.