Kaynağa Gözat

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

Bob Kuhn 4 yıl önce
ebeveyn
işleme
c4ffe74d71

+ 1
- 1
Marlin/src/gcode/feature/powerloss/M1000.cpp Dosyayı Görüntüle

58
     if (parser.seen('S')) {
58
     if (parser.seen('S')) {
59
       #if HAS_LCD_MENU
59
       #if HAS_LCD_MENU
60
         ui.goto_screen(menu_job_recovery);
60
         ui.goto_screen(menu_job_recovery);
61
-      #elif ENABLED(EXTENSIBLE_UI)        
61
+      #elif ENABLED(EXTENSIBLE_UI)
62
         ExtUI::OnPowerLossResume();
62
         ExtUI::OnPowerLossResume();
63
       #else
63
       #else
64
         SERIAL_ECHO_MSG("Resume requires LCD.");
64
         SERIAL_ECHO_MSG("Resume requires LCD.");

+ 1
- 1
Marlin/src/lcd/language/language_ru.h Dosyayı Görüntüle

396
   PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Протокол");
396
   PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Протокол");
397
   PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Контроль темп.: Выкл");
397
   PROGMEM Language_Str MSG_INFO_RUNAWAY_OFF                = _UxGT("Контроль темп.: Выкл");
398
   PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Контроль темп.: Вкл");
398
   PROGMEM Language_Str MSG_INFO_RUNAWAY_ON                 = _UxGT("Контроль темп.: Вкл");
399
-  
399
+
400
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Подсветка корпуса");
400
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Подсветка корпуса");
401
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Яркость подсветки");
401
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Яркость подсветки");
402
   PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Неверный принтер");
402
   PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Неверный принтер");

+ 8
- 0
buildroot/share/PlatformIO/variants/STEVAL_F401VE/variant.h Dosyayı Görüntüle

190
 #define PIN_SERIAL_RX           PA10
190
 #define PIN_SERIAL_RX           PA10
191
 #define PIN_SERIAL_TX           PA9
191
 #define PIN_SERIAL_TX           PA9
192
 
192
 
193
+
194
+// Timer Definitions
195
+//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
196
+#define TIMER_TONE              TIM10
197
+
198
+// Do not use basic timer: OC is required
199
+#define TIMER_SERVO             TIM11  //TODO: advanced-control timers don't work
200
+
193
 /* SD detect signal */
201
 /* SD detect signal */
194
 /*
202
 /*
195
  * By default, R67 is not provided, so SD card detect is not used.
203
  * By default, R67 is not provided, so SD card detect is not used.

Loading…
İptal
Kaydet