zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add SERVO, TONE timers to variant for better STEVAL_3DP001V1 support (#16538)

Browse source
This commit is contained in:
Bob Kuhn 2020-01-13 00:26:17 -06:00 committed by Scott Lahteine
parent 55b2af9464
commit c4ffe74d71
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/gcode/feature/powerloss/M1000.cpp
View file

@ -58,7 +58,7 @@ void GcodeSuite::M1000() {
if (parser.seen('S')) { if (parser.seen('S')) {
#if HAS_LCD_MENU #if HAS_LCD_MENU
ui.goto_screen(menu_job_recovery); ui.goto_screen(menu_job_recovery);
#elif ENABLED(EXTENSIBLE_UI) #elif ENABLED(EXTENSIBLE_UI)
ExtUI::OnPowerLossResume(); ExtUI::OnPowerLossResume();
#else #else
SERIAL_ECHO_MSG("Resume requires LCD."); SERIAL_ECHO_MSG("Resume requires LCD.");

2
Marlin/src/lcd/language/language_ru.h
View file

@ -396,7 +396,7 @@ namespace Language_ru {
PROGMEM Language_Str MSG_INFO_PROTOCOL = _UxGT("Протокол"); PROGMEM Language_Str MSG_INFO_PROTOCOL = _UxGT("Протокол");
PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF = _UxGT("Контроль темп.: Выкл"); PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF = _UxGT("Контроль темп.: Выкл");
PROGMEM Language_Str MSG_INFO_RUNAWAY_ON = _UxGT("Контроль темп.: Вкл"); PROGMEM Language_Str MSG_INFO_RUNAWAY_ON = _UxGT("Контроль темп.: Вкл");
PROGMEM Language_Str MSG_CASE_LIGHT = _UxGT("Подсветка корпуса"); PROGMEM Language_Str MSG_CASE_LIGHT = _UxGT("Подсветка корпуса");
PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Яркость подсветки"); PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Яркость подсветки");
PROGMEM Language_Str MSG_EXPECTED_PRINTER = _UxGT("Неверный принтер"); PROGMEM Language_Str MSG_EXPECTED_PRINTER = _UxGT("Неверный принтер");

8
buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h
View file

@ -190,6 +190,14 @@ extern "C" {
#define PIN_SERIAL_RX PA10 #define PIN_SERIAL_RX PA10
#define PIN_SERIAL_TX PA9 #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 */ /* SD detect signal */
/* /*
* By default, R67 is not provided, so SD card detect is not used. * By default, R67 is not provided, so SD card detect is not used.