Merge pull request #8911 from houseofbugs/patch-1
[1.1.x] Fix NO_VOLUMETRICS compile error
This commit is contained in:
commit
93e3b3d5ba
@ -240,6 +240,9 @@ void MarlinSettings::postprocess() {
|
|||||||
|
|
||||||
#if DISABLED(NO_VOLUMETRICS)
|
#if DISABLED(NO_VOLUMETRICS)
|
||||||
planner.calculate_volumetric_multipliers();
|
planner.calculate_volumetric_multipliers();
|
||||||
|
#else
|
||||||
|
for (uint8_t i = COUNT(planner.e_factor); i--;)
|
||||||
|
planner.refresh_e_factor(i);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAS_HOME_OFFSET || ENABLED(DUAL_X_CARRIAGE)
|
#if HAS_HOME_OFFSET || ENABLED(DUAL_X_CARRIAGE)
|
||||||
|
@ -94,7 +94,7 @@ float Planner::max_feedrate_mm_s[XYZE_N], // Max speeds in mm per second
|
|||||||
|
|
||||||
int16_t Planner::flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100); // Extrusion factor for each extruder
|
int16_t Planner::flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100); // Extrusion factor for each extruder
|
||||||
|
|
||||||
float Planner::e_factor[EXTRUDERS]; // The flow percentage and volumetric multiplier combine to scale E movement
|
float Planner::e_factor[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(1.0); // The flow percentage and volumetric multiplier combine to scale E movement
|
||||||
|
|
||||||
#if DISABLED(NO_VOLUMETRICS)
|
#if DISABLED(NO_VOLUMETRICS)
|
||||||
float Planner::filament_size[EXTRUDERS], // diameter of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder
|
float Planner::filament_size[EXTRUDERS], // diameter of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder
|
||||||
|
@ -173,7 +173,10 @@ uint16_t max_display_update_time = 0;
|
|||||||
void lcd_control_temperature_preheat_material1_settings_menu();
|
void lcd_control_temperature_preheat_material1_settings_menu();
|
||||||
void lcd_control_temperature_preheat_material2_settings_menu();
|
void lcd_control_temperature_preheat_material2_settings_menu();
|
||||||
void lcd_control_motion_menu();
|
void lcd_control_motion_menu();
|
||||||
|
|
||||||
|
#if DISABLED(NO_VOLUMETRICS)
|
||||||
void lcd_control_filament_menu();
|
void lcd_control_filament_menu();
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLED(LCD_INFO_MENU)
|
#if ENABLED(LCD_INFO_MENU)
|
||||||
#if ENABLED(PRINTCOUNTER)
|
#if ENABLED(PRINTCOUNTER)
|
||||||
@ -3129,7 +3132,12 @@ void kill_screen(const char* lcd_msg) {
|
|||||||
MENU_BACK(MSG_MAIN);
|
MENU_BACK(MSG_MAIN);
|
||||||
MENU_ITEM(submenu, MSG_TEMPERATURE, lcd_control_temperature_menu);
|
MENU_ITEM(submenu, MSG_TEMPERATURE, lcd_control_temperature_menu);
|
||||||
MENU_ITEM(submenu, MSG_MOTION, lcd_control_motion_menu);
|
MENU_ITEM(submenu, MSG_MOTION, lcd_control_motion_menu);
|
||||||
|
|
||||||
|
#if DISABLED(NO_VOLUMETRICS)
|
||||||
MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu);
|
MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu);
|
||||||
|
#elif ENABLED(LIN_ADVANCE)
|
||||||
|
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
|
||||||
|
#endif
|
||||||
|
|
||||||
#if HAS_LCD_CONTRAST
|
#if HAS_LCD_CONTRAST
|
||||||
MENU_ITEM_EDIT_CALLBACK(int3, MSG_CONTRAST, &lcd_contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, lcd_callback_set_contrast, true);
|
MENU_ITEM_EDIT_CALLBACK(int3, MSG_CONTRAST, &lcd_contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, lcd_callback_set_contrast, true);
|
||||||
@ -3618,6 +3626,7 @@ void kill_screen(const char* lcd_msg) {
|
|||||||
END_MENU();
|
END_MENU();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if DISABLED(NO_VOLUMETRICS)
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* "Control" > "Filament" submenu
|
* "Control" > "Filament" submenu
|
||||||
@ -3654,6 +3663,7 @@ void kill_screen(const char* lcd_msg) {
|
|||||||
|
|
||||||
END_MENU();
|
END_MENU();
|
||||||
}
|
}
|
||||||
|
#endif // !NO_VOLUMETRICS
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
Loading…
Reference in New Issue
Block a user