Просмотр исходного кода

Introduce axis_homed

Introduce additional variable axis_homed to replace axix_known_position
when the coordinate display should indicate the axis is not homed.
This is to distinguish between "not homed" and "inexact position possible
because stepper was disabled".

# Conflicts:
#	Marlin/ultralcd_implementation_hitachi_HD44780.h
solved
AnHardt 9 лет назад
Родитель
Сommit
051325ccd7

+ 1
- 0
Marlin/Marlin.h Просмотреть файл

259
 extern float min_pos[3]; // axis[n].min_pos
259
 extern float min_pos[3]; // axis[n].min_pos
260
 extern float max_pos[3]; // axis[n].max_pos
260
 extern float max_pos[3]; // axis[n].max_pos
261
 extern bool axis_known_position[3]; // axis[n].is_known
261
 extern bool axis_known_position[3]; // axis[n].is_known
262
+extern bool axis_homed[3]; // axis[n].is_homed
262
 
263
 
263
 #if ENABLED(DELTA)
264
 #if ENABLED(DELTA)
264
   extern float delta[3];
265
   extern float delta[3];

+ 2
- 0
Marlin/Marlin_main.cpp Просмотреть файл

245
 float current_position[NUM_AXIS] = { 0.0 };
245
 float current_position[NUM_AXIS] = { 0.0 };
246
 static float destination[NUM_AXIS] = { 0.0 };
246
 static float destination[NUM_AXIS] = { 0.0 };
247
 bool axis_known_position[3] = { false };
247
 bool axis_known_position[3] = { false };
248
+bool axis_homed[3] = { false };
248
 
249
 
249
 static long gcode_N, gcode_LastN, Stopped_gcode_LastN = 0;
250
 static long gcode_N, gcode_LastN, Stopped_gcode_LastN = 0;
250
 
251
 
1981
     feedrate = 0.0;
1982
     feedrate = 0.0;
1982
     endstops_hit_on_purpose(); // clear endstop hit flags
1983
     endstops_hit_on_purpose(); // clear endstop hit flags
1983
     axis_known_position[axis] = true;
1984
     axis_known_position[axis] = true;
1985
+    axis_homed[axis] = true;
1984
 
1986
 
1985
     #if ENABLED(Z_PROBE_SLED)
1987
     #if ENABLED(Z_PROBE_SLED)
1986
       // bring Z probe back
1988
       // bring Z probe back

+ 3
- 3
Marlin/dogm_lcd_implementation.h Просмотреть файл

352
   u8g.drawPixel(8, XYZ_BASELINE - 5);
352
   u8g.drawPixel(8, XYZ_BASELINE - 5);
353
   u8g.drawPixel(8, XYZ_BASELINE - 3);
353
   u8g.drawPixel(8, XYZ_BASELINE - 3);
354
   u8g.setPrintPos(10, XYZ_BASELINE);
354
   u8g.setPrintPos(10, XYZ_BASELINE);
355
-  if (axis_known_position[X_AXIS] || (blink & 1))
355
+  if (axis_homed[X_AXIS] || (blink & 1))
356
     lcd_print(ftostr31ns(current_position[X_AXIS]));
356
     lcd_print(ftostr31ns(current_position[X_AXIS]));
357
   else
357
   else
358
     lcd_printPGM(PSTR("---"));
358
     lcd_printPGM(PSTR("---"));
361
   u8g.drawPixel(49, XYZ_BASELINE - 5);
361
   u8g.drawPixel(49, XYZ_BASELINE - 5);
362
   u8g.drawPixel(49, XYZ_BASELINE - 3);
362
   u8g.drawPixel(49, XYZ_BASELINE - 3);
363
   u8g.setPrintPos(51, XYZ_BASELINE);
363
   u8g.setPrintPos(51, XYZ_BASELINE);
364
-  if (axis_known_position[Y_AXIS] || (blink & 1))
364
+  if (axis_homed[Y_AXIS] || (blink & 1))
365
     lcd_print(ftostr31ns(current_position[Y_AXIS]));
365
     lcd_print(ftostr31ns(current_position[Y_AXIS]));
366
   else
366
   else
367
     lcd_printPGM(PSTR("---"));
367
     lcd_printPGM(PSTR("---"));
370
   u8g.drawPixel(89, XYZ_BASELINE - 5);
370
   u8g.drawPixel(89, XYZ_BASELINE - 5);
371
   u8g.drawPixel(89, XYZ_BASELINE - 3);
371
   u8g.drawPixel(89, XYZ_BASELINE - 3);
372
   u8g.setPrintPos(91, XYZ_BASELINE);
372
   u8g.setPrintPos(91, XYZ_BASELINE);
373
-  if (axis_known_position[Z_AXIS] || (blink & 1))
373
+  if (axis_homed[Z_AXIS] || (blink & 1))
374
     lcd_print(ftostr32sp(current_position[Z_AXIS]));
374
     lcd_print(ftostr32sp(current_position[Z_AXIS]));
375
   else
375
   else
376
     lcd_printPGM(PSTR("---.--"));
376
     lcd_printPGM(PSTR("---.--"));

+ 3
- 3
Marlin/ultralcd_implementation_hitachi_HD44780.h Просмотреть файл

617
       #else
617
       #else
618
 
618
 
619
         lcd.print('X');
619
         lcd.print('X');
620
-        if (axis_known_position[X_AXIS] || (blink & 1))
620
+        if (axis_homed[X_AXIS] || (blink & 1))
621
           lcd.print(ftostr4sign(current_position[X_AXIS]));
621
           lcd.print(ftostr4sign(current_position[X_AXIS]));
622
         else
622
         else
623
           lcd_printPGM(PSTR(" ---"));
623
           lcd_printPGM(PSTR(" ---"));
624
 
624
 
625
         lcd_printPGM(PSTR("  Y"));
625
         lcd_printPGM(PSTR("  Y"));
626
-        if (axis_known_position[Y_AXIS] || (blink & 1))
626
+        if (axis_homed[Y_AXIS] || (blink & 1))
627
           lcd.print(ftostr4sign(current_position[Y_AXIS]));
627
           lcd.print(ftostr4sign(current_position[Y_AXIS]));
628
         else
628
         else
629
           lcd_printPGM(PSTR(" ---"));
629
           lcd_printPGM(PSTR(" ---"));
634
 
634
 
635
     lcd.setCursor(LCD_WIDTH - 8, 1);
635
     lcd.setCursor(LCD_WIDTH - 8, 1);
636
     lcd_printPGM(PSTR("Z "));
636
     lcd_printPGM(PSTR("Z "));
637
-    if (axis_known_position[Z_AXIS] || (blink & 1))
637
+    if (axis_homed[Z_AXIS] || (blink & 1))
638
       lcd.print(ftostr32sp(current_position[Z_AXIS] + 0.00001));
638
       lcd.print(ftostr32sp(current_position[Z_AXIS] + 0.00001));
639
     else
639
     else
640
       lcd_printPGM(PSTR("---.--"));
640
       lcd_printPGM(PSTR("---.--"));

Загрузка…
Отмена
Сохранить