From c70550ea571bd12120d8f711dadf5ad3d421b263 Mon Sep 17 00:00:00 2001 From: Christoph Haberer Date: Mon, 24 Apr 2017 21:49:56 +0200 Subject: [PATCH] led names now same as names from ST repo --- .../Blink_allLeds/Blink_allLeds.ino | 18 ++++++----- .../Discovery407VG/UserButton/UserButton.ino | 32 +++++++++++-------- .../Blink_allLeds/Blink_allLeds.ino | 2 -- .../Discovery429ZI/UserButton/UserButton.ino | 26 ++++++++------- STM32/variants/DISCOVERY_F407VG/variant.h | 24 ++++++++++---- STM32/variants/DISCOVERY_F429ZI/variant.h | 7 ++++ 6 files changed, 68 insertions(+), 41 deletions(-) diff --git a/STM32/libraries/BoardExamples/examples/Discovery407VG/Blink_allLeds/Blink_allLeds.ino b/STM32/libraries/BoardExamples/examples/Discovery407VG/Blink_allLeds/Blink_allLeds.ino index ab86033..78660ce 100644 --- a/STM32/libraries/BoardExamples/examples/Discovery407VG/Blink_allLeds/Blink_allLeds.ino +++ b/STM32/libraries/BoardExamples/examples/Discovery407VG/Blink_allLeds/Blink_allLeds.ino @@ -1,15 +1,17 @@ // blink all LEDs -// STM32F4 Discovery - -#define GREENLED PD12 -#define ORANGELED PD13 -#define REDLED PD14 -#define BLUELED PD15 -#define REDLEDOTGOVERCURRENT PD5 +// STM32F4 Discovery ( STM32F407VG ) +/* +#define LED_BUILTIN PD12 //18 +#define LED_GREEN LED_BUILTIN +#define LED_BLUE PD15 //58 +#define LED_RED PD13 //19 +#define LED_ORANGE PD13 //57 +#define LED_RED_OTG_OVERCURRENT PD5 +*/ #define NUMLEDS 5 -const uint8_t Led[] = {GREENLED, ORANGELED, REDLED, BLUELED, REDLEDOTGOVERCURRENT}; +const uint8_t Led[] = {LED_GREEN, LED_ORANGE, LED_RED, LED_BLUE, LED_RED_OTG_OVERCURRENT}; void setup() { diff --git a/STM32/libraries/BoardExamples/examples/Discovery407VG/UserButton/UserButton.ino b/STM32/libraries/BoardExamples/examples/Discovery407VG/UserButton/UserButton.ino index a31fe3f..eb4cce2 100644 --- a/STM32/libraries/BoardExamples/examples/Discovery407VG/UserButton/UserButton.ino +++ b/STM32/libraries/BoardExamples/examples/Discovery407VG/UserButton/UserButton.ino @@ -4,31 +4,37 @@ // red LED: button pressed // grenn LED: button not pressed -#define USERBUTTON PA0 +/* +// STM32F4 Discovery +// On-board LED pin number PIN // Arduino Pin Number +#define LED_BUILTIN PD12 // 18 +#define LED_GREEN LED_BUILTIN +#define LED_BLUE PD15 // 58 +#define LED_RED PD13 // 19 +#define LED_ORANGE PD13 // 57 +#define LED_RED_OTG_OVERCURRENT PD5 -#define GREENLED PD12 -#define ORANGELED PD13 -#define REDLED PD14 -#define BLUELED PD15 -#define REDLEDOTGOVERCURRENT PD5 +//On-board user button +#define USER_BTN PA0 // 2 +*/ void setup() { - pinMode(USERBUTTON, INPUT); // mandatory for STM MCUs, on Arduino Uno working without - pinMode(GREENLED, OUTPUT); - pinMode(REDLED, OUTPUT); + pinMode(USER_BTN, INPUT); // mandatory for STM MCUs, on Arduino Uno working without + pinMode(LED_GREEN, OUTPUT); + pinMode(LED_RED, OUTPUT); } void loop() { - if ( digitalRead(USERBUTTON) )digitalWrite(REDLED , HIGH); - else digitalWrite(GREENLED, HIGH); + if ( digitalRead( USER_BTN ) )digitalWrite(LED_RED , HIGH); + else digitalWrite(LED_GREEN, HIGH); delay(100); // leds off - digitalWrite(GREENLED, LOW); - digitalWrite(REDLED , LOW); + digitalWrite(LED_GREEN, LOW); + digitalWrite(LED_RED , LOW); delay(100); } diff --git a/STM32/libraries/BoardExamples/examples/Discovery429ZI/Blink_allLeds/Blink_allLeds.ino b/STM32/libraries/BoardExamples/examples/Discovery429ZI/Blink_allLeds/Blink_allLeds.ino index fe025b7..8bc8967 100644 --- a/STM32/libraries/BoardExamples/examples/Discovery429ZI/Blink_allLeds/Blink_allLeds.ino +++ b/STM32/libraries/BoardExamples/examples/Discovery429ZI/Blink_allLeds/Blink_allLeds.ino @@ -6,8 +6,6 @@ #define REDLED PG14 #define OTGFSOC_LED PC5 - - #define NUMLEDS 3 const uint8_t Led[] = {GREENLED, REDLED, OTGFSOC_LED}; diff --git a/STM32/libraries/BoardExamples/examples/Discovery429ZI/UserButton/UserButton.ino b/STM32/libraries/BoardExamples/examples/Discovery429ZI/UserButton/UserButton.ino index e324fcc..d9f96ed 100644 --- a/STM32/libraries/BoardExamples/examples/Discovery429ZI/UserButton/UserButton.ino +++ b/STM32/libraries/BoardExamples/examples/Discovery429ZI/UserButton/UserButton.ino @@ -4,29 +4,33 @@ // red LED: button pressed // grenn LED: button not pressed -#define USERBUTTON PA0 +/* +#define LED_BUILTIN PG13 +#define LED_GREEN LED_BUILTIN +#define LED_RED PG14 +#define LED_RED_OTG_OVERCURRENT PC5 - -#define GREENLED PG13 -#define REDLED PG14 +//On-board user button +#define USER_BTN PA0 +*/ void setup() { - pinMode(USERBUTTON, INPUT); // mandatory for STM MCUs, on Arduino Uno working without - pinMode(GREENLED, OUTPUT); - pinMode(REDLED, OUTPUT); + pinMode(USER_BTN, INPUT); // mandatory for STM MCUs, on Arduino Uno working without + pinMode(LED_GREEN, OUTPUT); + pinMode(LED_RED, OUTPUT); } void loop() { - if ( digitalRead(USERBUTTON) )digitalWrite(REDLED , HIGH); - else digitalWrite(GREENLED, HIGH); + if ( digitalRead( USER_BTN ) )digitalWrite(LED_RED , HIGH); + else digitalWrite(LED_GREEN, HIGH); delay(100); // leds off - digitalWrite(GREENLED, LOW); - digitalWrite(REDLED , LOW); + digitalWrite(LED_GREEN, LOW); + digitalWrite(LED_RED , LOW); delay(100); } diff --git a/STM32/variants/DISCOVERY_F407VG/variant.h b/STM32/variants/DISCOVERY_F407VG/variant.h index 48abe8d..3eb130d 100644 --- a/STM32/variants/DISCOVERY_F407VG/variant.h +++ b/STM32/variants/DISCOVERY_F407VG/variant.h @@ -1,17 +1,27 @@ #ifndef VARIANT_H #define VARIANT_H -#define LED_BUILTIN PD12 +//On-board LED pin number PIN // Arduino Pin Number +#define LED_BUILTIN PD12 // 18 +#define LED_GREEN LED_BUILTIN +#define LED_BLUE PD15 // 58 +#define LED_RED PD14 // 19 +#define LED_ORANGE PD13 // 57 +#define LED_RED_OTG_OVERCURRENT PD5 + +//On-board user button +#define USER_BTN PA0 // 2 + // Connected to on board LIS3DSH accelerometer, CS: PE3 -#define MOSI PA7 -#define MISO PA6 -#define SCK PA5 -#define SS PA4 +#define MOSI PA7 +#define MISO PA6 +#define SCK PA5 +#define SS PA4 // Connected to on board CS43L22 audio -#define SDA PB9 -#define SCL PB6 +#define SDA PB9 +#define SCL PB6 enum { PA0 , diff --git a/STM32/variants/DISCOVERY_F429ZI/variant.h b/STM32/variants/DISCOVERY_F429ZI/variant.h index 7916b45..6a653b6 100644 --- a/STM32/variants/DISCOVERY_F429ZI/variant.h +++ b/STM32/variants/DISCOVERY_F429ZI/variant.h @@ -2,6 +2,13 @@ #define VARIANT_H #define LED_BUILTIN PG13 +#define LED_GREEN LED_BUILTIN +#define LED_RED PG14 +#define LED_RED_OTG_OVERCURRENT PC5 + +//On-board user button +#define USER_BTN PA0 + // Connected to on board LIS3DSH accelerometer, CS: PE3 #define MOSI PA7