Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
27455bba6c
2 changed files with 6 additions and 7 deletions
|
@ -15,11 +15,11 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* STM32F303xC memory setup.
|
||||
* STM32F303xB memory setup.
|
||||
*/
|
||||
MEMORY
|
||||
{
|
||||
flash0 (rx) : org = 0x08002000, len = 256k - 0x2000
|
||||
flash0 (rx) : org = 0x08002000, len = 128k - 0x2000
|
||||
flash1 (rx) : org = 0x00000000, len = 0
|
||||
flash2 (rx) : org = 0x00000000, len = 0
|
||||
flash3 (rx) : org = 0x00000000, len = 0
|
||||
|
@ -27,7 +27,7 @@ MEMORY
|
|||
flash5 (rx) : org = 0x00000000, len = 0
|
||||
flash6 (rx) : org = 0x00000000, len = 0
|
||||
flash7 (rx) : org = 0x00000000, len = 0
|
||||
ram0 (wx) : org = 0x20000000, len = 40k
|
||||
ram0 (wx) : org = 0x20000000, len = 32k
|
||||
ram1 (wx) : org = 0x00000000, len = 0
|
||||
ram2 (wx) : org = 0x00000000, len = 0
|
||||
ram3 (wx) : org = 0x00000000, len = 0
|
||||
|
@ -82,4 +82,4 @@ REGION_ALIAS("BSS_RAM", ram0);
|
|||
REGION_ALIAS("HEAP_RAM", ram0);
|
||||
|
||||
/* Generic rules inclusion.*/
|
||||
INCLUDE rules.ld
|
||||
INCLUDE rules.ld
|
||||
|
|
|
@ -12,7 +12,6 @@ bool is_launching = false;
|
|||
#if defined(DEFERRED_EXEC_ENABLE)
|
||||
# if defined(DYNAMIC_MACRO_ENABLE)
|
||||
deferred_token dynamic_macro_token = INVALID_DEFERRED_TOKEN;
|
||||
|
||||
static uint32_t dynamic_macro_led(uint32_t trigger_time, void *cb_arg) {
|
||||
static bool led_state = true;
|
||||
if (!is_launching) {
|
||||
|
@ -22,8 +21,8 @@ static uint32_t dynamic_macro_led(uint32_t trigger_time, void *cb_arg) {
|
|||
return 100;
|
||||
}
|
||||
|
||||
void dynamic_macro_record_start_user(void) {
|
||||
if (my_token == INVALID_DEFERRED_TOKEN) {
|
||||
void dynamic_macro_record_start_user(int8_t direction) {
|
||||
if (dynamic_macro_token == INVALID_DEFERRED_TOKEN) {
|
||||
STATUS_LED_3(true);
|
||||
dynamic_macro_token = defer_exec(100, dynamic_macro_led, NULL);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue