Velleman customisations for dual heads.

birkett · Jun 14, 2016 · d9fca47 · d9fca47
1 parent 6fb94bf
commit d9fca47
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -84,7 +84,7 @@
 // #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
 
 // This defines the number of extruders
-#define EXTRUDERS 1
+#define EXTRUDERS 2
 
 //// The following define selects which power supply you have. Please choose the one that matches your setup
 // 1 = ATX
@@ -133,7 +133,7 @@
 // 110 is Pt100 with 1k pullup (non standard)
 
 #define TEMP_SENSOR_0 5
-#define TEMP_SENSOR_1 0
+#define TEMP_SENSOR_1 5
 #define TEMP_SENSOR_2 0
 #define TEMP_SENSOR_BED 5
 
@@ -444,7 +444,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
 #define DEFAULT_MAX_FEEDRATE          {160, 160, 10, 10000}    // (mm/sec)800
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.8000
 
-#define DEFAULT_ACCELERATION          6000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves1000
+#define DEFAULT_ACCELERATION          6000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
 #define DEFAULT_RETRACT_ACCELERATION  6000   // X, Y, Z and E max acceleration in mm/s^2 for r retracts
 
 // Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).

diff --git a/Marlin/language.h b/Marlin/language.h
@@ -74,7 +74,7 @@
 // Please note these can be 20 characters!
 
         #define MSG_SPLASH_NAME " VERTEX  3D PRINTER"
-        #define MSG_SPLASH_FIRMWARE "M:1.0 V:1.1  HEADS:1"
+        #define MSG_SPLASH_FIRMWARE "M:1.0 V:1.1  HEADS:2"
         #define MSG_SPLASH_WEBSITE1 " vertex3dprinter.eu"
         #define MSG_SPLASH_WEBSITE2 "    velleman.eu"
 

diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
@@ -519,16 +519,16 @@ static void lcd_preheat_pla_menu()
     START_MENU();
     MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu);
     MENU_ITEM(function, MSG_PREHEAT_PLA0, lcd_preheat_pla0);
-#if TEMP_SENSOR_1 != 0 //2 extruder preheat
+#if TEMP_SENSOR_1 >= 0 //2 extruder preheat
     MENU_ITEM(function, MSG_PREHEAT_PLA1, lcd_preheat_pla1);
 #endif //2 extruder preheat
-#if TEMP_SENSOR_2 != 0 //3 extruder preheat
-    MENU_ITEM(function, MSG_PREHEAT_PLA2, lcd_preheat_pla2);
-#endif //3 extruder preheat
-#if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 //all extruder preheat
+//#if TEMP_SENSOR_2 >= 0 //3 extruder preheat
+//    MENU_ITEM(function, MSG_PREHEAT_PLA2, lcd_preheat_pla2);
+//#endif //3 extruder preheat
+#if TEMP_SENSOR_1 >= 0 //|| TEMP_SENSOR_2 >= 0 //all extruder preheat
     MENU_ITEM(function, MSG_PREHEAT_PLA012, lcd_preheat_pla012);
 #endif //2 extruder preheat
-#if TEMP_SENSOR_BED != 0
+#if TEMP_SENSOR_BED >= 0
     MENU_ITEM(function, MSG_PREHEAT_PLA_BEDONLY, lcd_preheat_pla_bedonly);
 #endif
     END_MENU();
@@ -539,16 +539,16 @@ static void lcd_preheat_abs_menu()
     START_MENU();
     MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu);
     MENU_ITEM(function, MSG_PREHEAT_ABS0, lcd_preheat_abs0);
-#if TEMP_SENSOR_1 != 0 //2 extruder preheat
+#if TEMP_SENSOR_1 >= 0 //2 extruder preheat
     MENU_ITEM(function, MSG_PREHEAT_ABS1, lcd_preheat_abs1);
 #endif //2 extruder preheat
-#if TEMP_SENSOR_2 != 0 //3 extruder preheat
-    MENU_ITEM(function, MSG_PREHEAT_ABS2, lcd_preheat_abs2);
-#endif //3 extruder preheat
-#if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 //all extruder preheat
+//#if TEMP_SENSOR_2 >= 0 //3 extruder preheat
+//    MENU_ITEM(function, MSG_PREHEAT_ABS2, lcd_preheat_abs2);
+//#endif //3 extruder preheat
+#if TEMP_SENSOR_1 >= 0 //|| TEMP_SENSOR_2 != 0 //all extruder preheat
     MENU_ITEM(function, MSG_PREHEAT_ABS012, lcd_preheat_abs012);
 #endif //2 extruder preheat
-#if TEMP_SENSOR_BED != 0
+#if TEMP_SENSOR_BED >= 0
     MENU_ITEM(function, MSG_PREHEAT_ABS_BEDONLY, lcd_preheat_abs_bedonly);
 #endif
     END_MENU();
@@ -1058,7 +1058,7 @@ static void lcd_load_menu()
     START_MENU();
       MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu);
       MENU_ITEM(submenu, MSG_EXTRUDER_1, lcd_load_menu_EXT1);  
-      //MENU_ITEM(submenu, MSG_EXTRUDER_2, lcd_load_menu_EXT2);
+      MENU_ITEM(submenu, MSG_EXTRUDER_2, lcd_load_menu_EXT2);
     END_MENU();
 }
 
@@ -1067,7 +1067,7 @@ static void lcd_unload_menu()
     START_MENU(); 
       MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu);
       MENU_ITEM(submenu, MSG_EXTRUDER_1, lcd_unload_menu_EXT1);  
-      //MENU_ITEM(submenu, MSG_EXTRUDER_2, lcd_unload_menu_EXT2); 
+      MENU_ITEM(submenu, MSG_EXTRUDER_2, lcd_unload_menu_EXT2); 
     END_MENU();
 }
 

diff --git a/Marlin/ultralcd_implementation_hitachi_HD44780.h b/Marlin/ultralcd_implementation_hitachi_HD44780.h
@@ -374,8 +374,8 @@ Possible status screens:
 */
 static void lcd_implementation_status_screen()
 {
-    int tHotend=int(degHotend(0) + 0.5);
-    int tTarget=int(degTargetHotend(0) + 0.5);
+    int tHotend=int(degHotend(1) + 0.5);
+    int tTarget=int(degTargetHotend(1) + 0.5);
 
 #if LCD_WIDTH < 20
     lcd.setCursor(0, 0);
@@ -414,8 +414,8 @@ static void lcd_implementation_status_screen()
     //If we have an 2nd extruder or heated bed, show that in the top right corner
     lcd.setCursor(10, 0);
 #  if EXTRUDERS > 1
-    tHotend = int(degHotend(1) + 0.5);
-    tTarget = int(degTargetHotend(1) + 0.5);
+    tHotend = int(degHotend(0) + 0.5);
+    tTarget = int(degTargetHotend(0) + 0.5);
     lcd.print(LCD_STR_THERMOMETER[0]);
 #  else//Heated bed
     tHotend=int(degBed() + 0.5);