mirror of
https://github.com/esphome/esphome.git
synced 2025-03-14 06:38:17 +00:00
C Code cleanup
This commit is contained in:
Marcel Koonstra
parent
51b7777e91
commit
dcf05efc3e
@ -3,6 +3,8 @@
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/binary_sensor/binary_sensor.h"
|
||||
|
||||
#pragma once
|
||||
|
||||
namespace esphome {
|
||||
namespace obd {
|
||||
|
||||
@ -14,27 +16,27 @@ class OBDSensor;
|
||||
class OBDComponent : public PollingComponent {
|
||||
friend class OBDCanbusTrigger;
|
||||
|
||||
public:
|
||||
explicit OBDComponent() : PollingComponent(500) {}
|
||||
void call_setup() override;
|
||||
void update() override;
|
||||
public:
|
||||
explicit OBDComponent() : PollingComponent(500) {}
|
||||
void call_setup() override;
|
||||
void update() override;
|
||||
|
||||
void set_canbus(canbus::Canbus *canbus) { this->canbus_ = canbus; }
|
||||
void set_enabled_by_default(bool enabled_by_default) { this->enabled_by_default_ = enabled_by_default; }
|
||||
void set_canbus(canbus::Canbus *canbus) { this->canbus_ = canbus; }
|
||||
void set_enabled_by_default(bool enabled_by_default) { this->enabled_by_default_ = enabled_by_default; }
|
||||
|
||||
void add_pidrequest(PIDRequest *request);
|
||||
void dump_config() override;
|
||||
void add_pidrequest(PIDRequest *request);
|
||||
void dump_config() override;
|
||||
|
||||
void send(std::uint32_t can_id, bool use_extended_id, uint8_t a, uint8_t b, uint8_t c);
|
||||
void send(std::uint32_t can_id, bool use_extended_id, uint8_t a, uint8_t b, uint8_t c, uint8_t d);
|
||||
void send(std::uint32_t can_id, bool use_extended_id, uint8_t a, uint8_t b, uint8_t c);
|
||||
void send(std::uint32_t can_id, bool use_extended_id, uint8_t a, uint8_t b, uint8_t c, uint8_t d);
|
||||
|
||||
protected:
|
||||
canbus::Canbus *canbus_{nullptr};
|
||||
bool enabled_by_default_{false};
|
||||
protected:
|
||||
canbus::Canbus *canbus_{nullptr};
|
||||
bool enabled_by_default_{false};
|
||||
|
||||
std::vector<PIDRequest *> pidrequests_{};
|
||||
std::vector<PIDRequest *> pidrequests_{};
|
||||
|
||||
PIDRequest* current_request_{nullptr};
|
||||
PIDRequest *current_request_{nullptr};
|
||||
};
|
||||
|
||||
using data_to_value_t = std::function<float(std::vector<uint8_t>)>;
|
||||
@ -48,107 +50,110 @@ enum request_state_t {
|
||||
class PIDRequest : public Component {
|
||||
friend class OBDCanbusTrigger;
|
||||
|
||||
public:
|
||||
explicit PIDRequest(OBDComponent *parent, const std::uint32_t can_id, const std::uint32_t pid,
|
||||
const std::uint32_t can_response_id, const bool use_extended_id)
|
||||
: parent_(parent), can_id_(can_id), pid_(pid), can_response_id_(can_response_id), use_extended_id_(use_extended_id){
|
||||
this->state_ = WAITING;
|
||||
};
|
||||
public:
|
||||
explicit PIDRequest(OBDComponent *parent, const std::uint32_t can_id, const std::uint32_t pid,
|
||||
const std::uint32_t can_response_id, const bool use_extended_id)
|
||||
: parent_(parent),
|
||||
can_id_(can_id),
|
||||
pid_(pid),
|
||||
can_response_id_(can_response_id),
|
||||
use_extended_id_(use_extended_id) {
|
||||
this->state_ = WAITING;
|
||||
};
|
||||
|
||||
void setup() override;
|
||||
uint32_t last_polled_{0};
|
||||
void setup() override;
|
||||
uint32_t last_polled_{0};
|
||||
|
||||
bool start();
|
||||
bool update();
|
||||
bool start();
|
||||
bool update();
|
||||
|
||||
void set_timeout(std::uint32_t timeout) { this->timeout_ = timeout; }
|
||||
void set_interval(std::uint32_t interval) { this->interval_ = interval; }
|
||||
void set_reply_length(std::uint32_t reply_length) { this->reply_length_ = reply_length; }
|
||||
void set_timeout(std::uint32_t timeout) { this->timeout_ = timeout; }
|
||||
void set_interval(std::uint32_t interval) { this->interval_ = interval; }
|
||||
void set_reply_length(std::uint32_t reply_length) { this->reply_length_ = reply_length; }
|
||||
|
||||
void add_sensor(OBDSensorBase *sensor) { this->sensors_.push_back(sensor); }
|
||||
void add_trigger(OBDPidTrigger *trigger) { this->triggers_.push_back(trigger); }
|
||||
void dump_config() override;
|
||||
void add_sensor(OBDSensorBase *sensor) { this->sensors_.push_back(sensor); }
|
||||
void add_trigger(OBDPidTrigger *trigger) { this->triggers_.push_back(trigger); }
|
||||
void dump_config() override;
|
||||
|
||||
protected:
|
||||
void handle_incoming(std::vector<uint8_t> &data);
|
||||
protected:
|
||||
void handle_incoming(std::vector<uint8_t> &data);
|
||||
|
||||
OBDComponent *parent_;
|
||||
uint32_t can_id_;
|
||||
uint32_t can_response_id_;
|
||||
uint32_t pid_;
|
||||
bool use_extended_id_;
|
||||
uint32_t interval_{5000};
|
||||
uint32_t timeout_{500};
|
||||
uint32_t reply_length_{8};
|
||||
OBDComponent *parent_;
|
||||
uint32_t can_id_;
|
||||
uint32_t can_response_id_;
|
||||
uint32_t pid_;
|
||||
bool use_extended_id_;
|
||||
uint32_t interval_{5000};
|
||||
uint32_t timeout_{500};
|
||||
uint32_t reply_length_{8};
|
||||
|
||||
request_state_t state_{WAITING};
|
||||
std::vector<uint8_t> response_buffer_{};
|
||||
request_state_t state_{WAITING};
|
||||
std::vector<uint8_t> response_buffer_{};
|
||||
|
||||
std::vector<OBDSensorBase *> sensors_{};
|
||||
std::vector<OBDPidTrigger *> triggers_{};
|
||||
std::vector<OBDSensorBase *> sensors_{};
|
||||
std::vector<OBDPidTrigger *> triggers_{};
|
||||
};
|
||||
|
||||
class OBDPidTrigger : public Trigger<std::vector<uint8_t>>, public Component {
|
||||
public:
|
||||
explicit OBDPidTrigger(PIDRequest *parent) : parent_(parent){}
|
||||
public:
|
||||
explicit OBDPidTrigger(PIDRequest *parent) : parent_(parent) {}
|
||||
|
||||
void setup() override { this->parent_->add_trigger(this); }
|
||||
void setup() override { this->parent_->add_trigger(this); }
|
||||
|
||||
protected:
|
||||
PIDRequest *parent_;
|
||||
protected:
|
||||
PIDRequest *parent_;
|
||||
};
|
||||
|
||||
class OBDSensorBase {
|
||||
public:
|
||||
virtual void update(const std::vector<uint8_t> &data) {}
|
||||
public:
|
||||
virtual void update(const std::vector<uint8_t> &data) {}
|
||||
};
|
||||
|
||||
class OBDSensor : public OBDSensorBase, public sensor::Sensor, public Component {
|
||||
public:
|
||||
explicit OBDSensor(PIDRequest *parent) : parent_(parent){}
|
||||
public:
|
||||
explicit OBDSensor(PIDRequest *parent) : parent_(parent) {}
|
||||
|
||||
void set_template(data_to_value_t &&lambda) { this->data_to_value_func_ = lambda; }
|
||||
void set_template(data_to_value_t &&lambda) { this->data_to_value_func_ = lambda; }
|
||||
|
||||
void update(const std::vector<uint8_t> &data) override ;
|
||||
void setup() override { this->parent_->add_sensor(this); }
|
||||
void dump_config() override;
|
||||
void update(const std::vector<uint8_t> &data) override;
|
||||
void setup() override { this->parent_->add_sensor(this); }
|
||||
void dump_config() override;
|
||||
|
||||
protected:
|
||||
PIDRequest *parent_;
|
||||
data_to_value_t data_to_value_func_{};
|
||||
protected:
|
||||
PIDRequest *parent_;
|
||||
data_to_value_t data_to_value_func_{};
|
||||
};
|
||||
|
||||
class OBDBinarySensor : public OBDSensorBase, public binary_sensor::BinarySensor, public Component {
|
||||
public:
|
||||
explicit OBDBinarySensor(PIDRequest *parent) : parent_(parent){}
|
||||
public:
|
||||
explicit OBDBinarySensor(PIDRequest *parent) : parent_(parent) {}
|
||||
|
||||
void set_template(data_to_bool_t &&lambda) { this->data_to_value_func_ = lambda; }
|
||||
void update(const std::vector<uint8_t> &data) override;
|
||||
void set_template(data_to_bool_t &&lambda) { this->data_to_value_func_ = lambda; }
|
||||
void update(const std::vector<uint8_t> &data) override;
|
||||
|
||||
void setup() override { this->parent_->add_sensor(this); }
|
||||
void setup() override { this->parent_->add_sensor(this); }
|
||||
|
||||
void dump_config() override;
|
||||
void dump_config() override;
|
||||
|
||||
protected:
|
||||
PIDRequest *parent_;
|
||||
data_to_bool_t data_to_value_func_;
|
||||
protected:
|
||||
PIDRequest *parent_;
|
||||
data_to_bool_t data_to_value_func_;
|
||||
};
|
||||
|
||||
class OBDCanbusTrigger : public canbus::CanbusTrigger, public Action<std::vector<uint8_t>, uint32_t, bool> {
|
||||
public:
|
||||
explicit OBDCanbusTrigger(PIDRequest *parent) : CanbusTrigger(parent->parent_->canbus_, parent->can_response_id_, 0x1FFFFFFF, parent->use_extended_id_), parent_(parent){
|
||||
auto automation = new Automation<std::vector<uint8_t>, uint32_t, bool>(this);
|
||||
automation->add_action(this);
|
||||
};
|
||||
public:
|
||||
explicit OBDCanbusTrigger(PIDRequest *parent)
|
||||
: CanbusTrigger(parent->parent_->canbus_, parent->can_response_id_, 0x1FFFFFFF, parent->use_extended_id_),
|
||||
parent_(parent) {
|
||||
auto automation = new Automation<std::vector<uint8_t>, uint32_t, bool>(this);
|
||||
automation->add_action(this);
|
||||
};
|
||||
|
||||
void play(std::vector<uint8_t> data, uint32_t can_id, bool rx) override {
|
||||
this->parent_->handle_incoming(data);
|
||||
}
|
||||
void play(std::vector<uint8_t> data, uint32_t can_id, bool rx) override { this->parent_->handle_incoming(data); }
|
||||
|
||||
protected:
|
||||
PIDRequest *parent_;
|
||||
protected:
|
||||
PIDRequest *parent_;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace obd
|
||||
} // namespace esphome
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user