diff --git a/.cproject b/.cproject index 062384e..60fe2c4 100755 --- a/.cproject +++ b/.cproject @@ -44,6 +44,8 @@ + + @@ -80,65 +82,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - @@ -150,20 +115,14 @@ + + - - - - - - - - - + diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fdc0c6..c380a0a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ set(CMAKE_CXX_STANDARD 11) add_definitions(-DSTM32L073xx) set(SOURCE_FILES + Src/system_stm32l0xx.c Drivers/CMSIS/Device/ST/STM32L0xx/Include/stm32l073xx.h Drivers/CMSIS/Device/ST/STM32L0xx/Include/stm32l0xx.h Drivers/CMSIS/Device/ST/STM32L0xx/Include/system_stm32l0xx.h diff --git a/Drivers/BSP/Components/sx1272/sx1272.c b/Drivers/BSP/Components/sx1272/sx1272.c index 2c17f97..59d29dc 100755 --- a/Drivers/BSP/Components/sx1272/sx1272.c +++ b/Drivers/BSP/Components/sx1272/sx1272.c @@ -48,9 +48,9 @@ Maintainer: Miguel Luis and Gregory Cristian ****************************************************************************** */ +#include "sx1272.h" #include "hw.h" #include "radio.h" -#include "sx1272.h" #include "timeServer.h" #include "delay.h" diff --git a/Drivers/BSP/Components/sx1272/sx1272.h b/Drivers/BSP/Components/sx1272/sx1272.h index e2525bf..b20d5cc 100755 --- a/Drivers/BSP/Components/sx1272/sx1272.h +++ b/Drivers/BSP/Components/sx1272/sx1272.h @@ -51,6 +51,8 @@ Maintainer: Miguel Luis and Gregory Cristian #ifndef __SX1272_H__ #define __SX1272_H__ +#include "hw.h" +#include "radio.h" #include "sx1272Regs-Fsk.h" #include "sx1272Regs-LoRa.h" diff --git a/Drivers/BSP/sx1272mb2das/sx1272mb2das.c b/Drivers/BSP/sx1272mb2das/sx1272mb2das.c index 0d30618..487d4f8 100755 --- a/Drivers/BSP/sx1272mb2das/sx1272mb2das.c +++ b/Drivers/BSP/sx1272mb2das/sx1272mb2das.c @@ -50,8 +50,8 @@ Maintainer: Miguel Luis and Gregory Cristian /* Includes ------------------------------------------------------------------*/ #include "hw.h" -#include "radio.h" #include "sx1272.h" +#include "radio.h" #include "sx1272mb2das.h" diff --git a/Src/main.c b/Src/main.c index 4e811e8..6921724 100755 --- a/Src/main.c +++ b/Src/main.c @@ -68,15 +68,6 @@ Maintainer: Miguel Luis, Gregory Cristian and Wael Guibene /* Private typedef -----------------------------------------------------------*/ /* Private define ------------------------------------------------------------*/ -/*! - * CAYENNE_LPP is myDevices Application server. - */ -//#define CAYENNE_LPP -#define LPP_DATATYPE_DIGITAL_INPUT 0x0 -#define LPP_DATATYPE_DIGITAL_OUTPUT 0x1 -#define LPP_DATATYPE_HUMIDITY 0x68 -#define LPP_DATATYPE_TEMPERATURE 0x67 -#define LPP_DATATYPE_BAROMETER 0x73 #define LPP_APP_PORT 99