Merge branch 'master' into rcc-dev

Conflicts:
	Makefile

109 files changed, 212 insertions, 132 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c6a72b4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+build/
+main.cpp
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e65b34d
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,38 @@
+-------------------------------------------------------------------------------
+All code in /stm32lib/ is from v2.0.2 of the standard peripheral library from
+STMicroelectronics, which is released with the following notice:
+
+THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
+WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
+AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
+INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
+CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
+INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+
+-------------------------------------------------------------------------------
+Unless otherwise noted in the header, all code in /libmaple/ are copyright
+LeafLabs LLC and are released under the MIT License:
+
+Copyright (c) 2009-2010 LeafLabs 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.
+
+See http://creativecommons.org/licenses/MIT/ for more information.
+
+-------------------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 6bfc7bf..bdc2bf1 100644
--- a/Makefile
+++ b/Makefile
@@ -26,26 +26,23 @@ else
 endif
 
 BUILD_PATH = build
-LIB_PATH = lib
-COMM_PATH = comm
+LIB_PATH = libmaple
 
-OUTDIRS = $(BUILD_PATH)/src/$(STM_SRC) \
-	  $(BUILD_PATH)/src/$(LIB_PATH)\
-	  $(BUILD_PATH)/src/comm \
-	  $(BUILD_PATH)/src/wiring \
-	  $(BUILD_PATH)/src/wiring/comm
+OUTDIRS = $(BUILD_PATH)/$(STM_SRC) \
+	  $(BUILD_PATH)/$(LIB_PATH)\
+	  $(BUILD_PATH)/core \
+	  $(BUILD_PATH)/core/comm
 
 
-INCLUDES = -Isrc/stm32lib/inc \
-	   -Isrc/$(LIB_PATH) \
-	   -Isrc/$(COMM_PATH) \
-	   -Isrc/ \
-	   -Isrc/wiring \
-	   -Isrc/wiring/comm
+INCLUDES = -Istm32lib/inc \
+	   -I$(LIB_PATH) \
+	   -I./ \
+	   -Icore \
+	   -Icore/comm
 
 # default is to upload to flash
 #DEFFLAGS = VECT_TAB_BASE
-CFLAGS  =  -I./ $(INCLUDES) -c \
+CFLAGS  =  $(INCLUDES) -c \
            -Os\
            -g -mcpu=cortex-m3 -mthumb  -march=armv7-m -nostdlib \
            -ffunction-sections -fdata-sections -Wl,--gc-sections \
@@ -61,45 +58,45 @@ LFLAGS  = -Tstm32conf/$(LINKER) -L stm32conf/lanchon-stm32 \
 CPFLAGS = -v -Obinary
 ODFLAGS = -S
 
-# main ource file
+# main source file
 MAIN=main.c
 
 STM32SRCS = $(STM_SRC)/stm32f10x_flash.c    \
 	    $(STM_SRC)/stm32f10x_nvic.c
 
-CSRC = lib/systick.c                        \
-	   lib/timers.c                     \
-	   lib/adc.c 		            \
-	   lib/syscalls.c 		    \
-	   lib/stm32f10x_it.c 		    \
-	   lib/exti.c 			    \
-	   lib/gpio.c 			    \
-	   lib/nvic.c 			    \
-	   lib/usart.c 			    \
-	   lib/util.c			    \
-	   lib/usb.c                        \
-	   lib/rcc.c                        \
-	   wiring/wiring.c 		    \
-	   wiring/wiring_shift.c            \
-	   wiring/wiring_analog.c           \
-	   wiring/time.c 		    \
-	   wiring/pwm.c 		    \
-	   wiring/ext_interrupts.c          \
-	   wiring/wiring_digital.c
+CSRC = libmaple/systick.c                        \
+	   libmaple/timers.c                     \
+	   libmaple/adc.c 		            \
+	   libmaple/syscalls.c 		    \
+	   libmaple/stm32f10x_it.c 		    \
+	   libmaple/exti.c 			    \
+	   libmaple/gpio.c 			    \
+	   libmaple/nvic.c 			    \
+	   libmaple/usart.c 			    \
+	   libmaple/util.c			    \
+	   libmaple/usb.c                        \
+	   libmaple/rcc.c                        \
+	   core/wiring.c 		    \
+	   core/wiring_shift.c            \
+	   core/wiring_analog.c           \
+	   core/time.c 		    \
+	   core/pwm.c 		    \
+	   core/ext_interrupts.c          \
+	   core/wiring_digital.c
 
 CSRC += $(STM32SRCS)
 
-CPPSRC = wiring/wiring_math.cpp \
-	 wiring/Print.cpp \
-	 wiring/comm/HardwareSerial.cpp \
-	 wiring/comm/HardwareUsb.cpp \
+CPPSRC = core/wiring_math.cpp \
+	 core/Print.cpp \
+	 core/comm/HardwareSerial.cpp \
+	 core/comm/HardwareUsb.cpp \
 	 main.cpp
 
 # i really have no idea what i'm doing
 meep += $(CSRC)
-moop = $(patsubst %, src/%, $(meep))
+moop = $(patsubst %, %, $(meep))
 beep = $(CPPSRC)
-boop = $(patsubst %, src/%, $(beep))
+boop = $(patsubst %, %, $(beep))
 
 # English
 MSG_ERRORS_NONE = Errors: none
@@ -122,17 +119,18 @@ CPPOBJ = $(patsubst %, $(BUILD_PATH)/%,$(_CPPOBJ))
 .PHONY: run cscope clean info program_ram program_flash program_jtag
 
 info:
-	@echo "Maple library help"
-	@echo "------------------:"
+	@echo ""
+	@echo "libmaple Makefile help"
+	@echo "----------------------"
 	@echo "Compile targets:"
-	@echo "	   ram:           Compile sketch code for RAM to be loaded over the bootloader"
-	@echo "	   flash:         Compile sketch code for flash to be loaded over the bootloader"
-	@echo "	   jtag:          Compile sketch code for flash to be loaded over JTAG"
+	@echo "  ram:    Compile sketch code for RAM to be loaded over the bootloader"
+	@echo "  flash:  Compile sketch code for flash to be loaded over the bootloader"
+	@echo "  jtag:   Compile sketch code for flash to be loaded over JTAG"
 	@echo ""
 	@echo "Programming targets:"
-	@echo "	   program_ram:   Upload code to RAM via bootloader"
-	@echo "	   program_flash: Upload code to flash via bootloader"
-	@echo "	   program_jtag:  Upload code to flash via jtag"
+	@echo "  program_ram:   Upload code to RAM via bootloader"
+	@echo "  program_flash: Upload code to flash via bootloader"
+	@echo "  program_jtag:  Upload code to flash via jtag"
 
 all: info
 
diff --git a/README b/README
index 9723e93..9ea9a23 100644
--- a/README
+++ b/README
@@ -1,6 +1,49 @@
 
+                   _ _ _                           _      
+                  | (_) |__  _ __ ___   __ _ _ __ | | ___ 
+                  | | | '_ \| '_ ` _ \ / _` | '_ \| |/ _ \
+                  | | | |_) | | | | | | (_| | |_) | |  __/
+                  |_|_|_.__/|_| |_| |_|\__,_| .__/|_|\___|
+                                            |_|               by leaflabs!
+
+
+
+The latest version of this repository can be found at:
+http://github.com/leaflabs/libmaple
+
+libmaple Repo Layout
+------------------------------------------------------------------------------
+/LICENSE
+    Licensing and copyright information
+
+/main.cpp.example
+    main.cpp is required for a successful build but is non-existant by default;
+    use this file as a template for building your program. By default just 
+    blinks an LED.
+
+/build/
+    Binary output
+
+/stm32conf/
+    Linker scripts
+
+/libmaple/
+    Lowest level definitions, routines, macros, and functions. This is the meat
+    of the library.
+
+/core/
+    Extra wrappers and functionality around the lower level code which is 
+    useful for programming in the IDE.
+
+/exapmles/
+    
+
+/stm32lib/
+    The "standard" library given away by STM; to be removed ASAP.
+
+
 Instructions to Compile for ARM Targets
-----------------------------------------
+------------------------------------------------------------------------------
 The Codesourcery g++ compiler for arm platforms is required. It is based on gcc
 (they push changes into gcc a couple times a year), get the latest EABI version
 from:
diff --git a/copy-to-ide b/copy-to-ide
index cb36b0d..147900a 100755
--- a/copy-to-ide
+++ b/copy-to-ide
@@ -9,88 +9,88 @@ DEST=`pwd`/../maple-ide/hardware/leaflabs/cores/maple/
 ARCH=`uname -a`
 
 FILES="
-    stm32lib/inc/cortexm3_macro.h
-    stm32lib/src/stm32f10x_flash.c    
-    stm32lib/src/stm32f10x_nvic.c     
-    stm32lib/src/stm32f10x_rcc.c      
-    stm32lib/inc/stm32f10x_nvic.h
-    stm32lib/inc/stm32f10x_rcc.h
-    stm32lib/inc/stm32f10x_flash.h
-    stm32lib/inc/stm32f10x_adc.h
-    stm32lib/inc/stm32f10x_fsmc.h
-    stm32lib/inc/stm32f10x_dac.h
-    stm32lib/inc/stm32f10x_rtc.h
-    stm32lib/inc/stm32f10x_spi.h
-    stm32lib/inc/stm32f10x_pwr.h
-    stm32lib/inc/stm32f10x_iwdg.h
-    stm32lib/inc/stm32f10x_exti.h
-    stm32lib/inc/stm32f10x_bkp.h
-    stm32lib/inc/stm32f10x_i2c.h
-    stm32lib/inc/stm32f10x_dma.h
-    stm32lib/inc/stm32f10x_gpio.h
-    stm32lib/inc/stm32f10x_nvic.h
-    stm32lib/inc/stm32f10x_wwdg.h
-    stm32lib/inc/stm32f10x_lib.h
-    stm32lib/inc/stm32f10x_type.h
-    stm32lib/inc/stm32f10x_usart.h
-    stm32lib/inc/stm32f10x_tim.h
-    stm32lib/inc/stm32f10x_can.h
-    stm32lib/inc/stm32f10x_sdio.h
-    stm32lib/inc/stm32f10x_flash.h
-    stm32lib/inc/stm32f10x_dbgmcu.h
-    stm32lib/inc/stm32f10x_systick.h
-    stm32lib/inc/stm32f10x_crc.h
-    stm32lib/inc/stm32f10x_rcc.h
-    stm32lib/inc/stm32f10x_map.h
-    lib/systick.c                     
-    lib/timers.c                      
-    lib/adc.c                         
-    lib/syscalls.c                    
-    lib/stm32f10x_it.c                
-    lib/exti.c                        
-    lib/gpio.c                        
-    lib/nvic.c                        
-    lib/usart.c                       
-    lib/util.c                        
-    lib/usb.h
-    lib/usb.c                         
-    lib/timers.h
-    lib/gpio.h
-    lib/nvic.h
-    lib/systick.h
-    lib/util.h
-    lib/adc.h
-    lib/usb_regs.h
-    lib/exti.h
-    lib/usart.h
-    lib/stm32f10x_conf.h
-    lib/bootVect.h
-    lib/libmaple.h
-    lib/libmaple_types.h
-    wiring/bits.h
-    wiring/comm/HardwareUsb.h
-    wiring/comm/HardwareSerial.h
-    wiring/io.h
-    wiring/wiring.h
-    wiring/WProgram.h
-    wiring/Print.h
-    wiring/pwm.h
-    wiring/binary.h
-    wiring/wiring_math.h
-    wiring/ext_interrupts.h
-    wiring/time.h
-    wiring/wiring.c                   
-    wiring/wiring_shift.c             
-    wiring/wiring_analog.c            
-    wiring/time.c                     
-    wiring/pwm.c                      
-    wiring/ext_interrupts.c           
-    wiring/wiring_digital.c           
-    wiring/wiring_math.cpp            
-    wiring/Print.cpp                  
-    wiring/comm/HardwareSerial.cpp    
-    wiring/comm/HardwareUsb.cpp       
-    main.cxx"
+    stm32libmaple/inc/cortexm3_macro.h
+    stm32libmaple/src/stm32f10x_flash.c    
+    stm32libmaple/src/stm32f10x_nvic.c     
+    stm32libmaple/src/stm32f10x_rcc.c      
+    stm32libmaple/inc/stm32f10x_nvic.h
+    stm32libmaple/inc/stm32f10x_rcc.h
+    stm32libmaple/inc/stm32f10x_flash.h
+    stm32libmaple/inc/stm32f10x_adc.h
+    stm32libmaple/inc/stm32f10x_fsmc.h
+    stm32libmaple/inc/stm32f10x_dac.h
+    stm32libmaple/inc/stm32f10x_rtc.h
+    stm32libmaple/inc/stm32f10x_spi.h
+    stm32libmaple/inc/stm32f10x_pwr.h
+    stm32libmaple/inc/stm32f10x_iwdg.h
+    stm32libmaple/inc/stm32f10x_exti.h
+    stm32libmaple/inc/stm32f10x_bkp.h
+    stm32libmaple/inc/stm32f10x_i2c.h
+    stm32libmaple/inc/stm32f10x_dma.h
+    stm32libmaple/inc/stm32f10x_gpio.h
+    stm32libmaple/inc/stm32f10x_nvic.h
+    stm32libmaple/inc/stm32f10x_wwdg.h
+    stm32libmaple/inc/stm32f10x_lib.h
+    stm32libmaple/inc/stm32f10x_type.h
+    stm32libmaple/inc/stm32f10x_usart.h
+    stm32libmaple/inc/stm32f10x_tim.h
+    stm32libmaple/inc/stm32f10x_can.h
+    stm32libmaple/inc/stm32f10x_sdio.h
+    stm32libmaple/inc/stm32f10x_flash.h
+    stm32libmaple/inc/stm32f10x_dbgmcu.h
+    stm32libmaple/inc/stm32f10x_systick.h
+    stm32libmaple/inc/stm32f10x_crc.h
+    stm32libmaple/inc/stm32f10x_rcc.h
+    stm32libmaple/inc/stm32f10x_map.h
+    libmaple/systick.c                     
+    libmaple/timers.c                      
+    libmaple/adc.c                         
+    libmaple/syscalls.c                    
+    libmaple/stm32f10x_it.c                
+    libmaple/exti.c                        
+    libmaple/gpio.c                        
+    libmaple/nvic.c                        
+    libmaple/usart.c                       
+    libmaple/util.c                        
+    libmaple/usb.h
+    libmaple/usb.c                         
+    libmaple/timers.h
+    libmaple/gpio.h
+    libmaple/nvic.h
+    libmaple/systick.h
+    libmaple/util.h
+    libmaple/adc.h
+    libmaple/usb_regs.h
+    libmaple/exti.h
+    libmaple/usart.h
+    libmaple/stm32f10x_conf.h
+    libmaple/bootVect.h
+    libmaple/libmaple.h
+    libmaple/libmaple_types.h
+    core/bits.h
+    core/comm/HardwareUsb.h
+    core/comm/HardwareSerial.h
+    core/io.h
+    core/wiring.h
+    core/WProgram.h
+    core/Print.h
+    core/pwm.h
+    core/binary.h
+    core/wiring_math.h
+    core/ext_interrupts.h
+    core/time.h
+    core/wiring.c                   
+    core/wiring_shift.c             
+    core/wiring_analog.c            
+    core/time.c                     
+    core/pwm.c                      
+    core/ext_interrupts.c           
+    core/wiring_digital.c           
+    core/wiring_math.cpp            
+    core/Print.cpp                  
+    core/comm/HardwareSerial.cpp    
+    core/comm/HardwareUsb.cpp       
+    core/main.cxx"
 
 # First see if this folder exists
 if !(test -d $DEST/lanchon-stm32)
@@ -103,6 +103,5 @@ cp -v stm32conf/* $DEST
 cp -v stm32conf/lanchon-stm32/* $DEST/lanchon-stm32
 
 # Finally the source files
-cd src
 cp -v $FILES $DEST
 
diff --git a/src/wiring/Print.cpp b/core/Print.cpp
index efe3eef..efe3eef 100644
--- a/src/wiring/Print.cpp
+++ b/core/Print.cpp
diff --git a/src/wiring/Print.h b/core/Print.h
index a69e85d..a69e85d 100644
--- a/src/wiring/Print.h
+++ b/core/Print.h
diff --git a/src/wiring/WProgram.h b/core/WProgram.h
index 1d38776..1d38776 100644
--- a/src/wiring/WProgram.h
+++ b/core/WProgram.h
diff --git a/src/wiring/binary.h b/core/binary.h
index af14980..af14980 100644
--- a/src/wiring/binary.h
+++ b/core/binary.h
diff --git a/src/wiring/bits.h b/core/bits.h
index e614094..e614094 100644
--- a/src/wiring/bits.h
+++ b/core/bits.h
diff --git a/src/wiring/comm/HardwareSerial.cpp b/core/comm/HardwareSerial.cpp
index 04d8d18..04d8d18 100644
--- a/src/wiring/comm/HardwareSerial.cpp
+++ b/core/comm/HardwareSerial.cpp
diff --git a/src/wiring/comm/HardwareSerial.h b/core/comm/HardwareSerial.h
index a3913f9..a3913f9 100644
--- a/src/wiring/comm/HardwareSerial.h
+++ b/core/comm/HardwareSerial.h
diff --git a/src/wiring/comm/HardwareUsb.cpp b/core/comm/HardwareUsb.cpp
index 269a68f..269a68f 100644
--- a/src/wiring/comm/HardwareUsb.cpp
+++ b/core/comm/HardwareUsb.cpp
diff --git a/src/wiring/comm/HardwareUsb.h b/core/comm/HardwareUsb.h
index b8733c1..b8733c1 100644
--- a/src/wiring/comm/HardwareUsb.h
+++ b/core/comm/HardwareUsb.h
diff --git a/src/wiring/ext_interrupts.c b/core/ext_interrupts.c
index 20ec11f..20ec11f 100644
--- a/src/wiring/ext_interrupts.c
+++ b/core/ext_interrupts.c
diff --git a/src/wiring/ext_interrupts.h b/core/ext_interrupts.h
index d0e6365..d0e6365 100644
--- a/src/wiring/ext_interrupts.h
+++ b/core/ext_interrupts.h
diff --git a/src/wiring/io.h b/core/io.h
index 9f6aa4a..9f6aa4a 100644
--- a/src/wiring/io.h
+++ b/core/io.h
diff --git a/src/main.cxx b/core/main.cxx
index 24b6483..24b6483 100644
--- a/src/main.cxx
+++ b/core/main.cxx
diff --git a/src/wiring/pwm.c b/core/pwm.c
index 2cc815c..2cc815c 100644
--- a/src/wiring/pwm.c
+++ b/core/pwm.c
diff --git a/src/wiring/pwm.h b/core/pwm.h
index 60d805d..60d805d 100644
--- a/src/wiring/pwm.h
+++ b/core/pwm.h
diff --git a/src/wiring/time.c b/core/time.c
index 164d978..164d978 100644
--- a/src/wiring/time.c
+++ b/core/time.c
diff --git a/src/wiring/time.h b/core/time.h
index 68b3901..68b3901 100644
--- a/src/wiring/time.h
+++ b/core/time.h
diff --git a/src/wiring/wiring.c b/core/wiring.c
index 488d15c..488d15c 100644
--- a/src/wiring/wiring.c
+++ b/core/wiring.c
diff --git a/src/wiring/wiring.h b/core/wiring.h
index bcf6eda..bcf6eda 100644
--- a/src/wiring/wiring.h
+++ b/core/wiring.h
diff --git a/src/wiring/wiring_analog.c b/core/wiring_analog.c
index d7d7150..d7d7150 100644
--- a/src/wiring/wiring_analog.c
+++ b/core/wiring_analog.c
diff --git a/src/wiring/wiring_digital.c b/core/wiring_digital.c
index 71dae57..71dae57 100644
--- a/src/wiring/wiring_digital.c
+++ b/core/wiring_digital.c
diff --git a/src/wiring/wiring_math.cpp b/core/wiring_math.cpp
index 9be7dc3..9be7dc3 100644
--- a/src/wiring/wiring_math.cpp
+++ b/core/wiring_math.cpp
diff --git a/src/wiring/wiring_math.h b/core/wiring_math.h
index f000bbd..f000bbd 100644
--- a/src/wiring/wiring_math.h
+++ b/core/wiring_math.h
diff --git a/src/wiring/wiring_shift.c b/core/wiring_shift.c
index 28c6dfc..28c6dfc 100644
--- a/src/wiring/wiring_shift.c
+++ b/core/wiring_shift.c
diff --git a/src/example_main_blinky.cpp b/examples/blinky.cpp
index 1970529..1970529 100644
--- a/src/example_main_blinky.cpp
+++ b/examples/blinky.cpp
diff --git a/src/lib/adc.c b/libmaple/adc.c
index d584dba..d584dba 100644
--- a/src/lib/adc.c
+++ b/libmaple/adc.c
diff --git a/src/lib/adc.h b/libmaple/adc.h
index d554b02..d554b02 100644
--- a/src/lib/adc.h
+++ b/libmaple/adc.h
diff --git a/src/lib/bootVect.h b/libmaple/bootVect.h
index 5bcb42b..5bcb42b 100644
--- a/src/lib/bootVect.h
+++ b/libmaple/bootVect.h
diff --git a/src/lib/exti.c b/libmaple/exti.c
index bdaa204..bdaa204 100644
--- a/src/lib/exti.c
+++ b/libmaple/exti.c
diff --git a/src/lib/exti.h b/libmaple/exti.h
index c728454..c728454 100644
--- a/src/lib/exti.h
+++ b/libmaple/exti.h
diff --git a/src/lib/gpio.c b/libmaple/gpio.c
index 39341af..39341af 100644
--- a/src/lib/gpio.c
+++ b/libmaple/gpio.c
diff --git a/src/lib/gpio.h b/libmaple/gpio.h
index 5e7cf29..5e7cf29 100644
--- a/src/lib/gpio.h
+++ b/libmaple/gpio.h
diff --git a/src/lib/libmaple.h b/libmaple/libmaple.h
index dc9ffd2..dc9ffd2 100644
--- a/src/lib/libmaple.h
+++ b/libmaple/libmaple.h
diff --git a/src/lib/libmaple_types.h b/libmaple/libmaple_types.h
index b798587..b798587 100644
--- a/src/lib/libmaple_types.h
+++ b/libmaple/libmaple_types.h
diff --git a/src/lib/nvic.c b/libmaple/nvic.c
index 9b8c84f..9b8c84f 100644
--- a/src/lib/nvic.c
+++ b/libmaple/nvic.c
diff --git a/src/lib/nvic.h b/libmaple/nvic.h
index 5908e9c..5908e9c 100644
--- a/src/lib/nvic.h
+++ b/libmaple/nvic.h
diff --git a/src/lib/rcc.c b/libmaple/rcc.c
index bf76eb0..bf76eb0 100644
--- a/src/lib/rcc.c
+++ b/libmaple/rcc.c
diff --git a/src/lib/rcc.h b/libmaple/rcc.h
index 5c9591b..5c9591b 100644
--- a/src/lib/rcc.h
+++ b/libmaple/rcc.h
diff --git a/src/lib/stm32f10x_conf.h b/libmaple/stm32f10x_conf.h
index ddd1833..ddd1833 100644
--- a/src/lib/stm32f10x_conf.h
+++ b/libmaple/stm32f10x_conf.h
diff --git a/src/lib/stm32f10x_it.c b/libmaple/stm32f10x_it.c
index 70d3269..70d3269 100644
--- a/src/lib/stm32f10x_it.c
+++ b/libmaple/stm32f10x_it.c
diff --git a/src/lib/syscalls.c b/libmaple/syscalls.c
index 390cecd..390cecd 100644
--- a/src/lib/syscalls.c
+++ b/libmaple/syscalls.c
diff --git a/src/lib/systick.c b/libmaple/systick.c
index 47be69e..47be69e 100644
--- a/src/lib/systick.c
+++ b/libmaple/systick.c
diff --git a/src/lib/systick.h b/libmaple/systick.h
index 61789c4..61789c4 100644
--- a/src/lib/systick.h
+++ b/libmaple/systick.h
diff --git a/src/lib/timers.c b/libmaple/timers.c
index e187428..e187428 100644
--- a/src/lib/timers.c
+++ b/libmaple/timers.c
diff --git a/src/lib/timers.h b/libmaple/timers.h
index 18b0afb..18b0afb 100644
--- a/src/lib/timers.h
+++ b/libmaple/timers.h
diff --git a/src/lib/usart.c b/libmaple/usart.c
index 545f64a..545f64a 100644
--- a/src/lib/usart.c
+++ b/libmaple/usart.c
diff --git a/src/lib/usart.h b/libmaple/usart.h
index b9efdd5..b9efdd5 100644
--- a/src/lib/usart.h
+++ b/libmaple/usart.h
diff --git a/src/lib/usb.c b/libmaple/usb.c
index 8c312f8..8c312f8 100644
--- a/src/lib/usb.c
+++ b/libmaple/usb.c
diff --git a/src/lib/usb.h b/libmaple/usb.h
index 3b7a971..3b7a971 100644
--- a/src/lib/usb.h
+++ b/libmaple/usb.h
diff --git a/src/lib/usb_regs.h b/libmaple/usb_regs.h
index 135d645..135d645 100644
--- a/src/lib/usb_regs.h
+++ b/libmaple/usb_regs.h
diff --git a/src/lib/util.c b/libmaple/util.c
index d323611..d323611 100644
--- a/src/lib/util.c
+++ b/libmaple/util.c
diff --git a/src/lib/util.h b/libmaple/util.h
index c1ba15d..c1ba15d 100644
--- a/src/lib/util.h
+++ b/libmaple/util.h
diff --git a/src/example_main.cpp b/main.cpp.example
index 8275452..8275452 100644
--- a/src/example_main.cpp
+++ b/main.cpp.example
diff --git a/src/stm32lib/inc/cortexm3_macro.h b/stm32lib/inc/cortexm3_macro.h
index 26b04ef..26b04ef 100644
--- a/src/stm32lib/inc/cortexm3_macro.h
+++ b/stm32lib/inc/cortexm3_macro.h
diff --git a/src/stm32lib/inc/stm32f10x_adc.h b/stm32lib/inc/stm32f10x_adc.h
index 8fc9098..8fc9098 100644
--- a/src/stm32lib/inc/stm32f10x_adc.h
+++ b/stm32lib/inc/stm32f10x_adc.h
diff --git a/src/stm32lib/inc/stm32f10x_bkp.h b/stm32lib/inc/stm32f10x_bkp.h
index 39ea7ae..39ea7ae 100644
--- a/src/stm32lib/inc/stm32f10x_bkp.h
+++ b/stm32lib/inc/stm32f10x_bkp.h
diff --git a/src/stm32lib/inc/stm32f10x_can.h b/stm32lib/inc/stm32f10x_can.h
index 85dd07b..85dd07b 100644
--- a/src/stm32lib/inc/stm32f10x_can.h
+++ b/stm32lib/inc/stm32f10x_can.h
diff --git a/src/stm32lib/inc/stm32f10x_crc.h b/stm32lib/inc/stm32f10x_crc.h
index 0c3dab4..0c3dab4 100644
--- a/src/stm32lib/inc/stm32f10x_crc.h
+++ b/stm32lib/inc/stm32f10x_crc.h
diff --git a/src/stm32lib/inc/stm32f10x_dac.h b/stm32lib/inc/stm32f10x_dac.h
index cd7b5ad..cd7b5ad 100644
--- a/src/stm32lib/inc/stm32f10x_dac.h
+++ b/stm32lib/inc/stm32f10x_dac.h
diff --git a/src/stm32lib/inc/stm32f10x_dbgmcu.h b/stm32lib/inc/stm32f10x_dbgmcu.h
index 212f646..212f646 100644
--- a/src/stm32lib/inc/stm32f10x_dbgmcu.h
+++ b/stm32lib/inc/stm32f10x_dbgmcu.h
diff --git a/src/stm32lib/inc/stm32f10x_dma.h b/stm32lib/inc/stm32f10x_dma.h
index 4803a69..4803a69 100644
--- a/src/stm32lib/inc/stm32f10x_dma.h
+++ b/stm32lib/inc/stm32f10x_dma.h
diff --git a/src/stm32lib/inc/stm32f10x_exti.h b/stm32lib/inc/stm32f10x_exti.h
index 46ac68d..46ac68d 100644
--- a/src/stm32lib/inc/stm32f10x_exti.h
+++ b/stm32lib/inc/stm32f10x_exti.h
diff --git a/src/stm32lib/inc/stm32f10x_flash.h b/stm32lib/inc/stm32f10x_flash.h
index 459a044..459a044 100644
--- a/src/stm32lib/inc/stm32f10x_flash.h
+++ b/stm32lib/inc/stm32f10x_flash.h
diff --git a/src/stm32lib/inc/stm32f10x_fsmc.h b/stm32lib/inc/stm32f10x_fsmc.h
index d508299..d508299 100644
--- a/src/stm32lib/inc/stm32f10x_fsmc.h
+++ b/stm32lib/inc/stm32f10x_fsmc.h
diff --git a/src/stm32lib/inc/stm32f10x_gpio.h b/stm32lib/inc/stm32f10x_gpio.h
index ae7f0c2..ae7f0c2 100644
--- a/src/stm32lib/inc/stm32f10x_gpio.h
+++ b/stm32lib/inc/stm32f10x_gpio.h
diff --git a/src/stm32lib/inc/stm32f10x_i2c.h b/stm32lib/inc/stm32f10x_i2c.h
index 7dd6d7d..7dd6d7d 100644
--- a/src/stm32lib/inc/stm32f10x_i2c.h
+++ b/stm32lib/inc/stm32f10x_i2c.h
diff --git a/src/stm32lib/inc/stm32f10x_iwdg.h b/stm32lib/inc/stm32f10x_iwdg.h
index 287950f..287950f 100644
--- a/src/stm32lib/inc/stm32f10x_iwdg.h
+++ b/stm32lib/inc/stm32f10x_iwdg.h
diff --git a/src/stm32lib/inc/stm32f10x_lib.h b/stm32lib/inc/stm32f10x_lib.h
index beff887..beff887 100644
--- a/src/stm32lib/inc/stm32f10x_lib.h
+++ b/stm32lib/inc/stm32f10x_lib.h
diff --git a/src/stm32lib/inc/stm32f10x_map.h b/stm32lib/inc/stm32f10x_map.h
index 16dc479..16dc479 100644
--- a/src/stm32lib/inc/stm32f10x_map.h
+++ b/stm32lib/inc/stm32f10x_map.h
diff --git a/src/stm32lib/inc/stm32f10x_nvic.h b/stm32lib/inc/stm32f10x_nvic.h
index 6a9815b..6a9815b 100644
--- a/src/stm32lib/inc/stm32f10x_nvic.h
+++ b/stm32lib/inc/stm32f10x_nvic.h
diff --git a/src/stm32lib/inc/stm32f10x_pwr.h b/stm32lib/inc/stm32f10x_pwr.h
index ffcc438..ffcc438 100644
--- a/src/stm32lib/inc/stm32f10x_pwr.h
+++ b/stm32lib/inc/stm32f10x_pwr.h
diff --git a/src/stm32lib/inc/stm32f10x_rcc.h b/stm32lib/inc/stm32f10x_rcc.h
index f0c39d7..f0c39d7 100644
--- a/src/stm32lib/inc/stm32f10x_rcc.h
+++ b/stm32lib/inc/stm32f10x_rcc.h
diff --git a/src/stm32lib/inc/stm32f10x_rtc.h b/stm32lib/inc/stm32f10x_rtc.h
index 6ea7b78..6ea7b78 100644
--- a/src/stm32lib/inc/stm32f10x_rtc.h
+++ b/stm32lib/inc/stm32f10x_rtc.h
diff --git a/src/stm32lib/inc/stm32f10x_sdio.h b/stm32lib/inc/stm32f10x_sdio.h
index 27f74f7..27f74f7 100644
--- a/src/stm32lib/inc/stm32f10x_sdio.h
+++ b/stm32lib/inc/stm32f10x_sdio.h
diff --git a/src/stm32lib/inc/stm32f10x_spi.h b/stm32lib/inc/stm32f10x_spi.h
index b39817c..b39817c 100644
--- a/src/stm32lib/inc/stm32f10x_spi.h
+++ b/stm32lib/inc/stm32f10x_spi.h
diff --git a/src/stm32lib/inc/stm32f10x_systick.h b/stm32lib/inc/stm32f10x_systick.h
index 3dfb036..3dfb036 100644
--- a/src/stm32lib/inc/stm32f10x_systick.h
+++ b/stm32lib/inc/stm32f10x_systick.h
diff --git a/src/stm32lib/inc/stm32f10x_tim.h b/stm32lib/inc/stm32f10x_tim.h
index 423516c..423516c 100644
--- a/src/stm32lib/inc/stm32f10x_tim.h
+++ b/stm32lib/inc/stm32f10x_tim.h
diff --git a/src/stm32lib/inc/stm32f10x_type.h b/stm32lib/inc/stm32f10x_type.h
index 895cbb2..895cbb2 100644
--- a/src/stm32lib/inc/stm32f10x_type.h
+++ b/stm32lib/inc/stm32f10x_type.h
diff --git a/src/stm32lib/inc/stm32f10x_usart.h b/stm32lib/inc/stm32f10x_usart.h
index 0731b7b..0731b7b 100644
--- a/src/stm32lib/inc/stm32f10x_usart.h
+++ b/stm32lib/inc/stm32f10x_usart.h
diff --git a/src/stm32lib/inc/stm32f10x_wwdg.h b/stm32lib/inc/stm32f10x_wwdg.h
index 3c5339e..3c5339e 100644
--- a/src/stm32lib/inc/stm32f10x_wwdg.h
+++ b/stm32lib/inc/stm32f10x_wwdg.h
diff --git a/src/stm32lib/src/stm32f10x_adc.c b/stm32lib/src/stm32f10x_adc.c
index 413c920..413c920 100644
--- a/src/stm32lib/src/stm32f10x_adc.c
+++ b/stm32lib/src/stm32f10x_adc.c
diff --git a/src/stm32lib/src/stm32f10x_bkp.c b/stm32lib/src/stm32f10x_bkp.c
index a6d3825..a6d3825 100644
--- a/src/stm32lib/src/stm32f10x_bkp.c
+++ b/stm32lib/src/stm32f10x_bkp.c
diff --git a/src/stm32lib/src/stm32f10x_can.c b/stm32lib/src/stm32f10x_can.c
index afb472d..afb472d 100644
--- a/src/stm32lib/src/stm32f10x_can.c
+++ b/stm32lib/src/stm32f10x_can.c
diff --git a/src/stm32lib/src/stm32f10x_crc.c b/stm32lib/src/stm32f10x_crc.c
index ac8c7c4..ac8c7c4 100644
--- a/src/stm32lib/src/stm32f10x_crc.c
+++ b/stm32lib/src/stm32f10x_crc.c
diff --git a/src/stm32lib/src/stm32f10x_dac.c b/stm32lib/src/stm32f10x_dac.c
index 80eec1a..80eec1a 100644
--- a/src/stm32lib/src/stm32f10x_dac.c
+++ b/stm32lib/src/stm32f10x_dac.c
diff --git a/src/stm32lib/src/stm32f10x_dbgmcu.c b/stm32lib/src/stm32f10x_dbgmcu.c
index 04103b1..04103b1 100644
--- a/src/stm32lib/src/stm32f10x_dbgmcu.c
+++ b/stm32lib/src/stm32f10x_dbgmcu.c
diff --git a/src/stm32lib/src/stm32f10x_dma.c b/stm32lib/src/stm32f10x_dma.c
index eaefcb9..eaefcb9 100644
--- a/src/stm32lib/src/stm32f10x_dma.c
+++ b/stm32lib/src/stm32f10x_dma.c
diff --git a/src/stm32lib/src/stm32f10x_exti.c b/stm32lib/src/stm32f10x_exti.c
index 021a051..021a051 100644
--- a/src/stm32lib/src/stm32f10x_exti.c
+++ b/stm32lib/src/stm32f10x_exti.c
diff --git a/src/stm32lib/src/stm32f10x_flash.c b/stm32lib/src/stm32f10x_flash.c
index 66952f2..66952f2 100644
--- a/src/stm32lib/src/stm32f10x_flash.c
+++ b/stm32lib/src/stm32f10x_flash.c
diff --git a/src/stm32lib/src/stm32f10x_fsmc.c b/stm32lib/src/stm32f10x_fsmc.c
index 4068a7f..4068a7f 100644
--- a/src/stm32lib/src/stm32f10x_fsmc.c
+++ b/stm32lib/src/stm32f10x_fsmc.c
diff --git a/src/stm32lib/src/stm32f10x_gpio.c b/stm32lib/src/stm32f10x_gpio.c
index 1979c05..1979c05 100644
--- a/src/stm32lib/src/stm32f10x_gpio.c
+++ b/stm32lib/src/stm32f10x_gpio.c
diff --git a/src/stm32lib/src/stm32f10x_i2c.c b/stm32lib/src/stm32f10x_i2c.c
index 360f71d..360f71d 100644
--- a/src/stm32lib/src/stm32f10x_i2c.c
+++ b/stm32lib/src/stm32f10x_i2c.c
diff --git a/src/stm32lib/src/stm32f10x_iwdg.c b/stm32lib/src/stm32f10x_iwdg.c
index 77cb094..77cb094 100644
--- a/src/stm32lib/src/stm32f10x_iwdg.c
+++ b/stm32lib/src/stm32f10x_iwdg.c
diff --git a/src/stm32lib/src/stm32f10x_lib.c b/stm32lib/src/stm32f10x_lib.c
index 21d5ce5..21d5ce5 100644
--- a/src/stm32lib/src/stm32f10x_lib.c
+++ b/stm32lib/src/stm32f10x_lib.c
diff --git a/src/stm32lib/src/stm32f10x_nvic.c b/stm32lib/src/stm32f10x_nvic.c
index 0ce30af..0ce30af 100644
--- a/src/stm32lib/src/stm32f10x_nvic.c
+++ b/stm32lib/src/stm32f10x_nvic.c
diff --git a/src/stm32lib/src/stm32f10x_pwr.c b/stm32lib/src/stm32f10x_pwr.c
index e02594a..e02594a 100644
--- a/src/stm32lib/src/stm32f10x_pwr.c
+++ b/stm32lib/src/stm32f10x_pwr.c
diff --git a/src/stm32lib/src/stm32f10x_rcc.c b/stm32lib/src/stm32f10x_rcc.c
index 0ab6387..0ab6387 100644
--- a/src/stm32lib/src/stm32f10x_rcc.c
+++ b/stm32lib/src/stm32f10x_rcc.c
diff --git a/src/stm32lib/src/stm32f10x_rtc.c b/stm32lib/src/stm32f10x_rtc.c
index 55a8bea..55a8bea 100644
--- a/src/stm32lib/src/stm32f10x_rtc.c
+++ b/stm32lib/src/stm32f10x_rtc.c
diff --git a/src/stm32lib/src/stm32f10x_sdio.c b/stm32lib/src/stm32f10x_sdio.c
index b7da816..b7da816 100644
--- a/src/stm32lib/src/stm32f10x_sdio.c
+++ b/stm32lib/src/stm32f10x_sdio.c
diff --git a/src/stm32lib/src/stm32f10x_spi.c b/stm32lib/src/stm32f10x_spi.c
index d914c09..d914c09 100644
--- a/src/stm32lib/src/stm32f10x_spi.c
+++ b/stm32lib/src/stm32f10x_spi.c
diff --git a/src/stm32lib/src/stm32f10x_systick.c b/stm32lib/src/stm32f10x_systick.c
index 53deb76..53deb76 100644
--- a/src/stm32lib/src/stm32f10x_systick.c
+++ b/stm32lib/src/stm32f10x_systick.c
diff --git a/src/stm32lib/src/stm32f10x_tim.c b/stm32lib/src/stm32f10x_tim.c
index ca971e2..ca971e2 100644
--- a/src/stm32lib/src/stm32f10x_tim.c
+++ b/stm32lib/src/stm32f10x_tim.c
diff --git a/src/stm32lib/src/stm32f10x_usart.c b/stm32lib/src/stm32f10x_usart.c
index baf9c47..baf9c47 100644
--- a/src/stm32lib/src/stm32f10x_usart.c
+++ b/stm32lib/src/stm32f10x_usart.c
diff --git a/src/stm32lib/src/stm32f10x_wwdg.c b/stm32lib/src/stm32f10x_wwdg.c
index ac9882f..ac9882f 100644
--- a/src/stm32lib/src/stm32f10x_wwdg.c
+++ b/stm32lib/src/stm32f10x_wwdg.c