sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-04-19 01:00:28 +01:00
Code Issues Releases Wiki Activity

Remove optional<> for pointer types (#6120)

Browse Source
This commit is contained in:
Stefan Rado 2024-01-19 14:30:57 +01:00 committed by GitHub
parent 6a8da17ea3
commit 2f09624c07
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
esphome/components/bedjet/bedjet_hub.cpp
View File

@ -242,7 +242,7 @@ void BedJetHub::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
this->set_notify_(true); this->set_notify_(true);
#ifdef USE_TIME #ifdef USE_TIME
if (this->time_id_.has_value()) { if (this->time_id_ != nullptr) {
this->send_local_time(); this->send_local_time();
} }
#endif #endif
@ -441,9 +441,8 @@ uint8_t BedJetHub::write_notify_config_descriptor_(bool enable) {
#ifdef USE_TIME #ifdef USE_TIME
void BedJetHub::send_local_time() { void BedJetHub::send_local_time() {
if (this->time_id_.has_value()) { if (this->time_id_ != nullptr) {
auto *time_id = *this->time_id_; ESPTime now = this->time_id_->now();
ESPTime now = time_id->now();
if (now.is_valid()) { if (now.is_valid()) {
this->set_clock(now.hour, now.minute); this->set_clock(now.hour, now.minute);
ESP_LOGD(TAG, "Using time component to set BedJet clock: %d:%02d", now.hour, now.minute); ESP_LOGD(TAG, "Using time component to set BedJet clock: %d:%02d", now.hour, now.minute);
@ -454,10 +453,9 @@ void BedJetHub::send_local_time() {
} }
void BedJetHub::setup_time_() { void BedJetHub::setup_time_() {
if (this->time_id_.has_value()) { if (this->time_id_ != nullptr) {
this->send_local_time(); this->send_local_time();
auto *time_id = *this->time_id_; this->time_id_->add_on_time_sync_callback([this] { this->send_local_time(); });
time_id->add_on_time_sync_callback([this] { this->send_local_time(); });
} else { } else {
ESP_LOGI(TAG, "`time_id` is not configured: will not sync BedJet clock."); ESP_LOGI(TAG, "`time_id` is not configured: will not sync BedJet clock.");
} }

2
esphome/components/bedjet/bedjet_hub.h
View File

@ -141,7 +141,7 @@ class BedJetHub : public esphome::ble_client::BLEClientNode, public PollingCompo
#ifdef USE_TIME #ifdef USE_TIME
/** Initializes time sync callbacks to support syncing current time to the BedJet. */ /** Initializes time sync callbacks to support syncing current time to the BedJet. */
void setup_time_(); void setup_time_();
optional<time::RealTimeClock *> time_id_{}; time::RealTimeClock *time_id_{nullptr};
#endif #endif
uint32_t timeout_{DEFAULT_STATUS_TIMEOUT}; uint32_t timeout_{DEFAULT_STATUS_TIMEOUT};

20
esphome/components/tuya/tuya.cpp
View File

@ -23,8 +23,8 @@ static const int MAX_RETRIES = 5;
void Tuya::setup() { void Tuya::setup() {
this->set_interval("heartbeat", 15000, [this] { this->send_empty_command_(TuyaCommandType::HEARTBEAT); }); this->set_interval("heartbeat", 15000, [this] { this->send_empty_command_(TuyaCommandType::HEARTBEAT); });
if (this->status_pin_.has_value()) { if (this->status_pin_ != nullptr) {
this->status_pin_.value()->digital_write(false); this->status_pin_->digital_write(false);
} }
} }
@ -70,9 +70,7 @@ void Tuya::dump_config() {
ESP_LOGCONFIG(TAG, " GPIO Configuration: status: pin %d, reset: pin %d", this->status_pin_reported_, ESP_LOGCONFIG(TAG, " GPIO Configuration: status: pin %d, reset: pin %d", this->status_pin_reported_,
this->reset_pin_reported_); this->reset_pin_reported_);
} }
if (this->status_pin_.has_value()) { LOG_PIN(" Status Pin: ", this->status_pin_);
LOG_PIN(" Status Pin: ", this->status_pin_.value());
}
ESP_LOGCONFIG(TAG, " Product: '%s'", this->product_.c_str()); ESP_LOGCONFIG(TAG, " Product: '%s'", this->product_.c_str());
} }
@ -194,7 +192,7 @@ void Tuya::handle_command_(uint8_t command, uint8_t version, const uint8_t *buff
this->init_state_ = TuyaInitState::INIT_DATAPOINT; this->init_state_ = TuyaInitState::INIT_DATAPOINT;
this->send_empty_command_(TuyaCommandType::DATAPOINT_QUERY); this->send_empty_command_(TuyaCommandType::DATAPOINT_QUERY);
bool is_pin_equals = bool is_pin_equals =
this->status_pin_.has_value() && this->status_pin_.value()->get_pin() == this->status_pin_reported_; this->status_pin_ != nullptr && this->status_pin_->get_pin() == this->status_pin_reported_;
// Configure status pin toggling (if reported and configured) or WIFI_STATE periodic send // Configure status pin toggling (if reported and configured) or WIFI_STATE periodic send
if (is_pin_equals) { if (is_pin_equals) {
ESP_LOGV(TAG, "Configured status pin %i", this->status_pin_reported_); ESP_LOGV(TAG, "Configured status pin %i", this->status_pin_reported_);
@ -244,13 +242,12 @@ void Tuya::handle_command_(uint8_t command, uint8_t version, const uint8_t *buff
break; break;
case TuyaCommandType::LOCAL_TIME_QUERY: case TuyaCommandType::LOCAL_TIME_QUERY:
#ifdef USE_TIME #ifdef USE_TIME
if (this->time_id_.has_value()) { if (this->time_id_ != nullptr) {
this->send_local_time_(); this->send_local_time_();
if (!this->time_sync_callback_registered_) { if (!this->time_sync_callback_registered_) {
// tuya mcu supports time, so we let them know when our time changed // tuya mcu supports time, so we let them know when our time changed
auto *time_id = *this->time_id_; this->time_id_->add_on_time_sync_callback([this] { this->send_local_time_(); });
time_id->add_on_time_sync_callback([this] { this->send_local_time_(); });
this->time_sync_callback_registered_ = true; this->time_sync_callback_registered_ = true;
} }
} else } else
@ -463,7 +460,7 @@ void Tuya::send_empty_command_(TuyaCommandType command) {
void Tuya::set_status_pin_() { void Tuya::set_status_pin_() {
bool is_network_ready = network::is_connected() && remote_is_connected(); bool is_network_ready = network::is_connected() && remote_is_connected();
this->status_pin_.value()->digital_write(is_network_ready); this->status_pin_->digital_write(is_network_ready);
} }
uint8_t Tuya::get_wifi_status_code_() { uint8_t Tuya::get_wifi_status_code_() {
@ -511,8 +508,7 @@ void Tuya::send_wifi_status_() {
#ifdef USE_TIME #ifdef USE_TIME
void Tuya::send_local_time_() { void Tuya::send_local_time_() {
std::vector<uint8_t> payload; std::vector<uint8_t> payload;
auto *time_id = *this->time_id_; ESPTime now = this->time_id_->now();
ESPTime now = time_id->now();
if (now.is_valid()) { if (now.is_valid()) {
uint8_t year = now.year - 2000; uint8_t year = now.year - 2000;
uint8_t month = now.month; uint8_t month = now.month;

4
esphome/components/tuya/tuya.h
View File

@ -130,14 +130,14 @@ class Tuya : public Component, public uart::UARTDevice {
#ifdef USE_TIME #ifdef USE_TIME
void send_local_time_(); void send_local_time_();
optional<time::RealTimeClock *> time_id_{}; time::RealTimeClock *time_id_{nullptr};
bool time_sync_callback_registered_{false}; bool time_sync_callback_registered_{false};
#endif #endif
TuyaInitState init_state_ = TuyaInitState::INIT_HEARTBEAT; TuyaInitState init_state_ = TuyaInitState::INIT_HEARTBEAT;
bool init_failed_{false}; bool init_failed_{false};
int init_retries_{0}; int init_retries_{0};
uint8_t protocol_version_ = -1; uint8_t protocol_version_ = -1;
optional<InternalGPIOPin *> status_pin_{}; InternalGPIOPin *status_pin_{nullptr};
int status_pin_reported_ = -1; int status_pin_reported_ = -1;
int reset_pin_reported_ = -1; int reset_pin_reported_ = -1;
uint32_t last_command_timestamp_ = 0; uint32_t last_command_timestamp_ = 0;