pipxtreme: Updated chconf.h and mcuconf.h, resolve variable conflict …

…between cmsis_system.c and HAL.
d-ronin · Jan 6, 2018 · 0e87474 · 0e87474
1 parent 09287ff
commit 0e87474
Show file tree

Hide file tree

Showing 3 changed files with 229 additions and 223 deletions.
diff --git a/flight/targets/pipxtreme/board-info/cmsis_system.c b/flight/targets/pipxtreme/board-info/cmsis_system.c
@@ -67,6 +67,7 @@
   */
 
 #include "stm32f10x.h"
+#include "pios_config.h"
 
 /**
   * @}
@@ -152,6 +153,10 @@
 /*******************************************************************************
 *  Clock Definitions
 *******************************************************************************/
+#if defined(PIOS_INCLUDE_CHIBIOS)
+  /* ChibiOS supplies and inits this via HAL. */
+  extern uint32_t SystemCoreClock;
+#else
 #ifdef SYSCLK_FREQ_HSE
   uint32_t SystemCoreClock         = SYSCLK_FREQ_HSE;        /*!< System Clock Frequency (Core Clock) */
 #elif defined SYSCLK_FREQ_24MHz
@@ -167,6 +172,7 @@
 #else /*!< HSI Selected as System Clock source */
   uint32_t SystemCoreClock         = HSI_VALUE;        /*!< System Clock Frequency (Core Clock) */
 #endif
+#endif // defined(PIOS_INCLUDE_CHIBIOS)
 
 __I uint8_t AHBPrescTable[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9};
 /**