From c4ffe74d71c6f771e6d4150d10c72f2e35519634 Mon Sep 17 00:00:00 2001 From: Bob Kuhn Date: Mon, 13 Jan 2020 00:26:17 -0600 Subject: [PATCH] Add SERVO, TONE timers to variant for better STEVAL_3DP001V1 support (#16538) --- Marlin/src/gcode/feature/powerloss/M1000.cpp | 2 +- Marlin/src/lcd/language/language_ru.h | 2 +- .../share/PlatformIO/variants/STEVAL_F401VE/variant.h | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp index ac2194e1a..8462dbe81 100644 --- a/Marlin/src/gcode/feature/powerloss/M1000.cpp +++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp @@ -58,7 +58,7 @@ void GcodeSuite::M1000() { if (parser.seen('S')) { #if HAS_LCD_MENU ui.goto_screen(menu_job_recovery); - #elif ENABLED(EXTENSIBLE_UI) + #elif ENABLED(EXTENSIBLE_UI) ExtUI::OnPowerLossResume(); #else SERIAL_ECHO_MSG("Resume requires LCD."); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 8c42958fc..00b351b03 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -396,7 +396,7 @@ namespace Language_ru { PROGMEM Language_Str MSG_INFO_PROTOCOL = _UxGT("Протокол"); PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF = _UxGT("Контроль темп.: Выкл"); PROGMEM Language_Str MSG_INFO_RUNAWAY_ON = _UxGT("Контроль темп.: Вкл"); - + PROGMEM Language_Str MSG_CASE_LIGHT = _UxGT("Подсветка корпуса"); PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Яркость подсветки"); PROGMEM Language_Str MSG_EXPECTED_PRINTER = _UxGT("Неверный принтер"); diff --git a/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h b/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h index d93fc07db..34ec6bd7e 100644 --- a/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h +++ b/buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h @@ -190,6 +190,14 @@ extern "C" { #define PIN_SERIAL_RX PA10 #define PIN_SERIAL_TX PA9 + +// Timer Definitions +//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c +#define TIMER_TONE TIM10 + +// Do not use basic timer: OC is required +#define TIMER_SERVO TIM11 //TODO: advanced-control timers don't work + /* SD detect signal */ /* * By default, R67 is not provided, so SD card detect is not used.