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

FUb Components

Browse Source
This commit is contained in:
Václav Španinger
2024-12-30 09:42:31 +01:00
parent 88c4396390
commit 5112a91bec
6 changed files with 149 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
marlin2.h
View File

@@ -1,28 +1,37 @@
#pragma once
#include "esphome/core/component.h"
#include "esphome/components/sensor/sensor.h"
//#include "esphome/components/text_sensor/text_sensor.h"
#include "esphome/components/uart/uart.h"
#ifdef USE_SENSOR
#include "esphome/components/sensor/sensor.h"
#endif
#ifdef USE_TEXT_SENSOR
#include "esphome/components/text_sensor/text_sensor.h"
#endif
namespace esphome {
class Marlin2 : public PollingComponent, /*public text_sensor::TextSensor,*/ public uart::UARTDevice {
class Marlin2 : public esphome::Component, public uart::UARTDevice {
public:
void setup() override;
float get_setup_priority() const override { return setup_priority::LATE; }
void update() override;
void add_sensor(const std::string& sName, sensor::Sensor *sens);
//void add_text_sensor(const std::string& sName, text_sensor::TextSensor *sens);
Marlin2() = default;
explicit Marlin2(uart::UARTDevice *uart_device) : uart_device_{uart_device} {}
void set_uart_parent(uart::UARTDevice *parent) { this->uart_device_ = parent; }
#ifdef USE_SENSOR
void add_sensor(const std::string& sName, sensor::Sensor *sens);
sensor::Sensor* find_sensor(std::string key);
#endif
#ifdef USE_TEXT_SENSOR
void add_text_sensor(const std::string& sName, text_sensor::TextSensor *tSens);
text_sensor::TextSensor* find_text_sensor(std::string key);
#endif
float get_setup_priority() const override { return setup_priority::LATE; }
void setup() override;
void update() override;
sensor::Sensor* find_sensor(std::string key);
// text_sensor::TextSensor* find_text_sensor(std::string key);
protected:
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(double* current, double* remaining, float progress);
esphome::uart::UARTDevice *uart_device_{nullptr};
std::string MarlinOutput;
std::string MarlinTime;
@@ -30,8 +39,17 @@ class Marlin2 : public PollingComponent, /*public text_sensor::TextSensor,*/ pub
float print_progress = 0;
std::vector<std::pair<std::string, sensor::Sensor *>> sensors;
// std::vector<std::pair<std::string, text_sensor::TextSensor *>> text_sensors;
#ifdef USE_SENSOR
std::vector<std::pair<std::string, sensor::Sensor *>> sensors;
#endif
#ifdef USE_TEXT_SENSOR
std::vector<std::pair<std::string, text_sensor::TextSensor *>> text_sensors;
#endif
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(double* current, double* remaining, float progress);
private:
unsigned long millisProgress=0;