Wipe tower extrusions are now accounted for in the filament consumption statistics

This commit is contained in:
Lukas Matena 2018-09-05 15:35:35 +02:00
parent 22569de00f
commit c83a5474f6
9 changed files with 91 additions and 25 deletions

View file

@ -240,7 +240,7 @@ public:
// TODO: status_cb
std::string estimated_normal_print_time;
std::string estimated_silent_print_time;
double total_used_filament, total_extruded_volume, total_cost, total_weight;
double total_used_filament, total_extruded_volume, total_cost, total_weight, total_wipe_tower_cost, total_wipe_tower_filament;
std::map<size_t, float> filament_stats;
PrintState<PrintStep, psCount> state;
@ -309,6 +309,7 @@ public:
std::unique_ptr<WipeTower::ToolChangeResult> m_wipe_tower_priming;
std::vector<std::vector<WipeTower::ToolChangeResult>> m_wipe_tower_tool_changes;
std::unique_ptr<WipeTower::ToolChangeResult> m_wipe_tower_final_purge;
std::vector<float> m_wipe_tower_used_filament;
std::string output_filename();
std::string output_filepath(const std::string &path);