andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

replace list with deque

Browse Source
This commit is contained in:
proddy
2021-01-08 21:02:48 +01:00
parent 3bbee6b72a
commit 6d5031290c
3 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mqtt.cpp
View File

@@ -40,7 +40,7 @@ uint8_t Mqtt::ha_climate_format_;
bool Mqtt::ha_enabled_; bool Mqtt::ha_enabled_;
// static emsesp::queue<Mqtt::QueuedMqttMessage> mqtt_messages_ = emsesp::queue<Mqtt::QueuedMqttMessage>(MAX_MQTT_MESSAGES); // static emsesp::queue<Mqtt::QueuedMqttMessage> mqtt_messages_ = emsesp::queue<Mqtt::QueuedMqttMessage>(MAX_MQTT_MESSAGES);
std::list<Mqtt::QueuedMqttMessage> Mqtt::mqtt_messages_; std::deque<Mqtt::QueuedMqttMessage> Mqtt::mqtt_messages_;
std::vector<Mqtt::MQTTSubFunction> Mqtt::mqtt_subfunctions_; std::vector<Mqtt::MQTTSubFunction> Mqtt::mqtt_subfunctions_;

11
src/mqtt.h
View File

@@ -24,7 +24,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <list> #include <deque>
#include <functional> #include <functional>
#include <AsyncMqttClient.h> #include <AsyncMqttClient.h>
@@ -108,12 +108,7 @@ class Mqtt {
static void publish_ha(const std::string & topic, const JsonObject & payload); static void publish_ha(const std::string & topic, const JsonObject & payload);
static void publish_ha(const __FlashStringHelper * topic, const JsonObject & payload); static void publish_ha(const __FlashStringHelper * topic, const JsonObject & payload);
static void register_mqtt_ha_sensor(uint8_t type, static void register_mqtt_ha_sensor(uint8_t type, uint8_t tag, const __FlashStringHelper * name, const uint8_t device_type, const __FlashStringHelper * entity, const uint8_t uom);
uint8_t tag,
const __FlashStringHelper * name,
const uint8_t device_type,
const __FlashStringHelper * entity,
const uint8_t uom);
static void register_command(const uint8_t device_type, const __FlashStringHelper * cmd, cmdfunction_p cb); static void register_command(const uint8_t device_type, const __FlashStringHelper * cmd, cmdfunction_p cb);
static void show_topic_handlers(uuid::console::Shell & shell, const uint8_t device_type); static void show_topic_handlers(uuid::console::Shell & shell, const uint8_t device_type);
@@ -204,7 +199,7 @@ class Mqtt {
packet_id_ = 0; packet_id_ = 0;
} }
}; };
static std::list<QueuedMqttMessage> mqtt_messages_; static std::deque<QueuedMqttMessage> mqtt_messages_;
private: private:
static uuid::log::Logger logger_; static uuid::log::Logger logger_;

25
src/telegram.h
View File

@@ -20,6 +20,7 @@
#define EMSESP_TELEGRAM_H #define EMSESP_TELEGRAM_H
#include <string> #include <string>
#include <deque>
// UART drivers // UART drivers
#if defined(ESP8266) #if defined(ESP8266)
@@ -57,13 +58,7 @@ namespace emsesp {
class Telegram { class Telegram {
public: public:
Telegram(const uint8_t operation, Telegram(const uint8_t operation, const uint8_t src, const uint8_t dest, const uint16_t type_id, const uint8_t offset, const uint8_t * message_data, const uint8_t message_length);
const uint8_t src,
const uint8_t dest,
const uint16_t type_id,
const uint8_t offset,
const uint8_t * message_data,
const uint8_t message_length);
~Telegram() = default; ~Telegram() = default;
const uint8_t operation; // is Operation mode const uint8_t operation; // is Operation mode
@@ -242,7 +237,7 @@ class RxService : public EMSbus {
} }
}; };
const std::list<QueuedRxTelegram> queue() const { const std::deque<QueuedRxTelegram> queue() const {
return rx_telegrams_; return rx_telegrams_;
} }
@@ -264,7 +259,7 @@ class RxService : public EMSbus {
uint32_t telegram_count_ = 0; // # Rx received uint32_t telegram_count_ = 0; // # Rx received
uint32_t telegram_error_count_ = 0; // # Rx CRC errors uint32_t telegram_error_count_ = 0; // # Rx CRC errors
std::shared_ptr<const Telegram> rx_telegram; // the incoming Rx telegram std::shared_ptr<const Telegram> rx_telegram; // the incoming Rx telegram
std::list<QueuedRxTelegram> rx_telegrams_; // the Rx Queue std::deque<QueuedRxTelegram> rx_telegrams_; // the Rx Queue
// emsesp::queue<QueuedRxTelegram> rx_telegrams_ = emsesp::queue<QueuedRxTelegram>(MAX_RX_TELEGRAMS); // the Rx Queue // emsesp::queue<QueuedRxTelegram> rx_telegrams_ = emsesp::queue<QueuedRxTelegram>(MAX_RX_TELEGRAMS); // the Rx Queue
}; };
@@ -278,13 +273,7 @@ class TxService : public EMSbus {
void start(); void start();
void send(); void send();
void add(const uint8_t operation, void add(const uint8_t operation, const uint8_t dest, const uint16_t type_id, const uint8_t offset, uint8_t * message_data, const uint8_t message_length, const bool front = false);
const uint8_t dest,
const uint16_t type_id,
const uint8_t offset,
uint8_t * message_data,
const uint8_t message_length,
const bool front = false);
void add(const uint8_t operation, const uint8_t * data, const uint8_t length, const bool front = false); void add(const uint8_t operation, const uint8_t * data, const uint8_t length, const bool front = false);
void read_request(const uint16_t type_id, const uint8_t dest, const uint8_t offset = 0); void read_request(const uint16_t type_id, const uint8_t dest, const uint8_t offset = 0);
void send_raw(const char * telegram_data); void send_raw(const char * telegram_data);
@@ -366,7 +355,7 @@ class TxService : public EMSbus {
} }
}; };
const std::list<QueuedTxTelegram> queue() const { const std::deque<QueuedTxTelegram> queue() const {
return tx_telegrams_; return tx_telegrams_;
} }
@@ -389,7 +378,7 @@ class TxService : public EMSbus {
#endif #endif
private: private:
std::list<QueuedTxTelegram> tx_telegrams_; // the Tx queue std::deque<QueuedTxTelegram> tx_telegrams_; // the Tx queue
// emsesp::queue<QueuedTxTelegram> tx_telegrams_ = emsesp::queue<QueuedTxTelegram>(MAX_TX_TELEGRAMS); // the Tx Queue // emsesp::queue<QueuedTxTelegram> tx_telegrams_ = emsesp::queue<QueuedTxTelegram>(MAX_TX_TELEGRAMS); // the Tx Queue
uint32_t telegram_read_count_ = 0; // # Tx successful reads uint32_t telegram_read_count_ = 0; // # Tx successful reads