Rakefile: rename STLINKV2_ALU to STLINKV2
This commit is contained in:
parent
a46d35e6bd
commit
f4a000b4e6
2
Rakefile
2
Rakefile
|
@ -14,7 +14,7 @@ APPLICATION = "application"
|
||||||
FIRMWARES = [BOOTLOADER, APPLICATION]
|
FIRMWARES = [BOOTLOADER, APPLICATION]
|
||||||
|
|
||||||
# which development board is used
|
# which development board is used
|
||||||
# supported are: SYSTEM_BOARD, MAPLE_MINI, BLUE_PILL, CORE_BOARD, STLINKV2_ALU, BUSVOODOO
|
# supported are: SYSTEM_BOARD, MAPLE_MINI, BLUE_PILL, CORE_BOARD, STLINKV2, BUSVOODOO
|
||||||
BOARD = ENV["BOARD"] || "CORE_BOARD"
|
BOARD = ENV["BOARD"] || "CORE_BOARD"
|
||||||
|
|
||||||
# libopencm3 definitions
|
# libopencm3 definitions
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
/* own libraries */
|
/* own libraries */
|
||||||
#include "global.h" // board definitions
|
#include "global.h" // board definitions
|
||||||
#include "print.h" // printing utilities
|
#include "print.h" // printing utilities
|
||||||
#if !defined(STLINKV2_ALU)
|
#if !defined(STLINKV2)
|
||||||
#include "uart.h" // USART utilities
|
#include "uart.h" // USART utilities
|
||||||
#endif
|
#endif
|
||||||
#include "usb_cdcacm.h" // USB CDC ACM utilities
|
#include "usb_cdcacm.h" // USB CDC ACM utilities
|
||||||
|
@ -69,14 +69,14 @@ size_t putc(char c)
|
||||||
static char last_c = 0; // to remember on which character we last sent
|
static char last_c = 0; // to remember on which character we last sent
|
||||||
if ('\n' == c) { // send carriage return (CR) + line feed (LF) newline for each LF
|
if ('\n' == c) { // send carriage return (CR) + line feed (LF) newline for each LF
|
||||||
if ('\r' != last_c) { // CR has not already been sent
|
if ('\r' != last_c) { // CR has not already been sent
|
||||||
#if !defined(STLINKV2_ALU)
|
#if !defined(STLINKV2)
|
||||||
uart_putchar_nonblocking('\r'); // send CR over USART
|
uart_putchar_nonblocking('\r'); // send CR over USART
|
||||||
#endif
|
#endif
|
||||||
usb_cdcacm_putchar('\r'); // send CR over USB
|
usb_cdcacm_putchar('\r'); // send CR over USB
|
||||||
length++; // remember we printed 1 character
|
length++; // remember we printed 1 character
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if !defined(STLINKV2_ALU)
|
#if !defined(STLINKV2)
|
||||||
uart_putchar_nonblocking(c); // send byte over USART
|
uart_putchar_nonblocking(c); // send byte over USART
|
||||||
#endif
|
#endif
|
||||||
usb_cdcacm_putchar(c); // send byte over USB
|
usb_cdcacm_putchar(c); // send byte over USB
|
||||||
|
@ -322,7 +322,7 @@ void main(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
board_setup(); // setup board
|
board_setup(); // setup board
|
||||||
#if !defined(STLINKV2_ALU)
|
#if !defined(STLINKV2)
|
||||||
uart_setup(); // setup USART (for printing)
|
uart_setup(); // setup USART (for printing)
|
||||||
#endif
|
#endif
|
||||||
usb_cdcacm_setup(); // setup USB CDC ACM (for printing)
|
usb_cdcacm_setup(); // setup USB CDC ACM (for printing)
|
||||||
|
@ -342,7 +342,7 @@ void main(void)
|
||||||
|
|
||||||
// setup RTC
|
// setup RTC
|
||||||
printf("setup internal RTC: ");
|
printf("setup internal RTC: ");
|
||||||
#if defined(BLUE_PILL) || defined(STLINKV2_ALU) // for boards without a Low Speed External oscillator
|
#if defined(BLUE_PILL) || defined(STLINKV2) // for boards without a Low Speed External oscillator
|
||||||
// note: the blue pill LSE oscillator is affected when toggling the onboard LED, thus prefer the HSE
|
// note: the blue pill LSE oscillator is affected when toggling the onboard LED, thus prefer the HSE
|
||||||
rtc_auto_awake(RCC_HSE, 8000000 / 128 - 1); // use High Speed External oscillator (8 MHz / 128) as RTC clock (VBAT can't be used to keep the RTC running)
|
rtc_auto_awake(RCC_HSE, 8000000 / 128 - 1); // use High Speed External oscillator (8 MHz / 128) as RTC clock (VBAT can't be used to keep the RTC running)
|
||||||
#else // for boards with an precise Low Speed External oscillator
|
#else // for boards with an precise Low Speed External oscillator
|
||||||
|
|
2
global.h
2
global.h
|
@ -625,7 +625,7 @@
|
||||||
#define LED_PORT B /**< GPIO port (port B on maple mini) */
|
#define LED_PORT B /**< GPIO port (port B on maple mini) */
|
||||||
#define LED_PIN 1 /**< GPIO pin (pin PB1 on maple mini) */
|
#define LED_PIN 1 /**< GPIO pin (pin PB1 on maple mini) */
|
||||||
#define LED_ON 1 /**< LED is on when pin is high */
|
#define LED_ON 1 /**< LED is on when pin is high */
|
||||||
#elif defined (STLINKV2_ALU) // it's actually a STM32F101, but it seems to have all STM32F103 features
|
#elif defined (STLINKV2) // it's actually a STM32F101, but it seems to have all STM32F103 features
|
||||||
/* on ST-Link V2 clone dongle in aluminum case LED is on pin PA9 (remap USART1_TX if used) */
|
/* on ST-Link V2 clone dongle in aluminum case LED is on pin PA9 (remap USART1_TX if used) */
|
||||||
#define LED_PORT A /**< GPIO port (port A) */
|
#define LED_PORT A /**< GPIO port (port A) */
|
||||||
#define LED_PIN 9 /**< GPIO pin (pin PA9) */
|
#define LED_PIN 9 /**< GPIO pin (pin PA9) */
|
||||||
|
|
Loading…
Reference in New Issue