浏览代码

Merge branch 'Development' into manual-bed-leveling+mesh-bed-level

Edward Patel 10 年前
父节点
当前提交
4619d80524
共有 2 个文件被更改,包括 20 次插入19 次删除
  1. 2
    2
      Marlin/Marlin_main.cpp
  2. 18
    17
      Marlin/dogm_lcd_implementation.h

+ 2
- 2
Marlin/Marlin_main.cpp 查看文件

2588
    */
2588
    */
2589
   inline void gcode_M28() {
2589
   inline void gcode_M28() {
2590
     char* codepos = strchr_pointer + 4;
2590
     char* codepos = strchr_pointer + 4;
2591
-    char* starpos = strchr(strchr_pointer + 4, '*');
2591
+    char* starpos = strchr(codepos, '*');
2592
     if (starpos) {
2592
     if (starpos) {
2593
       char* npos = strchr(cmdbuffer[bufindr], 'N');
2593
       char* npos = strchr(cmdbuffer[bufindr], 'N');
2594
       strchr_pointer = strchr(npos, ' ') + 1;
2594
       strchr_pointer = strchr(npos, ' ') + 1;
2595
       *(starpos) = '\0';
2595
       *(starpos) = '\0';
2596
     }
2596
     }
2597
-    card.openFile(strchr_pointer + 4, false);
2597
+    card.openFile(codepos, false);
2598
   }
2598
   }
2599
 
2599
 
2600
   /**
2600
   /**

+ 18
- 17
Marlin/dogm_lcd_implementation.h 查看文件

197
       u8g.drawBox(55, 50, (unsigned int)(71.f * card.percentDone() / 100.f), 2);
197
       u8g.drawBox(55, 50, (unsigned int)(71.f * card.percentDone() / 100.f), 2);
198
     }
198
     }
199
 
199
 
200
-    u8g.setPrintPos(80,47);
200
+    u8g.setPrintPos(80,48);
201
     if (starttime != 0) {
201
     if (starttime != 0) {
202
       uint16_t time = (millis() - starttime) / 60000;
202
       uint16_t time = (millis() - starttime) / 60000;
203
       u8g.print(itostr2(time/60));
203
       u8g.print(itostr2(time/60));
231
     }
231
     }
232
 
232
 
233
   // X, Y, Z-Coordinates
233
   // X, Y, Z-Coordinates
234
+  #define XYZ_BASELINE 38
234
   u8g.setFont(FONT_STATUSMENU);
235
   u8g.setFont(FONT_STATUSMENU);
235
-  u8g.drawBox(0,29,128,10);
236
+  u8g.drawBox(0,30,128,9);
236
   u8g.setColorIndex(0); // white on black
237
   u8g.setColorIndex(0); // white on black
237
-  u8g.setPrintPos(2,37);
238
+  u8g.setPrintPos(2,XYZ_BASELINE);
238
   u8g.print('X');
239
   u8g.print('X');
239
-  u8g.drawPixel(8,33);
240
-  u8g.drawPixel(8,35);
241
-  u8g.setPrintPos(10,37);
240
+  u8g.drawPixel(8,XYZ_BASELINE - 5);
241
+  u8g.drawPixel(8,XYZ_BASELINE - 3);
242
+  u8g.setPrintPos(10,XYZ_BASELINE);
242
   u8g.print(ftostr31ns(current_position[X_AXIS]));
243
   u8g.print(ftostr31ns(current_position[X_AXIS]));
243
-  u8g.setPrintPos(43,37);
244
-  lcd_printPGM(PSTR("Y"));
245
-  u8g.drawPixel(49,33);
246
-  u8g.drawPixel(49,35);
247
-  u8g.setPrintPos(51,37);
244
+  u8g.setPrintPos(43,XYZ_BASELINE);
245
+  u8g.print('Y');
246
+  u8g.drawPixel(49,XYZ_BASELINE - 5);
247
+  u8g.drawPixel(49,XYZ_BASELINE - 3);
248
+  u8g.setPrintPos(51,XYZ_BASELINE);
248
   u8g.print(ftostr31ns(current_position[Y_AXIS]));
249
   u8g.print(ftostr31ns(current_position[Y_AXIS]));
249
-  u8g.setPrintPos(83,37);
250
+  u8g.setPrintPos(83,XYZ_BASELINE);
250
   u8g.print('Z');
251
   u8g.print('Z');
251
-  u8g.drawPixel(89,33);
252
-  u8g.drawPixel(89,35);
253
-  u8g.setPrintPos(91,37);
252
+  u8g.drawPixel(89,XYZ_BASELINE - 5);
253
+  u8g.drawPixel(89,XYZ_BASELINE - 3);
254
+  u8g.setPrintPos(91,XYZ_BASELINE);
254
   u8g.print(ftostr31(current_position[Z_AXIS]));
255
   u8g.print(ftostr31(current_position[Z_AXIS]));
255
   u8g.setColorIndex(1); // black on white
256
   u8g.setColorIndex(1); // black on white
256
  
257
  
259
   u8g.setPrintPos(3,49);
260
   u8g.setPrintPos(3,49);
260
   u8g.print(LCD_STR_FEEDRATE[0]);
261
   u8g.print(LCD_STR_FEEDRATE[0]);
261
   u8g.setFont(FONT_STATUSMENU);
262
   u8g.setFont(FONT_STATUSMENU);
262
-  u8g.setPrintPos(12,48);
263
+  u8g.setPrintPos(12,49);
263
   u8g.print(itostr3(feedmultiply));
264
   u8g.print(itostr3(feedmultiply));
264
   u8g.print('%');
265
   u8g.print('%');
265
 
266
 
266
   // Status line
267
   // Status line
267
   u8g.setFont(FONT_STATUSMENU);
268
   u8g.setFont(FONT_STATUSMENU);
268
-  u8g.setPrintPos(0,61);
269
+  u8g.setPrintPos(0,63);
269
   #ifndef FILAMENT_LCD_DISPLAY
270
   #ifndef FILAMENT_LCD_DISPLAY
270
     u8g.print(lcd_status_message);
271
     u8g.print(lcd_status_message);
271
   #else
272
   #else

正在加载...
取消
保存