Merge remote-tracking branch 'upstream/master'

Author: martinayotte

STM32F1/boards.txt

@@ -6,7 +6,7 @@ menu.bootloader_version=Bootloader version
 menu.upload_method=Upload method
 
 ##############################################################
-mapleMini.name=LeafLabs Maple Mini Rev 2 to Flash
+mapleMini.name=Maple Mini
 
 mapleMini.build.board=MAPLE_MINI
 mapleMini.build.core=maple
@@ -37,7 +37,7 @@ mapleMini.menu.bootloader_version.bootloader20.upload.maximum_size=122880
 mapleMini.menu.bootloader_version.bootloader20.upload.altID=2
 
 ##############################################################
-maple.name=LeafLabs Maple Rev 3+ to Flash
+maple.name=Maple (Rev 3)
 
 maple.upload.tool=maple_upload
 maple.upload.protocol=maple_dfu
@@ -60,7 +60,7 @@ maple.build.vect=VECT_TAB_ADDR=0x8005000
 
 
 ##############################################################
-mapleRET6.name=LeafLabs Maple RET6 to Flash
+mapleRET6.name=Maple (RET6)
 
 mapleRET6.build.board=MAPLE_RET6
 mapleRET6.build.core=maple

STM32F1/cores/maple/wirish.h

@@ -74,11 +74,12 @@
 
 #include <stdint.h>
 
-#warning these are just here to get SPI to compile they need to be changed and moved!
-#define SS (1)
-#define MOSI 2
-#define MISO 3
-#define SCK 4
+
+#define SS 		BOARD_SPI1_NSS_PIN
+#define MOSI 	BOARD_SPI1_MOSI_PIN 
+#define MISO 	BOARD_SPI1_MISO_PIN
+#define SCK 	BOARD_SPI1_SCK_PIN
+
 
 typedef unsigned int word;
 // typedef uint16 word;// definition from Arduino website, now appears to be incorrect for 32 bit devices

STM32F1/platform.txt

@@ -3,7 +3,7 @@
 # For more info:
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
-name=STM32 Boards (stm32duino)
+name=STM32 Boards (STM32duino.com)
 version=0.1.2
 
 compiler.warning_flags=-w -DDEBUG_LEVEL=DEBUG_NONE