Merged the branch time_estimate

This commit is contained in:
bubnikv 2018-01-02 10:57:30 +01:00
commit 02256e900f
7 changed files with 1391 additions and 147 deletions

View file

@ -233,8 +233,9 @@ public:
PrintRegionPtrs regions;
PlaceholderParser placeholder_parser;
// TODO: status_cb
std::string estimated_print_time;
double total_used_filament, total_extruded_volume, total_cost, total_weight;
std::map<size_t,float> filament_stats;
std::map<size_t, float> filament_stats;
PrintState<PrintStep, psCount> state;
// ordered collections of extrusion paths to build skirt loops and brim