Browse Source

Merge pull request #1098 from mattsch/optional_hotend_lcd

Make hotend optional when compiling with lcd support
Erik van der Zalm 10 years ago
parent
commit
83037542aa
1 changed files with 9 additions and 1 deletions
  1. 9
    1
      Marlin/ultralcd.cpp

+ 9
- 1
Marlin/ultralcd.cpp View File

374
     START_MENU();
374
     START_MENU();
375
     MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
375
     MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
376
     MENU_ITEM_EDIT(int3, MSG_SPEED, &feedmultiply, 10, 999);
376
     MENU_ITEM_EDIT(int3, MSG_SPEED, &feedmultiply, 10, 999);
377
+#if TEMP_SENSOR_0 != 0
377
     MENU_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
378
     MENU_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
379
+#endif
378
 #if TEMP_SENSOR_1 != 0
380
 #if TEMP_SENSOR_1 != 0
379
     MENU_ITEM_EDIT(int3, MSG_NOZZLE1, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
381
     MENU_ITEM_EDIT(int3, MSG_NOZZLE1, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
380
 #endif
382
 #endif
780
 
782
 
781
     START_MENU();
783
     START_MENU();
782
     MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
784
     MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
785
+#if TEMP_SENSOR_1 != 0
783
     MENU_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
786
     MENU_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
787
+#endif
784
 #if TEMP_SENSOR_1 != 0
788
 #if TEMP_SENSOR_1 != 0
785
     MENU_ITEM_EDIT(int3, MSG_NOZZLE1, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
789
     MENU_ITEM_EDIT(int3, MSG_NOZZLE1, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
786
 #endif
790
 #endif
791
     MENU_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 15);
795
     MENU_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 15);
792
 #endif
796
 #endif
793
     MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
797
     MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
794
-#ifdef AUTOTEMP
798
+#if defined AUTOTEMP && (TEMP_SENSOR_0 != 0)
795
     MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &autotemp_enabled);
799
     MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &autotemp_enabled);
796
     MENU_ITEM_EDIT(float3, MSG_MIN, &autotemp_min, 0, HEATER_0_MAXTEMP - 15);
800
     MENU_ITEM_EDIT(float3, MSG_MIN, &autotemp_min, 0, HEATER_0_MAXTEMP - 15);
797
     MENU_ITEM_EDIT(float3, MSG_MAX, &autotemp_max, 0, HEATER_0_MAXTEMP - 15);
801
     MENU_ITEM_EDIT(float3, MSG_MAX, &autotemp_max, 0, HEATER_0_MAXTEMP - 15);
816
     START_MENU();
820
     START_MENU();
817
     MENU_ITEM(back, MSG_TEMPERATURE, lcd_control_temperature_menu);
821
     MENU_ITEM(back, MSG_TEMPERATURE, lcd_control_temperature_menu);
818
     MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &plaPreheatFanSpeed, 0, 255);
822
     MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &plaPreheatFanSpeed, 0, 255);
823
+#if TEMP_SENSOR_0 != 0
819
     MENU_ITEM_EDIT(int3, MSG_NOZZLE, &plaPreheatHotendTemp, 0, HEATER_0_MAXTEMP - 15);
824
     MENU_ITEM_EDIT(int3, MSG_NOZZLE, &plaPreheatHotendTemp, 0, HEATER_0_MAXTEMP - 15);
825
+#endif
820
 #if TEMP_SENSOR_BED != 0
826
 #if TEMP_SENSOR_BED != 0
821
     MENU_ITEM_EDIT(int3, MSG_BED, &plaPreheatHPBTemp, 0, BED_MAXTEMP - 15);
827
     MENU_ITEM_EDIT(int3, MSG_BED, &plaPreheatHPBTemp, 0, BED_MAXTEMP - 15);
822
 #endif
828
 #endif
831
     START_MENU();
837
     START_MENU();
832
     MENU_ITEM(back, MSG_TEMPERATURE, lcd_control_temperature_menu);
838
     MENU_ITEM(back, MSG_TEMPERATURE, lcd_control_temperature_menu);
833
     MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &absPreheatFanSpeed, 0, 255);
839
     MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &absPreheatFanSpeed, 0, 255);
840
+#if TEMP_SENSOR_0 != 0
834
     MENU_ITEM_EDIT(int3, MSG_NOZZLE, &absPreheatHotendTemp, 0, HEATER_0_MAXTEMP - 15);
841
     MENU_ITEM_EDIT(int3, MSG_NOZZLE, &absPreheatHotendTemp, 0, HEATER_0_MAXTEMP - 15);
842
+#endif
835
 #if TEMP_SENSOR_BED != 0
843
 #if TEMP_SENSOR_BED != 0
836
     MENU_ITEM_EDIT(int3, MSG_BED, &absPreheatHPBTemp, 0, BED_MAXTEMP - 15);
844
     MENU_ITEM_EDIT(int3, MSG_BED, &absPreheatHPBTemp, 0, BED_MAXTEMP - 15);
837
 #endif
845
 #endif

Loading…
Cancel
Save