Merge branch 'master' into develop

Author: mluis1

src/apps/LoRaMac/common/CayenneLpp.c

@@ -90,7 +90,7 @@ uint8_t CayenneLppAddAnalogInput( uint8_t channel, float value )
         return 0;
     }
 
-    int16_t val = value * 100;
+    int16_t val = ( int16_t ) ( value * 100 );
     CayenneLppBuffer[CayenneLppCursor++] = channel; 
     CayenneLppBuffer[CayenneLppCursor++] = LPP_ANALOG_INPUT; 
     CayenneLppBuffer[CayenneLppCursor++] = val >> 8; 
@@ -105,7 +105,7 @@ uint8_t CayenneLppAddAnalogOutput( uint8_t channel, float value )
     {
         return 0;
     }
-    int16_t val = value * 100;
+    int16_t val = ( int16_t ) ( value * 100 );
     CayenneLppBuffer[CayenneLppCursor++] = channel; 
     CayenneLppBuffer[CayenneLppCursor++] = LPP_ANALOG_OUTPUT;
     CayenneLppBuffer[CayenneLppCursor++] = val >> 8; 
@@ -148,7 +148,7 @@ uint8_t CayenneLppAddTemperature( uint8_t channel, float celsius )
     {
         return 0;
     }
-    int16_t val = celsius * 10;
+    int16_t val = ( int16_t) ( celsius * 10 );
     CayenneLppBuffer[CayenneLppCursor++] = channel; 
     CayenneLppBuffer[CayenneLppCursor++] = LPP_TEMPERATURE; 
     CayenneLppBuffer[CayenneLppCursor++] = val >> 8; 
@@ -165,7 +165,7 @@ uint8_t CayenneLppAddRelativeHumidity( uint8_t channel, float rh )
     }
     CayenneLppBuffer[CayenneLppCursor++] = channel; 
     CayenneLppBuffer[CayenneLppCursor++] = LPP_RELATIVE_HUMIDITY; 
-    CayenneLppBuffer[CayenneLppCursor++] = rh * 2; 
+    CayenneLppBuffer[CayenneLppCursor++] = (uint8_t ) ( rh * 2 ); 
 
     return CayenneLppCursor;
 }
@@ -176,9 +176,9 @@ uint8_t CayenneLppAddAccelerometer( uint8_t channel, float x, float y, float z )
     {
         return 0;
     }
-    int16_t vx = x * 1000;
-    int16_t vy = y * 1000;
-    int16_t vz = z * 1000;
+    int16_t vx = ( int16_t ) ( x * 1000 );
+    int16_t vy = ( int16_t ) ( y * 1000 );
+    int16_t vz = ( int16_t ) ( z * 1000 );
 
     CayenneLppBuffer[CayenneLppCursor++] = channel; 
     CayenneLppBuffer[CayenneLppCursor++] = LPP_ACCELEROMETER; 
@@ -198,7 +198,7 @@ uint8_t CayenneLppAddBarometricPressure( uint8_t channel, float hpa )
     {
         return 0;
     }
-    int16_t val = hpa * 10;
+    int16_t val = ( int16_t ) ( hpa * 10 );
 
     CayenneLppBuffer[CayenneLppCursor++] = channel; 
     CayenneLppBuffer[CayenneLppCursor++] = LPP_BAROMETRIC_PRESSURE; 
@@ -214,9 +214,9 @@ uint8_t CayenneLppAddGyrometer( uint8_t channel, float x, float y, float z )
     {
         return 0;
     }
-    int16_t vx = x * 100;
-    int16_t vy = y * 100;
-    int16_t vz = z * 100;
+    int16_t vx = ( int16_t ) ( x * 100 );
+    int16_t vy = ( int16_t ) ( y * 100 );
+    int16_t vz = ( int16_t ) ( z * 100 );
 
     CayenneLppBuffer[CayenneLppCursor++] = channel; 
     CayenneLppBuffer[CayenneLppCursor++] = LPP_GYROMETER; 
@@ -236,9 +236,9 @@ uint8_t CayenneLppAddGps( uint8_t channel, float latitude, float longitude, floa
     {
         return 0;
     }
-    int32_t lat = latitude * 10000;
-    int32_t lon = longitude * 10000;
-    int32_t alt = meters * 100;
+    int32_t lat = ( int32_t ) ( latitude * 10000 );
+    int32_t lon = ( int32_t ) ( longitude * 10000 );
+    int32_t alt = ( int32_t ) ( meters * 100 );
 
     CayenneLppBuffer[CayenneLppCursor++] = channel; 
     CayenneLppBuffer[CayenneLppCursor++] = LPP_GPS; 

src/apps/LoRaMac/common/LmHandler/LmHandler.c

@@ -950,23 +950,23 @@ static void LmHandlerPackagesNotify( PackageNotifyTypes_t notifyType, void *para
                 {
                     if( LmHandlerPackages[i]->OnMcpsConfirmProcess != NULL )
                     {
-                        LmHandlerPackages[i]->OnMcpsConfirmProcess( params );
+                        LmHandlerPackages[i]->OnMcpsConfirmProcess( ( McpsConfirm_t* ) params );
                     }
                     break;
                 }
                 case PACKAGE_MCPS_INDICATION:
                 {
                     if( LmHandlerPackages[i]->OnMcpsIndicationProcess != NULL )
                     {
-                        LmHandlerPackages[i]->OnMcpsIndicationProcess( params );
+                        LmHandlerPackages[i]->OnMcpsIndicationProcess( ( McpsIndication_t* )params );
                     }
                     break;
                 }
                 case PACKAGE_MLME_CONFIRM:
                 {
                     if( LmHandlerPackages[i]->OnMlmeConfirmProcess != NULL )
                     {
-                        LmHandlerPackages[i]->OnMlmeConfirmProcess( params );
+                        LmHandlerPackages[i]->OnMlmeConfirmProcess( ( MlmeConfirm_t* )params );
                     }
                     break;
                 }

src/boards/B-L072Z-LRWAN1/CMakeLists.txt

@@ -33,8 +33,8 @@ list(APPEND ${PROJECT_NAME}_SOURCES
     "${CMAKE_CURRENT_SOURCE_DIR}/rtc-board.c"
     "${CMAKE_CURRENT_SOURCE_DIR}/spi-board.c"
     "${CMAKE_CURRENT_SOURCE_DIR}/sx1276-board.c"
+    "${CMAKE_CURRENT_SOURCE_DIR}/sysIrqHandlers.c"
     "${CMAKE_CURRENT_SOURCE_DIR}/uart-board.c"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../mcu/stm32/sysIrqHandlers.c"
     "${CMAKE_CURRENT_SOURCE_DIR}/../mcu/utilities.c"
     "${CMAKE_CURRENT_SOURCE_DIR}/cmsis/arm-gcc/startup_stm32l072xx.s"
     "${CMAKE_CURRENT_SOURCE_DIR}/cmsis/system_stm32l0xx.c"

src/boards/B-L072Z-LRWAN1/board.c

@@ -28,6 +28,7 @@
 #include "i2c.h"
 #include "uart.h"
 #include "timer.h"
+#include "sysIrqHandlers.h"
 #include "board-config.h"
 #include "lpm-board.h"
 #include "rtc-board.h"

src/boards/B-L072Z-LRWAN1/gpio-board.c

@@ -22,6 +22,7 @@
  */
 #include "stm32l0xx.h"
 #include "utilities.h"
+#include "sysIrqHandlers.h"
 #include "board-config.h"
 #include "rtc-board.h"
 #include "gpio-board.h"

src/boards/B-L072Z-LRWAN1/rtc-board.c

@@ -31,6 +31,7 @@
 #include "timer.h"
 #include "systime.h"
 #include "gpio.h"
+#include "sysIrqHandlers.h"
 #include "lpm-board.h"
 #include "rtc-board.h"
 
@@ -464,7 +465,7 @@ void RtcSetMcuWakeUpTime( void )
         hit = RtcAlarm.AlarmTime.Seconds +
               60 * ( RtcAlarm.AlarmTime.Minutes +
               60 * ( RtcAlarm.AlarmTime.Hours +
-              24 * ( RtcAlarm.AlarmDateWeekDay ) ) );
+              24 * ( RtcAlarm.AlarmDateWeekDay - 1 ) ) );
         hit = ( hit << N_PREDIV_S ) + ( PREDIV_S - RtcAlarm.AlarmTime.SubSeconds );
 
         mcuWakeUpTime = ( int16_t )( ( now - hit ) );