0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #7027 from thinkyhead/bf_water_is_wet

Browse source 
Followup to German language update
This commit is contained in:
Scott Lahteine 2017-06-10 19:04:19 -05:00 committed by GitHub
parent 6c9b5ab8e8 57a51fd5db
commit ec61b07836
5 changed files with 70 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/G26_Mesh_Validation_Tool.cpp
View file

@ -684,7 +684,8 @@
SERIAL_PROTOCOLLNPGM("?Prime length must be specified when not using an LCD."); SERIAL_PROTOCOLLNPGM("?Prime length must be specified when not using an LCD.");
return UBL_ERR; return UBL_ERR;
#endif #endif
} else { }
else {
g26_prime_flag++; g26_prime_flag++;
g26_prime_length = parser.value_linear_units(); g26_prime_length = parser.value_linear_units();
if (!WITHIN(g26_prime_length, 0.0, 25.0)) { if (!WITHIN(g26_prime_length, 0.0, 25.0)) {
@ -727,7 +728,9 @@
if (!parser.seen('R')) { if (!parser.seen('R')) {
SERIAL_PROTOCOLLNPGM("?(R)epeat must be specified when not using an LCD."); SERIAL_PROTOCOLLNPGM("?(R)epeat must be specified when not using an LCD.");
return UBL_ERR; return UBL_ERR;
} else g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1; }
else
g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1;
#endif #endif
if (g26_repeats < 1) { if (g26_repeats < 1) {
SERIAL_PROTOCOLLNPGM("?(R)epeat value not plausible; must be at least 1."); SERIAL_PROTOCOLLNPGM("?(R)epeat value not plausible; must be at least 1.");

3
Marlin/MarlinSerial.cpp
View file

@ -320,7 +320,8 @@
// space for us. // space for us.
if (TEST(M_UCSRxA, M_UDREx)) if (TEST(M_UCSRxA, M_UDREx))
_tx_udr_empty_irq(); _tx_udr_empty_irq();
} else { }
else {
// nop, the interrupt handler will free up space for us // nop, the interrupt handler will free up space for us
} }
} }

2
Marlin/language_de.h
View file

@ -221,7 +221,6 @@
#define MSG_CASE_LIGHT _UxGT("Beleuchtung") #define MSG_CASE_LIGHT _UxGT("Beleuchtung")
#define MSG_CASE_LIGHT_BRIGHTNESS _UxGT("Helligkeit") #define MSG_CASE_LIGHT_BRIGHTNESS _UxGT("Helligkeit")
#if ENABLED(AUTO_BED_LEVELING_UBL)
#define MSG_UBL_DOING_G29 _UxGT("G29 UBL läuft!") #define MSG_UBL_DOING_G29 _UxGT("G29 UBL läuft!")
#define MSG_UBL_UNHOMED _UxGT("Erst XYZ homen") #define MSG_UBL_UNHOMED _UxGT("Erst XYZ homen")
#define MSG_UBL_TOOLS _UxGT("UBL Tools") #define MSG_UBL_TOOLS _UxGT("UBL Tools")
@ -278,7 +277,6 @@
#define MSG_UBL_SAVE_ERROR _UxGT("ERR:UBL speichern") #define MSG_UBL_SAVE_ERROR _UxGT("ERR:UBL speichern")
#define MSG_UBL_RESTORE_ERROR _UxGT("ERR:UBL wiederherst.") #define MSG_UBL_RESTORE_ERROR _UxGT("ERR:UBL wiederherst.")
#define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Z-Versatz angehalten") #define MSG_UBL_Z_OFFSET_STOPPED _UxGT("Z-Versatz angehalten")
#endif // AUTO_BED_LEVELING_UBL
#if LCD_WIDTH >= 20 #if LCD_WIDTH >= 20
#define MSG_INFO_PRINT_COUNT _UxGT("Gesamte Drucke") #define MSG_INFO_PRINT_COUNT _UxGT("Gesamte Drucke")

6
Marlin/nozzle.cpp
View file

@ -136,7 +136,8 @@ void Nozzle::circle(
// Order of movement is pretty darn important here // Order of movement is pretty darn important here
do_blocking_move_to_xy(start.x, start.y); do_blocking_move_to_xy(start.x, start.y);
do_blocking_move_to_z(start.z); do_blocking_move_to_z(start.z);
} else { }
else {
do_blocking_move_to_z(start.z); do_blocking_move_to_z(start.z);
do_blocking_move_to_xy(start.x, start.y); do_blocking_move_to_xy(start.x, start.y);
} }
@ -160,7 +161,8 @@ void Nozzle::circle(
// As above order is important // As above order is important
do_blocking_move_to_z(initial.z); do_blocking_move_to_z(initial.z);
do_blocking_move_to_xy(initial.x, initial.y); do_blocking_move_to_xy(initial.x, initial.y);
} else { }
else {
do_blocking_move_to_xy(initial.x, initial.y); do_blocking_move_to_xy(initial.x, initial.y);
do_blocking_move_to_z(initial.z); do_blocking_move_to_z(initial.z);
} }

9
Marlin/planner.cpp
View file

@ -470,14 +470,9 @@ void Planner::check_axes_activity() {
if (fan_kick_end[f] == 0) { \ if (fan_kick_end[f] == 0) { \
fan_kick_end[f] = ms + FAN_KICKSTART_TIME; \ fan_kick_end[f] = ms + FAN_KICKSTART_TIME; \
tail_fan_speed[f] = 255; \ tail_fan_speed[f] = 255; \
} else { \ } else if (PENDING(ms, fan_kick_end[f])) \
if (PENDING(ms, fan_kick_end[f])) { \
tail_fan_speed[f] = 255; \ tail_fan_speed[f] = 255; \
} \ } else fan_kick_end[f] = 0
} \
} else { \
fan_kick_end[f] = 0; \
}
#if HAS_FAN0 #if HAS_FAN0
KICKSTART_FAN(0); KICKSTART_FAN(0);