mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-05 06:41:10 +00:00
harrierpigeon
556569c0e3
The cooling buffer's band pass rebuilt positions from the layer's G-code and tested them against the first-layer plane. The G-code is in machine coordinates and the plane is in slicing coordinates, so on the shipped profiles the nearest move was over 100 mm from a 0.2 mm band and the pass never changed the fan. GCode::_extrude() already knows each path's height above the belt, so it now tags the band changes and the buffer applies and strips the tags. The pass also took the S of every M106 as the part fan, whatever its P index, and stored that 0..255 value where a percentage was expected (an auxiliary fan line came back as M106 S651); it now uses FanMover's parser, which ignores other fans, and converts to percent. It no longer overwrites the layer's intended speed, only the fan's actual state. Raised in Hanif Koh's review of #14394.
104 lines
3.5 KiB
C++
104 lines
3.5 KiB
C++
#ifndef slic3r_GCode_FanMover_hpp_
|
|
#define slic3r_GCode_FanMover_hpp_
|
|
|
|
|
|
#include "../libslic3r.h"
|
|
#include "../PrintConfig.hpp"
|
|
#include "../ExtrusionEntity.hpp"
|
|
|
|
#include "../Point.hpp"
|
|
#include "../GCodeReader.hpp"
|
|
#include "../GCodeWriter.hpp"
|
|
#include <regex>
|
|
|
|
namespace Slic3r {
|
|
|
|
class BufferData {
|
|
public:
|
|
std::string raw;
|
|
float time;
|
|
int16_t fan_speed;
|
|
bool is_kickstart;
|
|
float x = 0, y = 0, z = 0, e = 0;
|
|
float dx = 0, dy = 0, dz = 0, de = 0;
|
|
BufferData(std::string line, float time = 0, int16_t fan_speed = 0, float is_kickstart = false) : raw(line), time(time), fan_speed(fan_speed), is_kickstart(is_kickstart){
|
|
//avoid double \n
|
|
if(!line.empty() && line.back() == '\n') line.pop_back();
|
|
}
|
|
};
|
|
|
|
// The part-cooling fan value a G-code line sets: the raw S (0..255) of an M106 that
|
|
// addresses the part fan, 0 for a fan-off command, -1 for any other line (auxiliary
|
|
// and chamber fans included).
|
|
int16_t get_fan_speed(const std::string &line, GCodeFlavor flavor);
|
|
|
|
class FanMover
|
|
{
|
|
private:
|
|
const std::regex regex_fan_speed;
|
|
const float nb_seconds_delay;
|
|
// Set from fan_speedup_time at the call site, but nothing here reads it.
|
|
[[maybe_unused]] const bool with_D_option;
|
|
const bool relative_e;
|
|
const bool only_overhangs;
|
|
const float kickstart;
|
|
|
|
GCodeReader m_parser{};
|
|
const GCodeWriter& m_writer;
|
|
|
|
//current value (at the back of the buffer), when parsing a new line
|
|
ExtrusionRole current_role = ExtrusionRole::erCustom;
|
|
// in unit/second
|
|
double m_current_speed = 1000 / 60.0;
|
|
bool m_is_custom_gcode = false;
|
|
uint16_t m_currrent_extruder = 0;
|
|
|
|
// variable for when you add a line (front of the buffer)
|
|
int m_front_buffer_fan_speed = 0;
|
|
int m_back_buffer_fan_speed = 0;
|
|
BufferData m_current_kickstart{"",-1,0};
|
|
|
|
//buffer
|
|
std::list<BufferData> m_buffer;
|
|
double m_buffer_time_size = 0;
|
|
|
|
// The output of process_layer()
|
|
std::string m_process_output;
|
|
|
|
public:
|
|
FanMover(const GCodeWriter& writer, const float nb_seconds_delay, const bool with_D_option, const bool relative_e,
|
|
const bool only_overhangs, const float kickstart)
|
|
: regex_fan_speed("S[0-9]+"),
|
|
nb_seconds_delay(nb_seconds_delay>0 ? std::max(0.01f,nb_seconds_delay) : 0),
|
|
with_D_option(with_D_option)
|
|
, relative_e(relative_e), only_overhangs(only_overhangs), kickstart(kickstart), m_writer(writer){
|
|
m_parser.apply_config(writer.config);
|
|
}
|
|
|
|
// Adds the gcode contained in the given string to the analysis and returns it after removing the workcodes
|
|
const std::string& process_gcode(const std::string& gcode, bool flush);
|
|
|
|
private:
|
|
BufferData& put_in_buffer(BufferData&& data) {
|
|
m_buffer_time_size += data.time;
|
|
m_buffer.emplace_back(data);
|
|
return m_buffer.back();
|
|
}
|
|
std::list<BufferData>::iterator remove_from_buffer(std::list<BufferData>::iterator data) {
|
|
m_buffer_time_size -= data->time;
|
|
return m_buffer.erase(data);
|
|
}
|
|
// Processes the given gcode line
|
|
void _process_gcode_line(GCodeReader& reader, const GCodeReader::GCodeLine& line);
|
|
void _process_T(const std::string_view command);
|
|
void _put_in_middle_G1(std::list<BufferData>::iterator item_to_split, float nb_sec, BufferData&& line_to_write);
|
|
void _print_in_middle_G1(BufferData& line_to_split, float nb_sec, const std::string& line_to_write);
|
|
void _remove_slow_fan(int16_t min_speed, float past_sec);
|
|
std::string _set_fan(int16_t speed);
|
|
};
|
|
|
|
} // namespace Slic3r
|
|
|
|
|
|
#endif /* slic3r_GCode_FanMover_hpp_ */
|