Include CMSIS/STM32L4xx core includes from Arduino.h

Author: GrumpyOldPizza

cores/stm32l4/Arduino.h

@@ -80,6 +80,11 @@ enum BitOrder {
 #define clockCyclesToMicroseconds(a) ( ((a) * 1000L) / (F_CPU / 1000L) )
 #define microsecondsToClockCycles(a) ( (a) * (F_CPU / 1000000L) )
 
+#define ARM_MATH_CM4
+#include "stm32l4xx.h"
+#undef DAC1
+#undef SPI1
+#undef SPI2
 #include "stm32l4_wiring.h"
 
 void yield( void ) ;

cores/stm32l4/stm32l4_wiring.h

@@ -54,7 +54,7 @@ static inline uint32_t millis(void)
     return armv7m_systick_millis();
 }
 
-static inline uint64_t micros(void) 
+static inline uint32_t micros(void) 
 {
     return armv7m_systick_micros();
 }

cores/stm32l4/stm32l4_wiring_private.h

@@ -35,8 +35,6 @@
 extern "C" {
 #endif
 
-#include "stm32l4xx.h"
-
 #include "stm32l4_adc.h"
 #include "stm32l4_dac.h"
 #include "stm32l4_exti.h"