C Code cleanup

esphome/components/obd/obd_component.h

@@ -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:
+ public:
-    explicit OBDComponent() : PollingComponent(500) {}
+  explicit OBDComponent() : PollingComponent(500) {}
-    void call_setup() override;
+  void call_setup() override;
-    void update() override;
+  void update() override;
 
-    void set_canbus(canbus::Canbus *canbus) { this->canbus_ = canbus; }
+  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_enabled_by_default(bool enabled_by_default) { this->enabled_by_default_ = enabled_by_default; }
 
-    void add_pidrequest(PIDRequest *request);
+  void add_pidrequest(PIDRequest *request);
-    void dump_config() override;
+  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);
-    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, uint8_t d);
 
-  protected:
+ protected:
-    canbus::Canbus *canbus_{nullptr};
+  canbus::Canbus *canbus_{nullptr};
-    bool enabled_by_default_{false};
+  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:
+ public:
-    explicit PIDRequest(OBDComponent *parent, const std::uint32_t can_id, const std::uint32_t pid,
+  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)
+                      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){
+      : parent_(parent),
-        this->state_ = WAITING;
+        can_id_(can_id),
-      };
+        pid_(pid),
+        can_response_id_(can_response_id),
+        use_extended_id_(use_extended_id) {
+    this->state_ = WAITING;
+  };
 
-    void setup() override;
+  void setup() override;
-    uint32_t last_polled_{0};
+  uint32_t last_polled_{0};
 
-    bool start();
+  bool start();
-    bool update();
+  bool update();
 
-    void set_timeout(std::uint32_t timeout) { this->timeout_ = timeout; }
+  void set_timeout(std::uint32_t timeout) { this->timeout_ = timeout; }
-    void set_interval(std::uint32_t interval) { this->interval_ = interval; }
+  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_reply_length(std::uint32_t reply_length) { this->reply_length_ = reply_length; }
 
-    void add_sensor(OBDSensorBase *sensor) { this->sensors_.push_back(sensor); }
+  void add_sensor(OBDSensorBase *sensor) { this->sensors_.push_back(sensor); }
-    void add_trigger(OBDPidTrigger *trigger) { this->triggers_.push_back(trigger); }
+  void add_trigger(OBDPidTrigger *trigger) { this->triggers_.push_back(trigger); }
-    void dump_config() override;
+  void dump_config() override;
 
-  protected:
+ protected:
-    void handle_incoming(std::vector<uint8_t> &data);
+  void handle_incoming(std::vector<uint8_t> &data);
 
-    OBDComponent *parent_;
+  OBDComponent *parent_;
-    uint32_t can_id_;
+  uint32_t can_id_;
-    uint32_t can_response_id_;
+  uint32_t can_response_id_;
-    uint32_t pid_;
+  uint32_t pid_;
-    bool use_extended_id_;
+  bool use_extended_id_;
-    uint32_t interval_{5000};
+  uint32_t interval_{5000};
-    uint32_t timeout_{500};
+  uint32_t timeout_{500};
-    uint32_t reply_length_{8};
+  uint32_t reply_length_{8};
 
-    request_state_t state_{WAITING};
+  request_state_t state_{WAITING};
-    std::vector<uint8_t> response_buffer_{};
+  std::vector<uint8_t> response_buffer_{};
 
-    std::vector<OBDSensorBase *> sensors_{};
+  std::vector<OBDSensorBase *> sensors_{};
-    std::vector<OBDPidTrigger *> triggers_{};
+  std::vector<OBDPidTrigger *> triggers_{};
 };
 
 class OBDPidTrigger : public Trigger<std::vector<uint8_t>>, public Component {
-  public:
+ public:
-    explicit OBDPidTrigger(PIDRequest *parent) : parent_(parent){}
+  explicit OBDPidTrigger(PIDRequest *parent) : parent_(parent) {}
 
-    void setup() override { this->parent_->add_trigger(this); }
+  void setup() override { this->parent_->add_trigger(this); }
 
-  protected:
+ protected:
-    PIDRequest *parent_;
+  PIDRequest *parent_;
 };
 
 class OBDSensorBase {
-  public:
+ public:
-    virtual void update(const std::vector<uint8_t> &data) {}
+  virtual void update(const std::vector<uint8_t> &data) {}
 };
 
 class OBDSensor : public OBDSensorBase, public sensor::Sensor, public Component {
-  public:
+ public:
-    explicit OBDSensor(PIDRequest *parent) : parent_(parent){}
+  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 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:
+ protected:
-      PIDRequest *parent_;
+  PIDRequest *parent_;
-      data_to_value_t data_to_value_func_{};
+  data_to_value_t data_to_value_func_{};
 };
 
 class OBDBinarySensor : public OBDSensorBase, public binary_sensor::BinarySensor, public Component {
-  public:
+ public:
-    explicit OBDBinarySensor(PIDRequest *parent) : parent_(parent){}
+  explicit OBDBinarySensor(PIDRequest *parent) : parent_(parent) {}
 
-    void set_template(data_to_bool_t &&lambda) { this->data_to_value_func_ = lambda; }
+  void set_template(data_to_bool_t &&lambda) { this->data_to_value_func_ = lambda; }
-    void update(const std::vector<uint8_t> &data) override;
+  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:
+ protected:
-      PIDRequest *parent_;
+  PIDRequest *parent_;
-      data_to_bool_t data_to_value_func_;
+  data_to_bool_t data_to_value_func_;
 };
 
 class OBDCanbusTrigger : public canbus::CanbusTrigger, public Action<std::vector<uint8_t>, uint32_t, bool> {
-  public:
+ public:
-    explicit OBDCanbusTrigger(PIDRequest *parent) : CanbusTrigger(parent->parent_->canbus_, parent->can_response_id_, 0x1FFFFFFF, parent->use_extended_id_), parent_(parent){
+  explicit OBDCanbusTrigger(PIDRequest *parent)
-      auto automation = new Automation<std::vector<uint8_t>, uint32_t, bool>(this);
+      : CanbusTrigger(parent->parent_->canbus_, parent->can_response_id_, 0x1FFFFFFF, parent->use_extended_id_),
-      automation->add_action(this);   
+        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 {
+  void play(std::vector<uint8_t> data, uint32_t can_id, bool rx) override { this->parent_->handle_incoming(data); }
-        this->parent_->handle_incoming(data);
-    }
 
-  protected:
+ protected:
-    PIDRequest *parent_;
+  PIDRequest *parent_;
 };
 
-}
+}  // namespace obd
-}
+}  // namespace esphome
-