bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Apply composite tests

Browse Source
This commit is contained in:
Scott Lahteine
2020-04-23 21:42:38 -05:00
parent 55d66fb897
commit ab2b98e425
53 changed files with 103 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/lcd/menu/menu_advanced.cpp
View File

@ -235,12 +235,14 @@ void menu_cancelobject();
#if HAS_HOTEND
DEFINE_PIDTEMP_FUNCS(0);
#if HAS_MULTI_HOTEND && ENABLED(PID_PARAMS_PER_HOTEND)
#if BOTH(HAS_MULTI_HOTEND, PID_PARAMS_PER_HOTEND)
REPEAT_S(1, HOTENDS, DEFINE_PIDTEMP_FUNCS)
#endif
#endif
#define SHOW_MENU_ADVANCED_TEMPERATURE ((ENABLED(AUTOTEMP) && HAS_TEMP_HOTEND) || EITHER(PID_AUTOTUNE_MENU, PID_EDIT_MENU))
#if BOTH(AUTOTEMP, HAS_TEMP_HOTEND) || EITHER(PID_AUTOTUNE_MENU, PID_EDIT_MENU)
#define SHOW_MENU_ADVANCED_TEMPERATURE 1
#endif
//
// Advanced Settings > Temperature
@ -253,7 +255,7 @@ void menu_cancelobject();
//
// Autotemp, Min, Max, Fact
//
#if ENABLED(AUTOTEMP) && HAS_TEMP_HOTEND
#if BOTH(AUTOTEMP, HAS_TEMP_HOTEND)
EDIT_ITEM(bool, MSG_AUTOTEMP, &planner.autotemp_enabled);
EDIT_ITEM(float3, MSG_MIN, &planner.autotemp_min, 0, float(HEATER_0_MAXTEMP) - 15);
EDIT_ITEM(float3, MSG_MAX, &planner.autotemp_max, 0, float(HEATER_0_MAXTEMP) - 15);
@ -308,7 +310,7 @@ void menu_cancelobject();
#endif
PID_EDIT_MENU_ITEMS(0);
#if HAS_MULTI_HOTEND && ENABLED(PID_PARAMS_PER_HOTEND)
#if BOTH(HAS_MULTI_HOTEND, PID_PARAMS_PER_HOTEND)
REPEAT_S(1, HOTENDS, PID_EDIT_MENU_ITEMS)
#endif

2
Marlin/src/lcd/menu/menu_backlash.cpp
View File

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && ENABLED(BACKLASH_GCODE)
#if BOTH(HAS_LCD_MENU, BACKLASH_GCODE)
#include "menu.h"

2
Marlin/src/lcd/menu/menu_bed_corners.cpp
View File

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && ENABLED(LEVEL_BED_CORNERS)
#if BOTH(HAS_LCD_MENU, LEVEL_BED_CORNERS)
#include "menu.h"
#include "../../module/motion.h"

2
Marlin/src/lcd/menu/menu_cancelobject.cpp
View File

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && ENABLED(CANCEL_OBJECTS)
#if BOTH(HAS_LCD_MENU, CANCEL_OBJECTS)
#include "menu.h"
#include "menu_addon.h"

6
Marlin/src/lcd/menu/menu_custom.cpp
View File

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && ENABLED(CUSTOM_USER_MENUS)
#if BOTH(HAS_LCD_MENU, CUSTOM_USER_MENUS)
#include "menu.h"
#include "../../gcode/queue.h"
@ -39,9 +39,7 @@
void _lcd_user_gcode(PGM_P const cmd) {
queue.inject_P(cmd);
#if ENABLED(USER_SCRIPT_AUDIBLE_FEEDBACK) && HAS_BUZZER
ui.completion_feedback();
#endif
TERN_(USER_SCRIPT_AUDIBLE_FEEDBACK, ui.completion_feedback());
TERN_(USER_SCRIPT_RETURN, ui.return_to_status());
}

2
Marlin/src/lcd/menu/menu_filament.cpp
View File

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && ENABLED(ADVANCED_PAUSE_FEATURE)
#if BOTH(HAS_LCD_MENU, ADVANCED_PAUSE_FEATURE)
#include "menu.h"
#include "../../module/temperature.h"

2
Marlin/src/lcd/menu/menu_info.cpp
View File

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && ENABLED(LCD_INFO_MENU)
#if BOTH(HAS_LCD_MENU, LCD_INFO_MENU)
#include "menu.h"

2
Marlin/src/lcd/menu/menu_job_recovery.cpp
View File

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && ENABLED(POWER_LOSS_RECOVERY)
#if BOTH(HAS_LCD_MENU, POWER_LOSS_RECOVERY)
#include "menu.h"
#include "../../gcode/queue.h"

2
Marlin/src/lcd/menu/menu_led.cpp
View File

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && ENABLED(LED_CONTROL_MENU)
#if BOTH(HAS_LCD_MENU, LED_CONTROL_MENU)
#include "menu.h"
#include "../../feature/leds/leds.h"

2
Marlin/src/lcd/menu/menu_main.cpp
View File

@ -203,7 +203,7 @@ void menu_main() {
GCODES_ITEM(MSG_SWITCH_PS_ON, PSTR("M80"));
#endif
#if HAS_ENCODER_WHEEL && ENABLED(SDSUPPORT)
#if BOTH(HAS_ENCODER_WHEEL, SDSUPPORT)
// *** IF THIS SECTION IS CHANGED, REPRODUCE ABOVE ***

2
Marlin/src/lcd/menu/menu_media.cpp
View File

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && ENABLED(SDSUPPORT)
#if BOTH(HAS_LCD_MENU, SDSUPPORT)
#include "menu.h"
#include "../../sd/cardreader.h"

2
Marlin/src/lcd/menu/menu_mixer.cpp
View File

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && ENABLED(MIXING_EXTRUDER)
#if BOTH(HAS_LCD_MENU, MIXING_EXTRUDER)
#include "menu.h"
#include "menu_addon.h"

4
Marlin/src/lcd/menu/menu_mmu2.cpp
View File

@ -22,7 +22,7 @@
#include "../../inc/MarlinConfig.h"
#if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
#if BOTH(HAS_LCD_MENU, MMU2_MENUS)
#include "../../feature/mmu2/mmu2.h"
#include "menu_mmu2.h"
@ -171,4 +171,4 @@ uint8_t mmu2_choose_filament() {
return currentTool;
}
#endif // HAS_LCD_MENU && ENABLED(PRUSA_MMU2_MENUS)
#endif // HAS_LCD_MENU && MMU2_MENUS

2
Marlin/src/lcd/menu/menu_motion.cpp
View File

@ -257,7 +257,7 @@ void menu_move() {
START_MENU();
BACK_ITEM(MSG_MOTION);
#if HAS_SOFTWARE_ENDSTOPS && ENABLED(SOFT_ENDSTOPS_MENU_ITEM)
#if BOTH(HAS_SOFTWARE_ENDSTOPS, SOFT_ENDSTOPS_MENU_ITEM)
EDIT_ITEM(bool, MSG_LCD_SOFT_ENDSTOPS, &soft_endstops_enabled);
#endif

2
Marlin/src/lcd/menu/menu_ubl.cpp
View File

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && ENABLED(AUTO_BED_LEVELING_UBL)
#if BOTH(HAS_LCD_MENU, AUTO_BED_LEVELING_UBL)
#include "menu.h"
#include "../../gcode/gcode.h"