take flow ratio into account for max volumetric speed test

This commit is contained in:
SoftFever 2023-02-21 19:07:20 +08:00
parent c8687989e5
commit 27271a69f6
5 changed files with 10 additions and 9 deletions

View file

@ -1,6 +1,6 @@
name: Build Linux name: Build Linux
on: [pull_request] on: [pull_request,push]
jobs: jobs:
appimage-builder: appimage-builder:

View file

@ -1,6 +1,6 @@
name: Build Mac arm64 name: Build Mac arm64
on: [pull_request] on: [pull_request,push]
jobs: jobs:
build_win64: build_win64:

View file

@ -1,6 +1,6 @@
name: Build Mac x64 name: Build Mac x64
on: [pull_request] on: [pull_request,push]
jobs: jobs:
build_win64: build_win64:

View file

@ -1,6 +1,6 @@
name: Build Win64 name: Build Win64
on: [pull_request] on: [pull_request,push]
jobs: jobs:
build_win64: build_win64:

View file

@ -8130,7 +8130,7 @@ void Plater::calib_max_vol_speed(const Calib_Params& params)
max_lh->values[0] = { layer_height }; max_lh->values[0] = { layer_height };
filament_config->set_key_value("filament_max_volumetric_speed", new ConfigOptionFloats { 200 }); filament_config->set_key_value("filament_max_volumetric_speed", new ConfigOptionFloats { 200 });
filament_config->set_key_value("slow_down_layer_time", new ConfigOptionFloats { 0.0 }); filament_config->set_key_value("slow_down_layer_time", new ConfigOptionFloats{0.0});
print_config->set_key_value("enable_overhang_speed", new ConfigOptionBool { false }); print_config->set_key_value("enable_overhang_speed", new ConfigOptionBool { false });
print_config->set_key_value("timelapse_type", new ConfigOptionEnum<TimelapseType>(tlTraditional)); print_config->set_key_value("timelapse_type", new ConfigOptionEnum<TimelapseType>(tlTraditional));
@ -8167,10 +8167,11 @@ void Plater::calib_max_vol_speed(const Calib_Params& params)
} }
auto new_params = params; auto new_params = params;
Flow wall_flow = Flow(line_width, layer_height, nozzle_diameter); auto mm3_per_mm = Flow(line_width, layer_height, nozzle_diameter).mm3_per_mm() *
new_params.end = params.end / wall_flow.mm3_per_mm(); filament_config->option<ConfigOptionFloats>("filament_flow_ratio")->get_at(0);
new_params.start = params.start / wall_flow.mm3_per_mm(); new_params.end = params.end / mm3_per_mm;
new_params.step = params.step / wall_flow.mm3_per_mm(); new_params.start = params.start / mm3_per_mm;
new_params.step = params.step / mm3_per_mm;
p->background_process.fff_print()->set_calib_params(new_params); p->background_process.fff_print()->set_calib_params(new_params);