Arduino Zero sync, add new HCLK/APB1/APB2 clock scheme

Author: GrumpyOldPizza

boards.txt

@@ -29,8 +29,8 @@ dragonfly.build.core=stm32l4
 dragonfly.build.extra_flags=-DSTM32L476xx  -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant
 dragonfly.build.ldscript=linker_scripts/flash.ld
 dragonfly.build.variant=dragonfly
-dragonfly.build.variant_system_lib=stm32l4_dragonfly
-dragonfly.build.variant_system_include="-I{runtime.platform.path}/system/libstm32l4_dragonfly/CMSIS/Include" "-I{runtime.platform.path}/system/libstm32l4_dragonfly/CMSIS/Device/ST/STM32L4xx/Include" "-I{runtime.platform.path}/system/libstm32l4_dragonfly/USB/HAL/Inc" "-I{runtime.platform.path}/system/libstm32l4_dragonfly/USB/Core/Inc" "-I{runtime.platform.path}/system/libstm32l4_dragonfly/USB/Class/CDC/Inc" "-I{runtime.platform.path}/system/libstm32l4_dragonfly/USB/Class/MSC/Inc" "-I{runtime.platform.path}/system/libstm32l4_dragonfly/USB" "-I{runtime.platform.path}/system/libstm32l4_dragonfly" 
+dragonfly.build.variant_system_libs="-L{runtime.platform.path}/system/libstm32l4" "-L{runtime.platform.path}/system/libstm32l4/CMSIS/Lib" -lstm32l4 -larm_cortexM4lf_math
+dragonfly.build.variant_system_include="-I{runtime.platform.path}/system/libstm32l4/CMSIS/Include" "-I{runtime.platform.path}/system/libstm32l4/CMSIS/Device/ST/STM32L4xx/Include" "-I{runtime.platform.path}/system/libstm32l4/USB/HAL/Inc" "-I{runtime.platform.path}/system/libstm32l4/USB/Core/Inc" "-I{runtime.platform.path}/system/libstm32l4/USB/Class/CDC/Inc" "-I{runtime.platform.path}/system/libstm32l4/USB/Class/MSC/Inc" "-I{runtime.platform.path}/system/libstm32l4/USB" "-I{runtime.platform.path}/system/libstm32l4" 
 dragonfly.build.vid=0x1209
 dragonfly.build.pid=0x6667
 
@@ -48,3 +48,11 @@ dragonfly.menu.CpuFrequency.24=24 MHz
 dragonfly.menu.CpuFrequency.24.build.f_cpu=24000000L
 dragonfly.menu.CpuFrequency.16=16 MHz
 dragonfly.menu.CpuFrequency.16.build.f_cpu=16000000L
+dragonfly.menu.CpuFrequency.8=8 MHz
+dragonfly.menu.CpuFrequency.8.build.f_cpu=8000000L
+dragonfly.menu.CpuFrequency.4=4 MHz
+dragonfly.menu.CpuFrequency.4.build.f_cpu=4000000L
+dragonfly.menu.CpuFrequency.2=2 MHz
+dragonfly.menu.CpuFrequency.2.build.f_cpu=2000000L
+dragonfly.menu.CpuFrequency.1=1 MHz
+dragonfly.menu.CpuFrequency.1.build.f_cpu=1000000L

cores/stm32l4/Arduino.h

@@ -35,9 +35,10 @@ typedef uint16_t word;
 //
 #include "avr/pgmspace.h"
 #include "avr/interrupt.h"
+#include "avr/io.h"
 
 #include "binary.h"
-#include "stdlib_noniso.h"
+#include "itoa.h"
 
 #ifdef __cplusplus
 extern "C"{
@@ -49,6 +50,8 @@ extern "C"{
 #undef SPI1
 #undef SPI2
 
+#define F_CPU SystemCoreClock
+
 #include "wiring_constants.h"
 
 #define clockCyclesPerMicrosecond() ( SystemCoreClock / 1000000L )
@@ -77,7 +80,9 @@ void loop( void ) ;
   #include "STM32.h"
 #endif
 #ifdef __cplusplus
+#if defined(STM32L4_CONFIG_USBD_CDC)
   #include "CDC.h"
+#endif /* STM32L4_CONFIG_USBD_CDC */
   #include "Uart.h"
 #endif
 
@@ -87,9 +92,9 @@ void loop( void ) ;
 #include "wiring.h"
 #include "wiring_analog.h"
 #include "wiring_digital.h"
+#include "wiring_interrupts.h"
 #include "wiring_pulse.h"
 #include "wiring_shift.h"
-#include "WInterrupts.h"
 
 // undefine stdlib's abs if encountered
 #ifdef abs

cores/stm32l4/CDC.cpp

@@ -26,10 +26,12 @@
  * WITH THE SOFTWARE.
  */
 
-#include "CDC.h"
 #include "Arduino.h"
+#include "CDC.h"
 #include "wiring_private.h"
 
+#if defined(STM32L4_CONFIG_USBD_CDC)
+
 /* STM32L4x5/STM32L4x6 have USB_OTG_FS with a multi-packet FIFO. However 
  * to avoid sending ZLP packets, the CDC_TX_PACKET_SIZE is one byte
  * less than the maximum FIFO size in terms of 64 byte packets.
@@ -494,3 +496,6 @@ extern void serialEvent() __attribute__((weak));
 bool SerialUSB_empty() { return !SerialUSB.available(); }
 
 CDC SerialUSB(&stm32l4_usbd_cdc, (serialEvent != NULL));
+
+#endif /* STM32L4_CONFIG_USBD_CDC */
+

cores/stm32l4/Makefile

@@ -11,37 +11,38 @@ ASFLAGS  = -c -g -x assembler-with-cpp $(EXTRAS) $(DEFINES) $(INCLUDES)
 LDFLAGS  = -L../../variants/dragonfly -Os -Wl,--gc-sections -save-temps $(EXTRAS) -T../../variants/dragonfly/linker_scripts/flash.ld --specs=nano.specs -mcpu=cortex-m4 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
 WARNINGS = -Wall -Wextra -Wno-unused-parameter
 EXTRAS   = -DSTM32L476xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mabi=aapcs -mslow-flash-data
-DEFINES  = -DF_CPU=80000000L -DARDUINO=10606 -D_ARDUINO_STM32L4_DRAGONFLY -DARDUINO_ARCH_STM32L4
+DEFINES  = -D_SYSTEM_CORE_CLOCK_=80000000L -DARDUINO=10606 -D_ARDUINO_STM32L4_DRAGONFLY -DARDUINO_ARCH_STM32L4
 INCLUDES = -I../../system/libstm32l4_dragonfly/CMSIS/Include -I../../system/libstm32l4_dragonfly/CMSIS/Device/ST/STM32L4xx/Include -I../../system/libstm32l4_dragonfly/USB/HAL/Inc -I../../system/libstm32l4_dragonfly/USB/Core/Inc -I../../system/libstm32l4_dragonfly/USB/Class/CDC/Inc -I../../system/libstm32l4_dragonfly/USB/Class/MSC/Inc -I../../system/libstm32l4_dragonfly/USB -I../../system/libstm32l4_dragonfly/ -I../../variants/dragonfly -I../../libraries/SPI/ -I../../libraries/Wire/ -I../../libraries/Servo/src/ -I. 
 
 SRCS = \
 	../../libraries/Servo/src/Servo.cpp \
 	../../libraries/SPI/SPI.cpp \
 	../../libraries/Wire/Wire.cpp \
 	../../variants/dragonfly/variant.cpp \
+	avr/dtostrf.c \
 	avr/eeprom.c \
+	avr/fdevopen.c \
 	CDC.cpp \
 	FS.cpp \
 	HardwareSerial.cpp \
 	IPAddress.cpp \
 	Print.cpp \
-	Reset.cpp \
 	RingBuffer.cpp \
 	STM32.cpp \
 	Stream.cpp \
 	Tone.cpp \
 	Uart.cpp \
-	WInterrupts.c \
 	WMath.cpp \
 	WString.cpp \
 	abi.cpp \
 	hooks.c \
+	itoa.c \
 	main.cpp \
 	new.cpp \
-	stdlib_noniso.c \
 	wiring.c \
 	wiring_analog.c \
 	wiring_digital.c \
+	wiring_interrupts.c \
 	wiring_pulse.c \
 	wiring_shift.c
 
@@ -50,29 +51,30 @@ OBJS = \
 	../../libraries/SPI/SPI.o \
 	../../libraries/Wire/Wire.o \
 	../../variants/dragonfly/variant.o \
+	avr/dtostrf.o \
 	avr/eeprom.o \
+	avr/fdevopen.o \
 	CDC.o \
 	FS.o \
 	HardwareSerial.o \
 	IPAddress.o \
 	Print.o \
-	Reset.o \
 	RingBuffer.o \
 	STM32.o \
 	Stream.o \
 	Tone.o \
 	Uart.o \
-	WInterrupts.o \
 	WMath.o \
 	WString.o \
 	abi.o \
 	hooks.o \
+	itoa.o \
 	main.o \
 	new.o \
-	stdlib_noniso.o \
 	wiring.o \
 	wiring_analog.o \
 	wiring_digital.o \
+	wiring_interrupts.o \
 	wiring_pulse.o \
 	wiring_shift.o
 

cores/stm32l4/Print.cpp

@@ -245,7 +245,7 @@ size_t Print::printFloat(double number, uint8_t digits)
   while (digits-- > 0)
   {
     remainder *= 10.0;
-    int toPrint = int(remainder);
+    unsigned int toPrint = (unsigned int)remainder;
     n += print(toPrint);
     remainder -= toPrint;
   }

cores/stm32l4/RingBuffer.h

@@ -31,8 +31,8 @@ class RingBuffer
 {
   public:
     uint8_t _aucBuffer[SERIAL_BUFFER_SIZE] ;
-    volatile uint16_t _iHead ;
-    volatile uint16_t _iTail ;
+    int _iHead ;
+    int _iTail ;
 
   public:
     RingBuffer( void ) ;

cores/stm32l4/Stream.h

@@ -68,6 +68,7 @@ class Stream : public Print
 // parsing methods
 
   void setTimeout(unsigned long timeout);  // sets maximum milliseconds to wait for stream data, default is 1 second
+  unsigned long getTimeout(void) { return _timeout; }
 
   bool find(char *target);   // reads data from the stream until the target string is found
   bool find(uint8_t *target) { return find ((char *)target); }

cores/stm32l4/WString.cpp

@@ -20,7 +20,8 @@
 */
 
 #include "WString.h"
-#include "stdlib_noniso.h"
+#include "itoa.h"
+#include "avr/dtostrf.h"
 
 /*********************************************/
 /*  Constructors                             */
@@ -194,7 +195,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
 void String::move(String &rhs)
 {
 	if (buffer) {
-		if (capacity >= rhs.len) {
+		if (rhs && capacity >= rhs.len) {
 			strcpy(buffer, rhs.buffer);
 			len = rhs.len;
 			rhs.len = 0;
@@ -741,6 +742,11 @@ long String::toInt(void) const
 
 float String::toFloat(void) const
 {
-	if (buffer) return float(atof(buffer));
+	return float(toDouble());
+}
+
+double String::toDouble(void) const
+{
+	if (buffer) return atof(buffer);
 	return 0;
 }

cores/stm32l4/WString.h

@@ -159,10 +159,12 @@ class String
 	char& operator [] (unsigned int index);
 	void getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const;
 	void toCharArray(char *buf, unsigned int bufsize, unsigned int index=0) const
-		{getBytes((unsigned char *)buf, bufsize, index);}
-	const char * c_str() const { return buffer; }
-	const char* begin() { return c_str(); }
-	const char* end() { return c_str() + length(); }
+		{ getBytes((unsigned char *)buf, bufsize, index); }
+	const char* c_str() const { return buffer; }
+	char* begin() { return buffer; }
+	char* end() { return buffer + length(); }
+	const char* begin() const { return c_str(); }
+	const char* end() const { return c_str() + length(); }
 
 	// search
 	int indexOf( char ch ) const;
@@ -188,6 +190,7 @@ class String
 	// parsing/conversion
 	long toInt(void) const;
 	float toFloat(void) const;
+	double toDouble(void) const;
 
 protected:
 	char *buffer;	        // the actual char array

cores/stm32l4/avr/io.h

@@ -1,34 +1,34 @@
 /*
- * Copyright (c) 2016 Thomas Roell.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal with the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- *  1. Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimers.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimers in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of Thomas Roell, nor the names of its contributors
- *     may be used to endorse or promote products derived from this Software
- *     without specific prior written permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * WITH THE SOFTWARE.
- */
-
-#ifndef _AVR_IO_H_
-#define _AVR_IO_H_
-
-#define E2END 0x3ff
-
-#endif /* _AVR_IO_H_ */
+  io.h - Definitions for compatibility with AVR io macros
+
+  Copyright (c) 2016 Arduino LLC
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE
+*/
+
+#ifndef _IO_H_
+#define _IO_H_
+
+#define RAMSTART 0x20000000
+#define RAMSIZE  (96 * 1024)
+#define RAMEND   (RAMSTART + RAMSIZE - 1)
+
+#define E2END    0x3ff
+
+#endif