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

Fises

Browse Source
This commit is contained in:
Václav Španinger 2024-12-27 22:23:54 +01:00
parent 1f9dffc4f3
commit 8733fb7737
3 changed files with 53 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
marlin2.cpp
View File

@ -17,6 +17,19 @@ namespace esphome {
return nullptr; // Return nullptr if no match is found return nullptr; // Return nullptr if no match is found
} }
// void Marlin2::add_text_sensor(const std::string& sName, text_sensor *sens) {
// text_sensors.push_back({sName, sens});
// }
// text_sensor* Marlin2::find_text_sensor(std::string key) {
// for (const auto& pair : text_sensors) {
// if (key == std::string(pair.first)) { // Convert char* to std::string for comparison
// return pair.second;
// }
// }
// return nullptr; // Return nullptr if no match is found
// }
void Marlin2::setup() { void Marlin2::setup() {
MarlinOutput.reserve(256); MarlinOutput.reserve(256);
MarlinOutput = ""; MarlinOutput = "";
@ -87,18 +100,19 @@ namespace esphome {
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);
} }
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
if (find_sensor("printer_status") != nullptr) // //if (find_text_sensor("printer_status") != nullptr)
find_sensor("printer_status")->publish_state("IDLE"); // //find_text_sensor("printer_status")->publish_state("IDLE");
else if(ext_temperature < 150.0 && bed_temperature < 55.0) // else if(ext_temperature < 150.0 && bed_temperature < 55.0)
if (find_sensor("printer_status") != nullptr) // //if (find_text_sensor("printer_status") != nullptr)
find_sensor("printer_status")->publish_state("COOLING"); // //find_text_sensor("printer_status")->publish_state("COOLING");
} // }
if(bed_set_temperature!=0.0 || ext_set_temperature!=0.0) { // if(bed_set_temperature!=0.0 || ext_set_temperature!=0.0) {
if (find_sensor("printer_status") != nullptr) // //if (find_text_sensor("printer_status") != nullptr)
find_sensor("printer_status")->publish_state("PREHEATING"); // //find_text_sensor("printer_status")->publish_state("PREHEATING");
} // }
//reset string for next line //reset string for next line
MarlinOutput=""; MarlinOutput="";
@ -121,17 +135,17 @@ namespace esphome {
//Parse Printitme //Parse Printitme
if(MarlinOutput.find("echo:Print time: ") == 0) { if(MarlinOutput.find("echo:Print time: ") == 0) {
int d=0, h=0, m=0, s=0; int* d=0, h=0, m=0, s=0;
unsigned long current=0, remaining=0; unsigned long current=0, remaining=0;
if (process_print_time_msg(&d, &h, &m, &current, &remaining) != 0) { if (process_print_time_msg(&d, &h, &m, &s, &current, &remaining) != 0) {
if (find_sensor("print_time") != nullptr) if (find_sensor("print_time") != nullptr)
find_sensor("print_time")->publish_state(print_time) 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(print_time_remaining) find_sensor("print_time_remaining")->publish_state(remaining);
ESP_LOGD(TAG, "time=%.1f remaining=%.1f", current, remaining); ESP_LOGD(TAG, "time=%lu remaining=%lu", current, remaining);
} }
//reset string for next line //reset string for next line
@ -141,8 +155,8 @@ namespace esphome {
//Print Finished //Print Finished
if(MarlinOutput.find("Done printing") != std::string::npos) { if(MarlinOutput.find("Done printing") != std::string::npos) {
if (find_sensor("printer_status") != nullptr) //if (find_text_sensor("printer_status") != nullptr)
find_sensor("printer_status")->publish_state("FINISHED"); //find_text_sensor("printer_status")->publish_state("FINISHED");
ESP_LOGD(TAG, "Print Finished"); ESP_LOGD(TAG, "Print Finished");
@ -153,8 +167,8 @@ namespace esphome {
//Print Paused //Print Paused
if(MarlinOutput.find("Printer halted") != std::string::npos) { if(MarlinOutput.find("Printer halted") != std::string::npos) {
if (find_sensor("printer_status") != nullptr) //if (find_text_sensor("printer_status") != nullptr)
find_sensor("printer_status")->publish_state("PAUSED"); //find_text_sensor("printer_status")->publish_state("PAUSED");
ESP_LOGD(TAG, "Print Finished"); ESP_LOGD(TAG, "Print Finished");
@ -165,8 +179,8 @@ namespace esphome {
//Print Stoped //Print Stoped
if(MarlinOutput.find("Print Aborted") != std::string::npos) { if(MarlinOutput.find("Print Aborted") != std::string::npos) {
if (find_sensor("printer_status") != nullptr) //if (find_text_sensor("printer_status") != nullptr)
find_sensor("printer_status")->publish_state("ABOARTED"); //find_text_sensor("printer_status")->publish_state("ABOARTED");
ESP_LOGD(TAG, "Print Finished"); ESP_LOGD(TAG, "Print Finished");
@ -215,7 +229,7 @@ namespace esphome {
return ((float) current / (float) total) * 100.0; return ((float) current / (float) total) * 100.0;
} }
int Marlin2::process_print_time_msg(int* d, int* h, int* m, unsigned long* current, unsigned long* remaining){ int Marlin2::process_print_time_msg(int d, int h, int m, int s, unsigned long* current, unsigned long* remaining){
MarlinTime = MarlinOutput.substr(16); MarlinTime = MarlinOutput.substr(16);
ESP_LOGD(TAG,MarlinTime.c_str()); ESP_LOGD(TAG,MarlinTime.c_str());
@ -234,7 +248,7 @@ namespace esphome {
} }
} }
current = d*24*60*60 + h*60*60 + m*60 + s; current = static_cast<float>((d*24*60*60) + (h*60*60) + (m*60) + (s));
return 0; return 0;

9
marlin2.h
View File

@ -2,29 +2,34 @@
#include "esphome/core/component.h" #include "esphome/core/component.h"
#include "esphome/components/sensor/sensor.h" #include "esphome/components/sensor/sensor.h"
//#include "esphome/components/text_sensor/text_sensor.h"
#include "esphome/components/uart/uart.h" #include "esphome/components/uart/uart.h"
namespace esphome { namespace esphome {
class Marlin2 : public PollingComponent , public uart::UARTDevice { class Marlin2 : public PollingComponent, /*public text_sensor::TextSensor,*/ public uart::UARTDevice {
public: public:
void setup() override; void setup() override;
float get_setup_priority() const override { return setup_priority::LATE; } float get_setup_priority() const override { return setup_priority::LATE; }
void update() override; void update() override;
void add_sensor(const std::string& sName, sensor::Sensor *sens); void add_sensor(const std::string& sName, sensor::Sensor *sens);
//void add_text_sensor(const std::string& sName, text_sensor::TextSensor *sens);
sensor::Sensor* find_sensor(std::string key); sensor::Sensor* find_sensor(std::string key);
// text_sensor::TextSensor* find_text_sensor(std::string key);
protected: protected:
void process_line(); void process_line();
int process_temp_msg(float* ext_temperature, float* ext_set_temperature, float* bed_temperature, float* bed_set_temperature); int process_temp_msg(float* ext_temperature, float* ext_set_temperature, float* bed_temperature, float* bed_set_temperature);
float process_progress_msg(); float process_progress_msg();
int process_print_time_msg(int* d, int* h, int* m, unsigned long* current, unsigned long* remaining); int process_print_time_msg(int d, int h, int m, int s, unsigned long* current, unsigned long* remaining);
std::string MarlinOutput; std::string MarlinOutput;
std::string MarlinTime; std::string MarlinTime;
std::string PrinterState; std::string PrinterState;
std::vector<std::pair<std::string, sensor::Sensor *>> sensors; std::vector<std::pair<std::string, sensor::Sensor *>> sensors;
// std::vector<std::pair<std::string, text_sensor::TextSensor *>> text_sensors;
private: private:
unsigned long millisProgress=0; unsigned long millisProgress=0;

15
sensor.py
View File

@ -3,6 +3,7 @@ import esphome.config_validation as cv
from esphome import automation from esphome import automation
from esphome.components import uart from esphome.components import uart
from esphome.components import sensor from esphome.components import sensor
# from esphome.components import text_sensor
from esphome.const import ( from esphome.const import (
CONF_ID, CONF_ID,
CONF_INDEX, CONF_INDEX,
@ -33,7 +34,7 @@ CONF_PRINT_PROGRESS = "print_progress"
CONF_PRINT_TIME = "print_time" CONF_PRINT_TIME = "print_time"
CONF_PRINT_TIME_REMAINING = "print_time_remaining" CONF_PRINT_TIME_REMAINING = "print_time_remaining"
CONF_PRINTER_STATUS = "printer_status" # CONF_PRINTER_STATUS = "printer_status"
Marlin2 = cg.esphome_ns.class_('Marlin2', cg.Component, sensor.Sensor, uart.UARTDevice) Marlin2 = cg.esphome_ns.class_('Marlin2', cg.Component, sensor.Sensor, uart.UARTDevice)
@ -81,9 +82,7 @@ CONFIG_SCHEMA = uart.UART_DEVICE_SCHEMA.extend(
device_class=DEVICE_CLASS_DURATION, device_class=DEVICE_CLASS_DURATION,
state_class=STATE_CLASS_MEASUREMENT, state_class=STATE_CLASS_MEASUREMENT,
), ),
cv.Optional(CONF_PRINTER_STATUS): sensor.sensor_schema( # cv.Optional(CONF_PRINTER_STATUS): text_sensor.text_sensor_schema(),
state_class=STATE_CLASS_MEASUREMENT,
),
} }
).extend(cv.polling_component_schema("15s")) ).extend(cv.polling_component_schema("15s"))
@ -96,7 +95,7 @@ async def to_code(config):
sens = await sensor.new_sensor(config[sName]) sens = await sensor.new_sensor(config[sName])
cg.add(var.add_sensor(sName,sens)) cg.add(var.add_sensor(sName,sens))
for sName in [CONF_PRINTER_STATUS]: # for sName in [CONF_PRINTER_STATUS]:
if sName in config: # if sName in config:
sens = await sensor.new_text_sensor(config[sName]) # sens = await sensor.new_text_sensor(config[sName])
cg.add(var.add_textsensor(sName,sens)) # cg.add(var.add_text_sensor(sName,sens))