Skip to content

Commit

Permalink
take flow ratio into account for max volumetric speed test
Browse files Browse the repository at this point in the history
  • Loading branch information
SoftFever committed Feb 21, 2023
1 parent c868798 commit 27271a6
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Build Linux

on: [pull_request]
on: [pull_request,push]

jobs:
appimage-builder:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_mac_arm64.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Build Mac arm64

on: [pull_request]
on: [pull_request,push]

jobs:
build_win64:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_mac_x64.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Build Mac x64

on: [pull_request]
on: [pull_request,push]

jobs:
build_win64:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_win.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Build Win64

on: [pull_request]
on: [pull_request,push]

jobs:
build_win64:
Expand Down
11 changes: 6 additions & 5 deletions src/slic3r/GUI/Plater.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8130,7 +8130,7 @@ void Plater::calib_max_vol_speed(const Calib_Params& params)
max_lh->values[0] = { layer_height };

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("timelapse_type", new ConfigOptionEnum<TimelapseType>(tlTraditional));
Expand Down Expand Up @@ -8167,10 +8167,11 @@ void Plater::calib_max_vol_speed(const Calib_Params& params)
}

auto new_params = params;
Flow wall_flow = Flow(line_width, layer_height, nozzle_diameter);
new_params.end = params.end / wall_flow.mm3_per_mm();
new_params.start = params.start / wall_flow.mm3_per_mm();
new_params.step = params.step / wall_flow.mm3_per_mm();
auto mm3_per_mm = Flow(line_width, layer_height, nozzle_diameter).mm3_per_mm() *
filament_config->option<ConfigOptionFloats>("filament_flow_ratio")->get_at(0);
new_params.end = params.end / 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);
Expand Down

0 comments on commit 27271a6

Please sign in to comment.