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

Add HAS_FILAMENT_SENSOR ahead of 12962

Browse Source
This commit is contained in:
Scott Lahteine
2019-02-12 20:08:34 -06:00
parent 2c8d12d3ec
commit 7cf9b93f26
22 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/extensible_ui/ui_api.cpp
View File

@ -87,7 +87,7 @@
#endif
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
#if HAS_FILAMENT_SENSOR
#include "../../feature/runout.h"
#endif
@ -383,7 +383,7 @@ namespace ExtUI {
planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(extruder - E0)] = value;
}
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
#if HAS_FILAMENT_SENSOR
bool getFilamentRunoutEnabled() { return runout.enabled; }
void setFilamentRunoutEnabled(const bool value) { runout.enabled = value; }

2
Marlin/src/lcd/extensible_ui/ui_api.h
View File

@ -167,7 +167,7 @@ namespace ExtUI {
#endif
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
#if HAS_FILAMENT_SENSOR
bool getFilamentRunoutEnabled();
void setFilamentRunoutEnabled(const bool);

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

@ -32,7 +32,7 @@
#include "../../module/configuration_store.h"
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
#if HAS_FILAMENT_SENSOR
#include "../../feature/runout.h"
#endif
@ -312,7 +312,7 @@ void menu_configuration() {
MENU_ITEM(submenu, MSG_RETRACT, menu_config_retract);
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
#if HAS_FILAMENT_SENSOR
MENU_ITEM_EDIT_CALLBACK(bool, MSG_RUNOUT_SENSOR, &runout.enabled, runout.reset);
#endif

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

@ -31,7 +31,7 @@
#include "menu.h"
#include "../../module/temperature.h"
#include "../../feature/pause.h"
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
#if HAS_FILAMENT_SENSOR
#include "../../feature/runout.h"
#endif
//
@ -352,7 +352,7 @@ void menu_advanced_pause_option() {
STATIC_ITEM(MSG_FILAMENT_CHANGE_OPTION_HEADER, true, false);
#endif
MENU_ITEM(function, MSG_FILAMENT_CHANGE_OPTION_PURGE, lcd_advanced_pause_extrude_more);
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
#if HAS_FILAMENT_SENSOR
if (runout.filament_ran_out)
MENU_ITEM_EDIT_CALLBACK(bool, MSG_RUNOUT_SENSOR, &runout.enabled, runout.reset);
else