Removed warnings due yo duplicate defines.

Ebiroll · May 21, 2019 · 750a806 · 750a806
1 parent c8a22f2
commit 750a806
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 1 deletion.
diff --git a/src/RAK811BreakBoard/BME680-selftest.c b/src/RAK811BreakBoard/BME680-selftest.c
@@ -138,7 +138,7 @@ int8_t bme680_self_test(struct bme680_dev *dev)
 
 					rslt = bme680_get_sensor_data(&data[i], &t_dev);
 
-					e_printf("##SELF-TEST T: %.2f degC, P: %.2f hPa, H %.2f %%rH ", data[i].temperature / 100.0f,
+					printf("##SELF-TEST T: %.2f degC, P: %.2f hPa, H %.2f %%rH ", data[i].temperature / 100.0f,
                                 data[i].pressure / 100.0f, data[i].humidity / 1000.0f );
 				}
 			}

diff --git a/src/RAK811BreakBoard/cmsis/stm32l151xb.h → src/RAK811BreakBoard/cmsis/stm32l151xb.sav b/src/RAK811BreakBoard/cmsis/stm32l151xb.h → src/RAK811BreakBoard/cmsis/stm32l151xb.sav
diff --git a/src/RAK811BreakBoard/cmsis/stm32l1xx.h → src/RAK811BreakBoard/cmsis/stm32l1xx.sav b/src/RAK811BreakBoard/cmsis/stm32l1xx.h → src/RAK811BreakBoard/cmsis/stm32l1xx.sav
diff --git a/src/RAK811BreakBoard/cmsis/mxconstants.h → ...32/STM32L1xx_HAL_Driver/Inc/mxconstants.h b/src/RAK811BreakBoard/cmsis/mxconstants.h → ...32/STM32L1xx_HAL_Driver/Inc/mxconstants.h
diff --git a/...K811BreakBoard/cmsis/stm32l1xx_hal_conf.h → ...2L1xx_HAL_Driver/Inc/stm32l1xx_hal_conf.h b/...K811BreakBoard/cmsis/stm32l1xx_hal_conf.h → ...2L1xx_HAL_Driver/Inc/stm32l1xx_hal_conf.h
diff --git a/src/boards/mcu/stm32/STM32L1xx_HAL_Driver/Inc/stm32l1xx_ll_utils.h b/src/boards/mcu/stm32/STM32L1xx_HAL_Driver/Inc/stm32l1xx_ll_utils.h
@@ -77,6 +77,15 @@ extern "C" {
 /* Max delay can be used in LL_mDelay */
 #define LL_MAX_DELAY                  (uint32_t)0xFFFFFFFFU
 
+// Previously in stm32l151xb
+#ifndef UID_BASE
+#define UID_BASE              ((uint32_t)0x1FF80050U)        /*!< Unique device ID register base address for Cat.1 and Cat.2 devices */
+#endif
+
+#ifndef FLASHSIZE_BASE
+#define FLASHSIZE_BASE        ((uint32_t)0x1FF8004CU)        /*!< FLASH Size register base address for Cat.1 and Cat.2 devices */
+#endif
+
 /**
  * @brief Unique device ID register base address
  */

diff --git a/src/boards/mcu/stm32/STM32L1xx_HAL_Driver/Src/stm32l1xx_ll_utils.c b/src/boards/mcu/stm32/STM32L1xx_HAL_Driver/Src/stm32l1xx_ll_utils.c
@@ -35,16 +35,24 @@
   ******************************************************************************
   */
 /* Includes ------------------------------------------------------------------*/
+#include "stm32l151xb.h"
 #include "stm32l1xx_ll_rcc.h"
 #include "stm32l1xx_ll_utils.h"
 #include "stm32l1xx_ll_system.h"
+#include "system_stm32l1xx.h"
 #include "stm32l1xx_ll_pwr.h"
 #ifdef  USE_FULL_ASSERT
 #include "stm32_assert.h"
 #else
 #define assert_param(expr) ((void)0U)
 #endif
 
+
+extern const uint8_t AHBPrescTable[16];   /*!< AHB prescalers table values */
+extern const uint8_t APBPrescTable[8];    /*!< APB prescalers table values */
+extern const uint8_t PLLMulTable[9];      /*!< PLL multipiers table values */
+
+
 /** @addtogroup STM32L1xx_LL_Driver
   * @{
   */