mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-07 00:09:51 +03:00
changed comments
This commit is contained in:
@@ -51,7 +51,7 @@
|
|||||||
{210, DeviceType::BOILER, "Cascade MC400", DeviceFlags::EMS_DEVICE_FLAG_NONE},
|
{210, DeviceType::BOILER, "Cascade MC400", DeviceFlags::EMS_DEVICE_FLAG_NONE},
|
||||||
{211, DeviceType::BOILER, "EasyControl Adapter", DeviceFlags::EMS_DEVICE_FLAG_NONE},
|
{211, DeviceType::BOILER, "EasyControl Adapter", DeviceFlags::EMS_DEVICE_FLAG_NONE},
|
||||||
{219, DeviceType::BOILER, "Greenstar HIU/Logamax kompakt WS170", DeviceFlags::EMS_DEVICE_FLAG_HIU},
|
{219, DeviceType::BOILER, "Greenstar HIU/Logamax kompakt WS170", DeviceFlags::EMS_DEVICE_FLAG_HIU},
|
||||||
{234, DeviceType::BOILER, "Logamax Plus GB122/Condense 2300", DeviceFlags::EMS_DEVICE_FLAG_NONE},
|
{234, DeviceType::BOILER, "Logamax Plus GB122/Condense 2300/Junkers Cerapur GC2200W 20/25C", DeviceFlags::EMS_DEVICE_FLAG_NONE},
|
||||||
|
|
||||||
// Controllers - 0x09 / 0x10 / 0x50
|
// Controllers - 0x09 / 0x10 / 0x50
|
||||||
{ 68, DeviceType::CONTROLLER, "BC10/RFM20", DeviceFlags::EMS_DEVICE_FLAG_NONE}, // 0x09
|
{ 68, DeviceType::CONTROLLER, "BC10/RFM20", DeviceFlags::EMS_DEVICE_FLAG_NONE}, // 0x09
|
||||||
@@ -100,7 +100,7 @@
|
|||||||
{215, DeviceType::THERMOSTAT, "Comfort RF", DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
|
{215, DeviceType::THERMOSTAT, "Comfort RF", DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
|
||||||
{216, DeviceType::THERMOSTAT, "CRF200S", DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
|
{216, DeviceType::THERMOSTAT, "CRF200S", DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
|
||||||
{246, DeviceType::THERMOSTAT, "Comfort+2RF", DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
|
{246, DeviceType::THERMOSTAT, "Comfort+2RF", DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
|
||||||
{253, DeviceType::THERMOSTAT, "Rego 3000/UI800/WSW16i/BC400", DeviceFlags::EMS_DEVICE_FLAG_BC400}, // 0x10
|
{253, DeviceType::THERMOSTAT, "Rego 3000/UI800/WSW1x6i/BC400", DeviceFlags::EMS_DEVICE_FLAG_BC400}, // 0x10
|
||||||
|
|
||||||
// Thermostat - Sieger - 0x10 / 0x17
|
// Thermostat - Sieger - 0x10 / 0x17
|
||||||
{ 66, DeviceType::THERMOSTAT, "ES72/RC20", DeviceFlags::EMS_DEVICE_FLAG_RC20_N}, // 0x17 or remote
|
{ 66, DeviceType::THERMOSTAT, "ES72/RC20", DeviceFlags::EMS_DEVICE_FLAG_RC20_N}, // 0x17 or remote
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ void Mqtt::subscribe(const uint8_t device_type, const std::string & topic, mqtt_
|
|||||||
|
|
||||||
// register in our libary with the callback function.
|
// register in our libary with the callback function.
|
||||||
// We store the original topic string without base
|
// We store the original topic string without base
|
||||||
// TODO check if ok to remove the std::move(topic)
|
// removed std::move(topic) in 3.7.0-dev.43
|
||||||
mqtt_subfunctions_.emplace_back(device_type, topic, cb);
|
mqtt_subfunctions_.emplace_back(device_type, topic, cb);
|
||||||
|
|
||||||
if (!enabled() || !connected()) {
|
if (!enabled() || !connected()) {
|
||||||
|
|||||||
@@ -256,7 +256,7 @@ class Mqtt {
|
|||||||
const std::string topic_; // short topic name
|
const std::string topic_; // short topic name
|
||||||
mqtt_sub_function_p mqtt_subfunction_; // can be empty
|
mqtt_sub_function_p mqtt_subfunction_; // can be empty
|
||||||
|
|
||||||
// TODO see if remove &&topic to &topic is ok, so we don't need the std:move
|
// replaced &&topic with &topic in 3.7.0-dev.43, so we prevent the std:move later
|
||||||
MQTTSubFunction(uint8_t device_type, const std::string & topic, mqtt_sub_function_p mqtt_subfunction)
|
MQTTSubFunction(uint8_t device_type, const std::string & topic, mqtt_sub_function_p mqtt_subfunction)
|
||||||
: device_type_(device_type)
|
: device_type_(device_type)
|
||||||
, topic_(topic)
|
, topic_(topic)
|
||||||
|
|||||||
@@ -68,7 +68,6 @@ std::deque<Token> exprToTokens(const std::string & expr) {
|
|||||||
++p;
|
++p;
|
||||||
}
|
}
|
||||||
const auto s = std::string(b, p);
|
const auto s = std::string(b, p);
|
||||||
// TODO check works with emplace_back
|
|
||||||
tokens.emplace_back(Token::Type::String, s, -3);
|
tokens.emplace_back(Token::Type::String, s, -3);
|
||||||
if (*p == '\0') {
|
if (*p == '\0') {
|
||||||
--p;
|
--p;
|
||||||
@@ -79,7 +78,6 @@ std::deque<Token> exprToTokens(const std::string & expr) {
|
|||||||
++p;
|
++p;
|
||||||
}
|
}
|
||||||
const auto s = std::string(b, p);
|
const auto s = std::string(b, p);
|
||||||
// TODO check works with emplace_back
|
|
||||||
tokens.emplace_back(Token::Type::String, s, -2);
|
tokens.emplace_back(Token::Type::String, s, -2);
|
||||||
--p;
|
--p;
|
||||||
} else if (*p == '"') {
|
} else if (*p == '"') {
|
||||||
@@ -209,7 +207,6 @@ std::deque<Token> exprToTokens(const std::string & expr) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
const auto s = std::string(1, c);
|
const auto s = std::string(1, c);
|
||||||
// TODO check works with emplace_back
|
|
||||||
tokens.emplace_back(token, s, precedence, rightAssociative);
|
tokens.emplace_back(token, s, precedence, rightAssociative);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -223,7 +220,6 @@ std::deque<Token> shuntingYard(const std::deque<Token> & tokens) {
|
|||||||
std::vector<Token> stack;
|
std::vector<Token> stack;
|
||||||
|
|
||||||
// While there are tokens to be read:
|
// While there are tokens to be read:
|
||||||
// TODO check still works with const reference
|
|
||||||
for (auto const & token : tokens) {
|
for (auto const & token : tokens) {
|
||||||
// Read a token
|
// Read a token
|
||||||
switch (token.type) {
|
switch (token.type) {
|
||||||
|
|||||||
@@ -285,7 +285,7 @@ class RxService : public EMSbus {
|
|||||||
const std::shared_ptr<const Telegram> telegram_;
|
const std::shared_ptr<const Telegram> telegram_;
|
||||||
|
|
||||||
~QueuedRxTelegram() = default;
|
~QueuedRxTelegram() = default;
|
||||||
// TODO check if still works without std::shared_ptr<Telegram> && telegram
|
// removed && from telegram in 3.7.0-dev.43
|
||||||
QueuedRxTelegram(uint16_t id, std::shared_ptr<Telegram> telegram)
|
QueuedRxTelegram(uint16_t id, std::shared_ptr<Telegram> telegram)
|
||||||
: id_(id)
|
: id_(id)
|
||||||
, telegram_(std::move(telegram)) {
|
, telegram_(std::move(telegram)) {
|
||||||
@@ -415,7 +415,7 @@ class TxService : public EMSbus {
|
|||||||
const uint16_t validateid_;
|
const uint16_t validateid_;
|
||||||
|
|
||||||
~QueuedTxTelegram() = default;
|
~QueuedTxTelegram() = default;
|
||||||
// TODO test this refactor, removing && from std::shared_ptr<Telegram> && telegram
|
// replaced && im std::shared_ptr<Telegram> telegram in 3.7.0-dev.43
|
||||||
QueuedTxTelegram(uint16_t id, std::shared_ptr<Telegram> telegram, bool retry, uint16_t validateid)
|
QueuedTxTelegram(uint16_t id, std::shared_ptr<Telegram> telegram, bool retry, uint16_t validateid)
|
||||||
: id_(id)
|
: id_(id)
|
||||||
, telegram_(std::move(telegram))
|
, telegram_(std::move(telegram))
|
||||||
|
|||||||
Reference in New Issue
Block a user