Przeglądaj źródła

Merge pull request #391 from STB3/Marlin_with_SD-Card_Change_Menu

Add SD-Card change and SD-Card init. for electronics equipped with LCD Display
daid 12 lat temu
rodzic
commit
5e2abfcdcd
2 zmienionych plików z 1462 dodań i 1454 usunięć
  1. 1450
    1448
      Marlin/language.h
  2. 12
    6
      Marlin/ultralcd.cpp

+ 1450
- 1448
Marlin/language.h
Plik diff jest za duży
Wyświetl plik


+ 12
- 6
Marlin/ultralcd.cpp Wyświetl plik

199
             MENU_ITEM(function, MSG_STOP_PRINT, lcd_sdcard_stop);
199
             MENU_ITEM(function, MSG_STOP_PRINT, lcd_sdcard_stop);
200
         }else{
200
         }else{
201
             MENU_ITEM(submenu, MSG_CARD_MENU, lcd_sdcard_menu);
201
             MENU_ITEM(submenu, MSG_CARD_MENU, lcd_sdcard_menu);
202
+#if SDCARDDETECT < 1
203
+			MENU_ITEM(gcode, MSG_CNG_SDCARD, PSTR("M21"));	// SD-card changed by user
204
+#endif			
202
         }
205
         }
203
     }else{
206
     }else{
204
         MENU_ITEM(submenu, MSG_NO_CARD, lcd_sdcard_menu);
207
         MENU_ITEM(submenu, MSG_NO_CARD, lcd_sdcard_menu);
208
+#if SDCARDDETECT < 1		
209
+		MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21"));	// Manually initialize the SD-card via user interface
210
+#endif		
205
     }
211
     }
206
 #endif
212
 #endif
207
     END_MENU();
213
     END_MENU();
516
     MENU_ITEM_EDIT(float52, MSG_YSTEPS, &axis_steps_per_unit[Y_AXIS], 5, 9999);
522
     MENU_ITEM_EDIT(float52, MSG_YSTEPS, &axis_steps_per_unit[Y_AXIS], 5, 9999);
517
     MENU_ITEM_EDIT(float51, MSG_ZSTEPS, &axis_steps_per_unit[Z_AXIS], 5, 9999);
523
     MENU_ITEM_EDIT(float51, MSG_ZSTEPS, &axis_steps_per_unit[Z_AXIS], 5, 9999);
518
     MENU_ITEM_EDIT(float51, MSG_ESTEPS, &axis_steps_per_unit[E_AXIS], 5, 9999);    
524
     MENU_ITEM_EDIT(float51, MSG_ESTEPS, &axis_steps_per_unit[E_AXIS], 5, 9999);    
519
-#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
520
-    MENU_ITEM_EDIT(bool, "Endstop abort", &abort_on_endstop_hit);
521
-#endif
525
+#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
526
+    MENU_ITEM_EDIT(bool, "Endstop abort", &abort_on_endstop_hit);
527
+#endif
522
     END_MENU();
528
     END_MENU();
523
 }
529
 }
524
 
530
 
889
 
895
 
890
 char *ftostr32(const float &x)
896
 char *ftostr32(const float &x)
891
 {
897
 {
892
-  long xx=x*100;
898
+  long xx=x*100;
893
   if (xx >= 0)
899
   if (xx >= 0)
894
-    conv[0]=(xx/10000)%10+'0';
895
-  else
900
+    conv[0]=(xx/10000)%10+'0';
901
+  else
896
     conv[0]='-';
902
     conv[0]='-';
897
   xx=abs(xx);
903
   xx=abs(xx);
898
   conv[1]=(xx/1000)%10+'0';
904
   conv[1]=(xx/1000)%10+'0';

Ładowanie…
Anuluj
Zapisz