diff --git a/marlin2.cpp b/marlin2.cpp index 141664a..9f3ea14 100644 --- a/marlin2.cpp +++ b/marlin2.cpp @@ -135,10 +135,10 @@ namespace esphome { //Parse Printitme if(MarlinOutput.find("echo:Print time: ") == 0) { - float* d=0, h=0, m=0, s=0; + float d=0, h=0, m=0, s=0; unsigned long current=0, remaining=0; - if (process_print_time_msg(&d, &h, &m, &s, ¤t, &remaining) != 0) { + if (process_print_time_msg(d, h, m, s, current, remaining) != 0) { if (find_sensor("print_time") != nullptr) find_sensor("print_time")->publish_state(current); @@ -229,18 +229,18 @@ namespace esphome { return ((float) current / (float) total) * 100.0; } - int Marlin2::process_print_time_msg(float** d, float* h, float* m, float* s, unsigned long* current, unsigned long* remaining){ + int Marlin2::process_print_time_msg(float* d, float* h, float* m, float* s, unsigned long* current, unsigned long* remaining){ MarlinTime = MarlinOutput.substr(16); ESP_LOGD(TAG,MarlinTime.c_str()); - if (sscanf(MarlinTime.c_str() ,"%fd %fh %fm %fs", &d, &h, &m, &s)!=4) { + if (sscanf(MarlinTime.c_str() ,"%fd %fh %fm %fs", d, h, m, s)!=4) { d=0; - if (sscanf(MarlinTime.c_str() ,"%fh %fm %fs", &h, &m, &s)!=3) { + if (sscanf(MarlinTime.c_str() ,"%fh %fm %fs", h, m, s)!=3) { d=0; h=0; - if (sscanf(MarlinTime.c_str() ,"%fm %fs", &m, &s)!=2) { + if (sscanf(MarlinTime.c_str() ,"%fm %fs", m, s)!=2) { d=0; h=0; m=0; - if (sscanf(MarlinTime.c_str() ,"%fs", &s)!=1) { + if (sscanf(MarlinTime.c_str() ,"%fs", s)!=1) { MarlinOutput=""; return; } diff --git a/marlin2.h b/marlin2.h index e8d6495..9bc1a89 100644 --- a/marlin2.h +++ b/marlin2.h @@ -22,7 +22,7 @@ class Marlin2 : public PollingComponent, /*public text_sensor::TextSensor,*/ pub void process_line(); int process_temp_msg(float* ext_temperature, float* ext_set_temperature, float* bed_temperature, float* bed_set_temperature); float process_progress_msg(); - int process_print_time_msg(float** d, float* h, float* m, float* s, unsigned long* current, unsigned long* remaining); + int process_print_time_msg(float* d, float* h, float* m, float* s, unsigned long* current, unsigned long* remaining); std::string MarlinOutput; std::string MarlinTime;