JonatanRek/ESPHomeMarlin2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

progress

Browse Source
This commit is contained in:
Václav Španinger 2025-06-26 14:01:31 +02:00
parent 68ab694d8a
commit 91f2dd54be
2 changed files with 163 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

297
marlin2.cpp
View File

@ -3,61 +3,61 @@
namespace esphome { namespace esphome {
static const char *TAG = "marlin2"; static const char *TAG = "marlin2";
#ifdef USE_SENSOR #ifdef USE_SENSOR
void Marlin2::add_sensor(const std::string& sName, sensor::Sensor *sens) { void Marlin2::add_sensor(const std::string& sName, sensor::Sensor *sens) {
sensors.push_back({sName, sens}); sensors.push_back({sName, sens});
} }
sensor::Sensor* Marlin2::find_sensor(std::string key) { sensor::Sensor* Marlin2::find_sensor(std::string key) {
for (const auto& pair : sensors) { for (const auto& pair : sensors) {
if (key == std::string(pair.first)) { // Convert char* to std::string for comparison if (key == std::string(pair.first)) { // Convert char* to std::string for comparison
return pair.second; return pair.second;
}
} }
return nullptr; // Return nullptr if no match is found
} }
return nullptr; // Return nullptr if no match is found
}
#endif #endif
#ifdef USE_TEXT_SENSOR #ifdef USE_TEXT_SENSOR
void Marlin2::add_text_sensor(const std::string& sName, text_sensor::TextSensor *sens) { void Marlin2::add_text_sensor(const std::string& sName, text_sensor::TextSensor *sens) {
text_sensors.push_back({sName, sens}); text_sensors.push_back({sName, sens});
} }
text_sensor::TextSensor* Marlin2::find_text_sensor(std::string key) { text_sensor::TextSensor* Marlin2::find_text_sensor(std::string key) {
for (const auto& pair : text_sensors) { for (const auto& pair : text_sensors) {
if (key == std::string(pair.first)) { // Convert char* to std::string for comparison if (key == std::string(pair.first)) { // Convert char* to std::string for comparison
return pair.second; return pair.second;
}
} }
return nullptr; // Return nullptr if no match is found
} }
return nullptr; // Return nullptr if no match is found
}
#endif #endif
void Marlin2::setup() { void Marlin2::setup() {
MarlinOutput.reserve(256); MarlinOutput.reserve(256);
MarlinOutput = ""; MarlinOutput = "";
MarlinResponseOutput.reserve(256); MarlinResponseOutput.reserve(256);
MarlinResponseOutput = ""; MarlinResponseOutput = "";
MarlinTime.reserve(32); MarlinTime.reserve(32);
PrinterState.reserve(32); PrinterState.reserve(32);
ESP_LOGD(TAG, "M155 S10"); ESP_LOGD(TAG, "M155 S10");
write_str("\r\n\r\nM155 S10\r\n"); write_str("\r\n\r\nM155 S10\r\n");
write_str("\r\n\r\nM117 ESP Home Connected!\r\n"); write_str("\r\n\r\nM117 ESP Home Connected!\r\n");
flush(); flush();
set_printer_state("IDLE"); set_printer_state("IDLE");
} }
void Marlin2::write(std::string gcode) { void Marlin2::write(std::string gcode) {
ESP_LOGD(TAG, "->GCODE: %s", gcode.c_str()); ESP_LOGD(TAG, "->GCODE: %s", gcode.c_str());
write_str((std::string("\r\n\r\n") + gcode + std::string("\r\n")).c_str()); write_str((std::string("\r\n\r\n") + gcode + std::string("\r\n")).c_str());
flush(); flush();
} }
void Marlin2::update() { void Marlin2::update() {
while (available()) { while (available()) {
char c = read(); char c = read();
@ -68,28 +68,61 @@ namespace esphome {
MarlinOutput += c; MarlinOutput += c;
} }
} }
if(millis() - millisProgress > 15000 && print_progress != 100) { if(millis() - millisProgress > 15000 && print_progress != 100) {
millisProgress = millis(); millisProgress = millis();
ESP_LOGD(TAG, "M27"); ESP_LOGD(TAG, "M27");
ESP_LOGD(TAG, "M31"); ESP_LOGD(TAG, "M31");
write_str("M27\r\nM31\r\n"); write_str("M27\r\nM31\r\n");
} }
} }
void Marlin2::process_line() { void Marlin2::process_line() {
if(MarlinOutput.size() < 3) { if(MarlinOutput.size() < 3) {
MarlinOutput=""; MarlinOutput="";
return; return;
} }
if(!MarlinOutput.compare("ok") || !MarlinOutput.compare(" ok")) { if(!MarlinOutput.compare("ok") || !MarlinOutput.compare(" ok")) {
listingFile = false;
MarlinOutput=""; MarlinOutput="";
return; return;
} }
if(!listingFile && MarlinOutput.compare("Begin file list") == 0) {
ESP_LOGD(TAG, "Listing of files started!");
listingFile = true;
//reset string for next line
MarlinOutput="";
return;
}
if(listingFile && MarlinOutput.compare(".GCO ")) {
int first_space = MarlinOutput.find(' ');
int second_space = MarlinOutput.find(' ', first_space + 1);
if(first_space > 0) {
std::string short_name = MarlinOutput.substr(0, first_space);
std::string long_name = short_name;
if (second_space > first_space){
long_name = MarlinOutput.substr(second_space + 1);
}
file_table_[long_name] = short_name;
ESP_LOGD(TAG, "Uloženo do tabulky: %s => %s", long_name.c_str(), short_name.c_str());
}
//reset string for next line
MarlinOutput="";
return;
}
//Parse periodic Temperature read out message //Parse periodic Temperature read out message
if( if(
MarlinOutput.find(" T:") == 0 || MarlinOutput.find(" T:") == 0 ||
@ -100,135 +133,129 @@ namespace esphome {
float ext_temperature, ext_set_temperature, bed_temperature, bed_set_temperature; float ext_temperature, ext_set_temperature, bed_temperature, bed_set_temperature;
if (process_temp_msg(&ext_temperature, &ext_set_temperature, &bed_temperature, &bed_set_temperature) != 0) { if (process_temp_msg(&ext_temperature, &ext_set_temperature, &bed_temperature, &bed_set_temperature) != 0) {
#ifdef USE_SENSOR #ifdef USE_SENSOR
if (find_sensor("bed_temperature") != nullptr) if (find_sensor("bed_temperature") != nullptr)
find_sensor("bed_temperature")->publish_state(bed_temperature); find_sensor("bed_temperature")->publish_state(bed_temperature);
if (find_sensor("bed_set_temperature") != nullptr) if (find_sensor("bed_set_temperature") != nullptr)
find_sensor("bed_set_temperature")->publish_state(bed_set_temperature); find_sensor("bed_set_temperature")->publish_state(bed_set_temperature);
if (find_sensor("ext_temperature") != nullptr) if (find_sensor("ext_temperature") != nullptr)
find_sensor("ext_temperature")->publish_state(ext_temperature); find_sensor("ext_temperature")->publish_state(ext_temperature);
if (find_sensor("ext_set_temperature") != nullptr) if (find_sensor("ext_set_temperature") != nullptr)
find_sensor("ext_set_temperature")->publish_state(ext_set_temperature); find_sensor("ext_set_temperature")->publish_state(ext_set_temperature);
#endif #endif
#ifdef USE_TEXT_SENSOR #ifdef USE_TEXT_SENSOR
if(bed_set_temperature==0.0 && ext_set_temperature==0.0) { if(bed_set_temperature==0.0 && ext_set_temperature==0.0) {
if(ext_temperature < 32.0 && bed_temperature < 32.0){ //TODO define constants for these if(ext_temperature < 32.0 && bed_temperature < 32.0){ //TODO define constants for these
set_printer_state("IDLE"); set_printer_state("IDLE");
} }
else if(ext_temperature < 150.0 && bed_temperature < 55.0){ else if(ext_temperature < 150.0 && bed_temperature < 55.0){
set_printer_state("COOLING"); set_printer_state("COOLING");
}
}
if(print_progress == 0.0 && (bed_set_temperature!=0.0 || ext_set_temperature!=0.0)) {
//print_time_offset = print_time save print time ofset to deduct from total value send to hass
set_printer_state("PREHEATING");
} }
}
if(print_progress == 0.0 && (bed_set_temperature!=0.0 || ext_set_temperature!=0.0)) {
//print_time_offset = print_time save print time ofset to deduct from total value send to hass
set_printer_state("PREHEATING");
}
#endif #endif
ESP_LOGD(TAG, "Bed Temperature=%.1f°C Ext Temperature=%.1f°C ", bed_temperature, ext_temperature); ESP_LOGD(TAG, "Bed Temperature=%.1f°C Ext Temperature=%.1f°C ", bed_temperature, ext_temperature);
} }
//reset string for next line //reset string for next line
MarlinOutput=""; MarlinOutput="";
return; return;
} }
//Parse Progress of the print //Parse Progress of the print
if(MarlinOutput.find("SD printing byte") == 0 ) { if(MarlinOutput.find("SD printing byte") == 0 ) {
print_progress = process_progress_msg(); print_progress = process_progress_msg();
#ifdef USE_SENSOR #ifdef USE_SENSOR
if (find_sensor("print_progress") != nullptr) if (find_sensor("print_progress") != nullptr)
find_sensor("print_progress")->publish_state(print_progress); find_sensor("print_progress")->publish_state(print_progress);
ESP_LOGD(TAG, "progress=%.1f", print_progress); ESP_LOGD(TAG, "progress=%.1f", print_progress);
#endif #endif
set_printer_state("PRINTING"); set_printer_state("PRINTING");
//reset string for next line //reset string for next line
MarlinOutput=""; MarlinOutput="";
return; return;
} }
//Parse Printitme //Parse Printitme
if(MarlinOutput.find("echo:Print time: ") == 0) { if(MarlinOutput.find("echo:Print time: ") == 0) {
double current=0; double current=0;
double remaining=0; double remaining=0;
if (process_print_time_msg(&current, &remaining, print_progress) != 0) { if (process_print_time_msg(&current, &remaining, print_progress) != 0) {
#ifdef USE_SENSOR #ifdef USE_SENSOR
if (find_sensor("print_time") != nullptr) if (find_sensor("print_time") != nullptr)
find_sensor("print_time")->publish_state(current); find_sensor("print_time")->publish_state(current);
if (find_sensor("print_time_remaining") != nullptr) if (find_sensor("print_time_remaining") != nullptr)
find_sensor("print_time_remaining")->publish_state(remaining); find_sensor("print_time_remaining")->publish_state(remaining);
#endif #endif
ESP_LOGD(TAG, "time=%f remaining=%f", current, remaining); ESP_LOGD(TAG, "time=%f remaining=%f", current, remaining);
} }
//reset string for next line //reset string for next line
MarlinOutput=""; MarlinOutput="";
return; return;
} }
//Print From SD Card Started //Print From SD Card Started
if(MarlinOutput.find("File selected") != std::string::npos) { if(MarlinOutput.find("File selected") != std::string::npos) {
set_printer_state("PRINTING"); set_printer_state("PRINTING");
//reset string for next line //reset string for next line
MarlinOutput=""; MarlinOutput="";
return; return;
} }
//Print Finished //Print Finished
if(MarlinOutput.find("Done printing") != std::string::npos) { if(MarlinOutput.find("Done printing") != std::string::npos) {
print_progress = 100; print_progress = 100;
#ifdef USE_SENSOR #ifdef USE_SENSOR
if (find_sensor("print_progress") != nullptr) if (find_sensor("print_progress") != nullptr)
find_sensor("print_progress")->publish_state(print_progress); find_sensor("print_progress")->publish_state(print_progress);
if (find_sensor("print_time_remaining") != nullptr) if (find_sensor("print_time_remaining") != nullptr)
find_sensor("print_time_remaining")->publish_state(0); find_sensor("print_time_remaining")->publish_state(0);
#endif #endif
#ifdef USE_TEXT_SENSOR #ifdef USE_TEXT_SENSOR
set_printer_state("FINISHED"); set_printer_state("FINISHED");
#endif #endif
//reset string for next line //reset string for next line
MarlinOutput=""; MarlinOutput="";
return; return;
} }
// //Print Paused // //Print Paused
// if(MarlinOutput.find("Printer halted") != std::string::npos) { // if(MarlinOutput.find("Printer halted") != std::string::npos) {
// set_printer_state("PAUSED"); // set_printer_state("PAUSED");
// //reset string for next line // //reset string for next line
// MarlinOutput=""; // MarlinOutput="";
// return; // return;
// } // }
// //Print Stoped // //Print Stoped
if(MarlinOutput.find("Print Aborted") != std::string::npos) { if(MarlinOutput.find("Print Aborted") != std::string::npos) {
set_printer_state("STOPPED"); set_printer_state("STOPPED");
//reset string for next line //reset string for next line
MarlinOutput=""; MarlinOutput="";
return; return;
} }
size_t first_space = MarlinOutput.find(' ');
size_t second_space = MarlinOutput.find(' ', first_space + 1);
if(MarlinOutput.find("End file list") != std::string::npos) {
if(second_space == std::string::npos && first_space == std::string::npos) { ESP_LOGD(TAG, "Listing of files stopped!");
std::string short_name = MarlinOutput.substr(0, first_space); listingFile = false;
std::string long_name = MarlinOutput.substr(second_space + 1);
file_table_[long_name] = short_name;
ESP_LOGD(TAG, "Uloženo do tabulky: %s => %s", long_name.c_str(), short_name.c_str());
//reset string for next line //reset string for next line
MarlinOutput=""; MarlinOutput="";
return; return;
@ -239,31 +266,31 @@ namespace esphome {
MarlinOutput=""; MarlinOutput="";
return; return;
} }
int Marlin2::process_temp_msg(float* ext_temperature, float* ext_set_temperature, float* bed_temperature, float* bed_set_temperature) { int Marlin2::process_temp_msg(float* ext_temperature, float* ext_set_temperature, float* bed_temperature, float* bed_set_temperature) {
float dc; float dc;
while(MarlinOutput.find(" ") != std::string::npos) while(MarlinOutput.find(" ") != std::string::npos)
MarlinOutput.erase(MarlinOutput.find(' '), 1); MarlinOutput.erase(MarlinOutput.find(' '), 1);
while(MarlinOutput.find("ok") != std::string::npos) while(MarlinOutput.find("ok") != std::string::npos)
MarlinOutput.erase(MarlinOutput.find("ok"), 2); MarlinOutput.erase(MarlinOutput.find("ok"), 2);
if(sscanf(MarlinOutput.c_str() ,"T:%f/%fB:%f/%f", ext_temperature, ext_set_temperature, bed_temperature, bed_set_temperature) == 4 ) if(sscanf(MarlinOutput.c_str() ,"T:%f/%fB:%f/%f", ext_temperature, ext_set_temperature, bed_temperature, bed_set_temperature) == 4 )
return 1; return 1;
if(sscanf(MarlinOutput.c_str() ,"T:%f/%f(%f)B:%f/%f(%f)", ext_temperature, ext_set_temperature, &dc, bed_temperature, bed_set_temperature, &dc) == 6 ) if(sscanf(MarlinOutput.c_str() ,"T:%f/%f(%f)B:%f/%f(%f)", ext_temperature, ext_set_temperature, &dc, bed_temperature, bed_set_temperature, &dc) == 6 )
return 2; return 2;
if(sscanf(MarlinOutput.c_str() ,"T:%f/%fT0:%f/%fT1:%f/%fB:%f/%f", ext_temperature, ext_set_temperature, &dc, &dc, &dc, &dc, bed_temperature, bed_set_temperature) == 8 ) if(sscanf(MarlinOutput.c_str() ,"T:%f/%fT0:%f/%fT1:%f/%fB:%f/%f", ext_temperature, ext_set_temperature, &dc, &dc, &dc, &dc, bed_temperature, bed_set_temperature) == 8 )
return 3; return 3;
if(sscanf(MarlinOutput.c_str() ,"T0:%f/%fT1:%f/%fB:%f/%f", ext_temperature, ext_set_temperature, &dc, &dc, bed_temperature, bed_set_temperature) == 6 ) if(sscanf(MarlinOutput.c_str() ,"T0:%f/%fT1:%f/%fB:%f/%f", ext_temperature, ext_set_temperature, &dc, &dc, bed_temperature, bed_set_temperature) == 6 )
return 4; return 4;
return 0; return 0;
} }
float Marlin2::process_progress_msg(){ float Marlin2::process_progress_msg(){
float current = std::stoi(MarlinOutput.substr(17)); float current = std::stoi(MarlinOutput.substr(17));
float total = std::stoi(MarlinOutput.substr(MarlinOutput.find('/')+1)); float total = std::stoi(MarlinOutput.substr(MarlinOutput.find('/')+1));
@ -274,7 +301,7 @@ namespace esphome {
return (((float) current * 100.0) / (float) total); return (((float) current * 100.0) / (float) total);
} }
int Marlin2::process_print_time_msg(double* current, double* remaining, float progress){ int Marlin2::process_print_time_msg(double* current, double* remaining, float progress){
MarlinTime = MarlinOutput.substr(16); MarlinTime = MarlinOutput.substr(16);
float d = 0, h = 0, m = 0, s = 0; float d = 0, h = 0, m = 0, s = 0;
@ -293,58 +320,58 @@ namespace esphome {
} }
} }
} }
*current = round(((d)*24*60*60) + ((h)*60*60) + ((m)*60) + (s)); *current = round(((d)*24*60*60) + ((h)*60*60) + ((m)*60) + (s));
if(progress != 0.0 && progress != 100.0) { if(progress != 0.0 && progress != 100.0) {
*remaining = (((100 * *current) / round(progress)) - *current); *remaining = (((100 * *current) / round(progress)) - *current);
} }
return 1; return 1;
} }
void Marlin2::set_printer_state(std::string status){ void Marlin2::set_printer_state(std::string status){
#ifdef USE_TEXT_SENSOR #ifdef USE_TEXT_SENSOR
// if (!PrinterState.compare(status)) // if (!PrinterState.compare(status))
// return; // return;
if (find_text_sensor("printer_state") != nullptr){ if (find_text_sensor("printer_state") != nullptr){
find_text_sensor("printer_state")->publish_state(status); find_text_sensor("printer_state")->publish_state(status);
} }
ESP_LOGD(TAG, "Printer Status %s", status.c_str()); ESP_LOGD(TAG, "Printer Status %s", status.c_str());
// PrinterState = status; // PrinterState = status;
#endif #endif
} }
std::string Marlin2::to_dos_name(std::string filename) { std::string Marlin2::to_dos_name(std::string filename) {
std::string shortName; std::string shortName;
size_t dotPos = filename.find_last_of('.'); size_t dotPos = filename.find_last_of('.');
// Extract name and extension // Extract name and extension
std::string namePart = (dotPos != std::string::npos) ? filename.substr(0, dotPos) : filename; std::string namePart = (dotPos != std::string::npos) ? filename.substr(0, dotPos) : filename;
std::string extPart = (dotPos != std::string::npos) ? filename.substr(dotPos + 1) : ""; std::string extPart = (dotPos != std::string::npos) ? filename.substr(dotPos + 1) : "";
// Truncate name to 6 characters + ~1 // Truncate name to 6 characters + ~1
if (namePart.length() > 6) { if (namePart.length() > 6) {
namePart = namePart.substr(0, 6) + "~1"; namePart = namePart.substr(0, 6) + "~1";
} }
// Truncate extension to 3 characters // Truncate extension to 3 characters
if (extPart.length() > 3) { if (extPart.length() > 3) {
extPart = extPart.substr(0, 3); extPart = extPart.substr(0, 3);
} }
// Construct 8.3 filename // Construct 8.3 filename
shortName = namePart; shortName = namePart;
if (!extPart.empty()) { if (!extPart.empty()) {
shortName += "." + extPart; shortName += "." + extPart;
} }
// Convert to uppercase (DOS filenames are case-insensitive, usually stored in uppercase) // Convert to uppercase (DOS filenames are case-insensitive, usually stored in uppercase)
std::transform(shortName.begin(), shortName.end(), shortName.begin(), ::toupper); std::transform(shortName.begin(), shortName.end(), shortName.begin(), ::toupper);
return shortName; return shortName;
} }
} // namespace esphome } // namespace esphome

1
marlin2.h
View File

@ -57,6 +57,7 @@ class Marlin2 : public PollingComponent, public uart::UARTDevice {
private: private:
unsigned long millisProgress=0; unsigned long millisProgress=0;
std::unordered_map<std::string, std::string> file_table_; std::unordered_map<std::string, std::string> file_table_;
bool listingFile = false;
}; };
} // namespace esphome } // namespace esphome