From 1d7a0bc21be0df9e3d8feeaee2bfa5b28f4f7b08 Mon Sep 17 00:00:00 2001 From: Roger Clark Date: Sun, 5 Jul 2015 03:08:34 +1000 Subject: [PATCH 1/2] Fix issue with default SPI pin definitions in wirish.h being incorrect (as they were the pin definitions for AVR boards). wirish.h now uses the pin definitions defined in board.h for whatever variant is selected --- STM32F1/cores/maple/wirish.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/STM32F1/cores/maple/wirish.h b/STM32F1/cores/maple/wirish.h index c074528..a8264f2 100644 --- a/STM32F1/cores/maple/wirish.h +++ b/STM32F1/cores/maple/wirish.h @@ -74,11 +74,12 @@ #include -#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 From 3d51e8c5305ebe8f3bc532beb1ccf8ca4cdd68bf Mon Sep 17 00:00:00 2001 From: Roger Clark Date: Sun, 5 Jul 2015 11:06:32 +1000 Subject: [PATCH 2/2] Tidied up names of Maple boards in boards.txt menu names --- STM32F1/boards.txt | 6 +++--- STM32F1/platform.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/STM32F1/boards.txt b/STM32F1/boards.txt index 59e476e..77ff7ba 100644 --- a/STM32F1/boards.txt +++ b/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 diff --git a/STM32F1/platform.txt b/STM32F1/platform.txt index f9979c9..e9c518c 100644 --- a/STM32F1/platform.txt +++ b/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