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

std::string MarlinOutput;

Browse Source
This commit is contained in:
Václav Španinger 2024-12-27 21:41:13 +01:00
parent dc63017a83
commit 1f9dffc4f3
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
marlin2.cpp
View File

@ -90,14 +90,14 @@ namespace esphome {
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_sensor("printer_status") != nullptr)
find_sensor("printer_status")->publish_state('IDLE'); find_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_sensor("printer_status") != nullptr)
find_sensor("printer_status")->publish_state('COOLING'); find_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_sensor("printer_status") != nullptr)
find_sensor("printer_status")->publish_state('PREHEATING'); find_sensor("printer_status")->publish_state("PREHEATING");
} }
//reset string for next line //reset string for next line
@ -142,7 +142,7 @@ 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_sensor("printer_status") != nullptr)
find_sensor("printer_status")->publish_state('FINISHED'); find_sensor("printer_status")->publish_state("FINISHED");
ESP_LOGD(TAG, "Print Finished"); ESP_LOGD(TAG, "Print Finished");
@ -154,7 +154,7 @@ 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_sensor("printer_status") != nullptr)
find_sensor("printer_status")->publish_state('PAUSED'); find_sensor("printer_status")->publish_state("PAUSED");
ESP_LOGD(TAG, "Print Finished"); ESP_LOGD(TAG, "Print Finished");
@ -166,7 +166,7 @@ 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_sensor("printer_status") != nullptr)
find_sensor("printer_status")->publish_state('ABOARTED'); find_sensor("printer_status")->publish_state("ABOARTED");
ESP_LOGD(TAG, "Print Finished"); ESP_LOGD(TAG, "Print Finished");

1
marlin2.h
View File

@ -21,6 +21,7 @@ class Marlin2 : public PollingComponent , public uart::UARTDevice {
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, unsigned long* current, unsigned long* remaining);
std::string MarlinOutput; std::string MarlinOutput;
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;

12
sensor.py
View File

@ -15,7 +15,8 @@ from esphome.const import (
UNIT_PERCENT, UNIT_PERCENT,
UNIT_SECOND, UNIT_SECOND,
STATE_CLASS_MEASUREMENT, STATE_CLASS_MEASUREMENT,
DEVICE_CLASS_TEMPERATURE DEVICE_CLASS_TEMPERATURE,
DEVICE_CLASS_DURATION,
) )
CODEOWNERS = ["@jonatanrek"] CODEOWNERS = ["@jonatanrek"]
@ -69,13 +70,13 @@ CONFIG_SCHEMA = uart.UART_DEVICE_SCHEMA.extend(
state_class=STATE_CLASS_MEASUREMENT, state_class=STATE_CLASS_MEASUREMENT,
), ),
cv.Optional(CONF_PRINT_TIME): sensor.sensor_schema( cv.Optional(CONF_PRINT_TIME): sensor.sensor_schema(
unit_of_measurement=UNIT_SECONDS, unit_of_measurement=UNIT_SECOND,
accuracy_decimals=1, accuracy_decimals=1,
device_class=DEVICE_CLASS_DURATION, device_class=DEVICE_CLASS_DURATION,
state_class=STATE_CLASS_MEASUREMENT, state_class=STATE_CLASS_MEASUREMENT,
), ),
cv.Optional(CONF_PRINT_TIME_REMAINING): sensor.sensor_schema( cv.Optional(CONF_PRINT_TIME_REMAINING): sensor.sensor_schema(
unit_of_measurement=UNIT_SECONDS, unit_of_measurement=UNIT_SECOND,
accuracy_decimals=1, accuracy_decimals=1,
device_class=DEVICE_CLASS_DURATION, device_class=DEVICE_CLASS_DURATION,
state_class=STATE_CLASS_MEASUREMENT, state_class=STATE_CLASS_MEASUREMENT,
@ -94,3 +95,8 @@ async def to_code(config):
if sName in config: if sName in 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]:
if sName in config:
sens = await sensor.new_text_sensor(config[sName])
cg.add(var.add_textsensor(sName,sens))