diff --git a/drivers/include/sx126x.h b/drivers/include/sx126x.h index c65706c3d95d..21a148a1dbe7 100644 --- a/drivers/include/sx126x.h +++ b/drivers/include/sx126x.h @@ -22,7 +22,7 @@ #include -#include "sx126x_driver.h" +#include_next "sx126x.h" #include "net/netdev.h" diff --git a/drivers/sx126x/include/sx126x_params.h b/drivers/sx126x/include/sx126x_params.h index fcfc283b4467..08e5f80de293 100644 --- a/drivers/sx126x/include/sx126x_params.h +++ b/drivers/sx126x/include/sx126x_params.h @@ -20,7 +20,6 @@ #include "board.h" #include "sx126x.h" -#include "sx126x_driver.h" #if defined(MODULE_SHIELD_LLCC68) || defined(MODULE_SHIELD_SX1262) # include "arduino_iomap.h" diff --git a/drivers/sx126x/sx126x.c b/drivers/sx126x/sx126x.c index 0898708862b9..41a232136336 100644 --- a/drivers/sx126x/sx126x.c +++ b/drivers/sx126x/sx126x.c @@ -25,7 +25,6 @@ #include "net/lora.h" #include "periph/spi.h" -#include "sx126x_driver.h" #include "sx126x.h" #include "sx126x_params.h" #include "sx126x_internal.h" diff --git a/pkg/driver_sx126x/Makefile b/pkg/driver_sx126x/Makefile index 4f18518f0c48..b3792392acc5 100644 --- a/pkg/driver_sx126x/Makefile +++ b/pkg/driver_sx126x/Makefile @@ -1,8 +1,11 @@ PKG_NAME=driver_sx126x PKG_URL=https://github.com/Lora-net/sx126x_driver -PKG_VERSION=ba61312213450ae94a4293d75285c1d8f30c04b3 +# v2.3.2 +PKG_VERSION=9636dc4660ada4eeddf91eb7b3f7f241000bf202 PKG_LICENSE=BSD +CFLAGS += -Wno-unused-parameter + include $(RIOTBASE)/pkg/pkg.mk all: diff --git a/pkg/driver_sx126x/patches/0001-adapt-to-RIOT.patch b/pkg/driver_sx126x/patches/0001-adapt-to-RIOT.patch deleted file mode 100644 index ae478f0b8bfa..000000000000 --- a/pkg/driver_sx126x/patches/0001-adapt-to-RIOT.patch +++ /dev/null @@ -1,62 +0,0 @@ -From c68e8e74d3de1235c4d818d96573e33e42cbcb74 Mon Sep 17 00:00:00 2001 -From: Alexandre Abadie -Date: Thu, 11 Mar 2021 17:06:43 +0100 -Subject: [PATCH 1/1] adapt to RIOT - ---- - src/sx126x.c | 4 ++-- - src/{sx126x.h => sx126x_driver.h} | 6 +++--- - src/{sx126x_regs.h => sx126x_driver_regs.h} | 0 - 3 files changed, 5 insertions(+), 5 deletions(-) - rename src/{sx126x.h => sx126x_driver.h} (99%) - rename src/{sx126x_regs.h => sx126x_driver_regs.h} (100%) - -diff --git a/src/sx126x.c b/src/sx126x.c -index a61c3ce..2fa7d88 100644 ---- a/src/sx126x.c -+++ b/src/sx126x.c -@@ -35,9 +35,9 @@ - */ - - #include // memcpy --#include "sx126x.h" -+#include "sx126x_driver.h" - #include "sx126x_hal.h" --#include "sx126x_regs.h" -+#include "sx126x_driver_regs.h" - - /* - * ----------------------------------------------------------------------------- -diff --git a/src/sx126x.h b/src/sx126x_driver.h -similarity index 99% -rename from src/sx126x.h -rename to src/sx126x_driver.h -index 634ed82..e5ed101 100644 ---- a/src/sx126x.h -+++ b/src/sx126x_driver.h -@@ -29,8 +29,8 @@ - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#ifndef SX126X_H --#define SX126X_H -+#ifndef SX126X_DRIVER_H -+#define SX126X_DRIVER_H - - #ifdef __cplusplus - extern "C" { -@@ -1517,6 +1517,6 @@ sx126x_status_t sx126x_set_trimming_capacitor_values( const void* context, const - } - #endif - --#endif // SX126X_H -+#endif // SX126X_DRIVER_H - - /* --- EOF ------------------------------------------------------------------ */ -diff --git a/src/sx126x_regs.h b/src/sx126x_driver_regs.h -similarity index 100% -rename from src/sx126x_regs.h -rename to src/sx126x_driver_regs.h --- -2.27.0 -