Removed BOARD_LED_PIN and button pin definitions as they are not core Arduino API definitions and they were causing confusion on users of generic stm32 boards which don't all have an LED and even if they have an LED, the pin it is on is not always on the same pin depending on the model of generic board

Author: rogerclarkmelbourne

STM32F1/cores/maple/boards.h

@@ -76,7 +76,7 @@ extern const uint8 boardADCPins[];
  * @brief Pins which are connected to external hardware.
  *
  * For example, on Maple boards, it always at least includes
- * BOARD_LED_PIN.  Its length is BOARD_NR_USED_PINS.
+ * PB1 for the LED.  Its length is BOARD_NR_USED_PINS.
  */
 extern const uint8 boardUsedPins[];
 

STM32F1/cores/maple/io.h

@@ -143,68 +143,7 @@ uint32 digitalRead(uint8 pin);
  * @see pinMode()
  */
 uint16 analogRead(uint8 pin);
-#if FALSE
-// Roger Clark. Deprecated these functions as they are not part of the standard Arduino API
 
-/**
- * Toggles the digital value at the given pin.
- *
- * The pin must have its mode set to OUTPUT.
- *
- * @param pin the pin to toggle.  If the pin is HIGH, set it LOW.  If
- * it is LOW, set it HIGH.
- *
- * @see pinMode()
- */
-void togglePin(uint8 pin);
-
-/**
- * Toggle the LED.
- *
- * If the LED is on, turn it off.  If it is off, turn it on.
- *
- * The LED must its mode set to OUTPUT. This can be accomplished
- * portably over all LeafLabs boards by calling pinMode(BOARD_LED_PIN,
- * OUTPUT) before calling this function.
- *
- * @see pinMode()
- */
-static inline void toggleLED() {
-    togglePin(BOARD_LED_PIN);
-}
-
-/**
- * If the button is currently pressed, waits until the button is no
- * longer being pressed, and returns true.  Otherwise, returns false.
- *
- * The button pin must have its mode set to INPUT.  This can be
- * accomplished portably over all LeafLabs boards by calling
- * pinMode(BOARD_BUTTON_PIN, INPUT).
- *
- * @see pinMode()
- */
-uint8 isButtonPressed(uint8 pin=BOARD_BUTTON_PIN,
-                      uint32 pressedLevel=BOARD_BUTTON_PRESSED_LEVEL);
-
-/**
- * Wait until the button is pressed and released, timing out if no
- * press occurs.
- *
- * The button pin must have its mode set to INPUT.  This can be
- * accomplished portably over all LeafLabs boards by calling
- * pinMode(BOARD_BUTTON_PIN, INPUT).
- *
- * @param timeout_millis Number of milliseconds to wait until the
- * button is pressed.  If timeout_millis is left out (or 0), wait
- * forever.
- *
- * @return true, if the button was pressed; false, if the timeout was
- * reached.
- *
- * @see pinMode()
- */
-uint8 waitForButtonPress(uint32 timeout_millis=0);
-#endif
 /**
  * Shift out a byte of data, one bit at a time.
  *

STM32F1/libraries/Untested/RTClock/examples/Test_RTClock/Test_RTClock.ino

@@ -11,7 +11,7 @@ void blink () {
 }
 
 void setup() {
-pinMode(BOARD_LED_PIN, OUTPUT);
+pinMode(PB1, OUTPUT);// Roger Clark. Updated for removal of LED pin as a global define (PB1 is Maple mini LED Pin)
 
 rt.attachSecondsInterrupt(blink);
 }

STM32F1/variants/generic_stm32f103c/board.cpp

@@ -107,5 +107,5 @@ extern const uint8 boardADCPins[BOARD_NR_ADC_PINS] __FLASH__ = {
 
 // NOte. These definitions are not really used for generic boards, they only relate to boards modified to behave like Maple boards
 extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = {
-    BOARD_LED_PIN, BOARD_BUTTON_PIN, USB_DP, USB_DM
+     USB_DP, USB_DM
 };

STM32F1/variants/generic_stm32f103c/board/board.h

@@ -39,9 +39,6 @@
 #define CYCLES_PER_MICROSECOND    72
 #define SYSTICK_RELOAD_VAL     71999 /* takes a cycle to reload */
 
-#define BOARD_BUTTON_PIN          32
-#define BOARD_LED_PIN             33
-
 #define BOARD_NR_USARTS           3
 #define BOARD_USART1_TX_PIN       PA9
 #define BOARD_USART1_RX_PIN       PA10

STM32F1/variants/generic_stm32f103rxx/board.cpp

@@ -145,6 +145,6 @@ extern const uint8 boardADCPins[BOARD_NR_ADC_PINS] __FLASH__ = {
 
 /* not sure what this us used for */
 extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = {
-    BOARD_LED_PIN, BOARD_BUTTON_PIN, BOARD_JTMS_SWDIO_PIN,
+    BOARD_JTMS_SWDIO_PIN,
     BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN
 };

STM32F1/variants/generic_stm32f103rxx/board/board.h

@@ -41,9 +41,6 @@
 #define CYCLES_PER_MICROSECOND  72
 #define SYSTICK_RELOAD_VAL      71999 /* takes a cycle to reload */
 
-#define BOARD_BUTTON_PIN        38
-#define BOARD_LED_PIN           13
-
 // USARTS
 #define BOARD_NR_USARTS         5
 #define BOARD_USART1_TX_PIN     PA9

STM32F1/variants/generic_stm32f103zxx/board.cpp

@@ -210,6 +210,6 @@ extern const uint8 boardADCPins[BOARD_NR_ADC_PINS] __FLASH__ = {
 
 /* not sure what this us used for */
 extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = {
-    BOARD_LED_PIN, BOARD_BUTTON_PIN, BOARD_JTMS_SWDIO_PIN,
+    BOARD_JTMS_SWDIO_PIN,
     BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN
 };

STM32F1/variants/generic_stm32f103zxx/board/board.h

@@ -41,9 +41,6 @@
 #define CYCLES_PER_MICROSECOND  72
 #define SYSTICK_RELOAD_VAL      71999 /* takes a cycle to reload */
 
-#define BOARD_BUTTON_PIN        38
-#define BOARD_LED_PIN           13
-
 // USARTS
 #define BOARD_NR_USARTS         5
 #define BOARD_USART1_TX_PIN     PA9

STM32F1/variants/maple/board.cpp

@@ -138,6 +138,6 @@ extern const uint8 boardADCPins[] __FLASH__ = {
 // the button and the LED, it's usually best to leave these pins alone
 // unless you know what you're doing.
 extern const uint8 boardUsedPins[] __FLASH__ = {
-    BOARD_LED_PIN, BOARD_BUTTON_PIN, BOARD_JTMS_SWDIO_PIN,
+    13, 33, BOARD_JTMS_SWDIO_PIN,
     BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN
 };