瀏覽代碼

Fixed compile errors in ultralcd when no ultra_lcd is selected.

Erik van der Zalm 13 年之前
父節點
當前提交
b985e4a134
共有 1 個文件被更改,包括 5 次插入2 次删除
  1. 5
    2
      Marlin/ultralcd.pde

+ 5
- 2
Marlin/ultralcd.pde 查看文件

414
       lcd.print(" ");
414
       lcd.print(" ");
415
     messagetext[0]='\0';
415
     messagetext[0]='\0';
416
   }
416
   }
417
-  
417
+#ifdef SDSUPPORT
418
   static uint8_t oldpercent=101;
418
   static uint8_t oldpercent=101;
419
   uint8_t percent=card.percentDone();
419
   uint8_t percent=card.percentDone();
420
   if(oldpercent!=percent ||force_lcd_update)
420
   if(oldpercent!=percent ||force_lcd_update)
423
     lcd.print(itostr3((int)percent));
423
     lcd.print(itostr3((int)percent));
424
     lcdprintPGM("%SD");
424
     lcdprintPGM("%SD");
425
   }
425
   }
426
-  
426
+#endif
427
 #else //smaller LCDS----------------------------------
427
 #else //smaller LCDS----------------------------------
428
   static int olddegHotEnd0=-1;
428
   static int olddegHotEnd0=-1;
429
   static int oldtargetHotEnd0=-1;
429
   static int oldtargetHotEnd0=-1;
478
   
478
   
479
 void MainMenu::showPrepare()
479
 void MainMenu::showPrepare()
480
 {
480
 {
481
+#ifdef ULTIPANEL
481
  uint8_t line=0;
482
  uint8_t line=0;
482
  clearIfNecessary();
483
  clearIfNecessary();
483
  for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
484
  for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
533
   line++;
534
   line++;
534
  }
535
  }
535
  updateActiveLines(ItemP_move,encoderpos);
536
  updateActiveLines(ItemP_move,encoderpos);
537
+#endif
536
 }
538
 }
537
 
539
 
538
 enum {
540
 enum {
1981
 #endif
1983
 #endif
1982
 }
1984
 }
1983
 
1985
 
1986
+
1984
 enum {ItemM_watch, ItemM_prepare, ItemM_control, ItemM_file };
1987
 enum {ItemM_watch, ItemM_prepare, ItemM_control, ItemM_file };
1985
 void MainMenu::showMainMenu()
1988
 void MainMenu::showMainMenu()
1986
 {
1989
 {

Loading…
取消
儲存