Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-01-20 21:11:32 +01:00
Code Issues Projects Releases Wiki Activity

Fix compatibility with esp-idf framework

Browse Source
This commit is contained in:
Petapton 2023-03-19 11:27:53 +00:00
parent 5a33492cc1
commit aee768c786
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
esphome/components/madoka/madoka.cpp
View File

@ -59,8 +59,8 @@ void Madoka::control(const ClimateCall &call) {
uint16_t target_low = *call.get_target_temperature_low() * 128; uint16_t target_low = *call.get_target_temperature_low() * 128;
uint16_t target_high = *call.get_target_temperature_high() * 128; uint16_t target_high = *call.get_target_temperature_high() * 128;
this->query(0x4040, this->query(0x4040,
message({0x20, 0x02, (target_high >> 8) & 0xFF, target_high & 0xFF, 0x21, 0x02, message({0x20, 0x02, (uint8_t)((target_high >> 8) & 0xFF), (uint8_t)(target_high & 0xFF), 0x21, 0x02,
(target_low >> 8) & 0xFF, target_low & 0xFF}), (uint8_t)((target_low >> 8) & 0xFF), (uint8_t)(target_low & 0xFF)}),
400); 400);
} }
this->update(); this->update();
@ -73,9 +73,9 @@ void Madoka::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_para
break; break;
case ESP_GAP_BLE_NC_REQ_EVT: case ESP_GAP_BLE_NC_REQ_EVT:
esp_ble_confirm_reply(param->ble_security.ble_req.bd_addr, true); esp_ble_confirm_reply(param->ble_security.ble_req.bd_addr, true);
ESP_LOGI(TAG, "ESP_GAP_BLE_NC_REQ_EVT, the passkey Notify number:%ld", param->ble_security.key_notif.passkey); ESP_LOGI(TAG, "ESP_GAP_BLE_NC_REQ_EVT, the passkey Notify number:%d", param->ble_security.key_notif.passkey);
break; break;
case ESP_GAP_BLE_AUTH_CMPL_EVT: case ESP_GAP_BLE_AUTH_CMPL_EVT: {
if (!param->ble_security.auth_cmpl.success) { if (!param->ble_security.auth_cmpl.success) {
ESP_LOGE(TAG, "Authentication failed, status: 0x%x", param->ble_security.auth_cmpl.fail_reason); ESP_LOGE(TAG, "Authentication failed, status: 0x%x", param->ble_security.auth_cmpl.fail_reason);
break; break;
@ -95,6 +95,9 @@ void Madoka::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_para
ESP_LOGW(TAG, "[%s] esp_ble_gattc_register_for_notify failed, status=%d", this->get_name().c_str(), status); ESP_LOGW(TAG, "[%s] esp_ble_gattc_register_for_notify failed, status=%d", this->get_name().c_str(), status);
} }
break; break;
}
default:
break;
} }
} }
@ -207,7 +210,7 @@ std::vector<chunk> Madoka::split_payload(message msg) {
} }
message Madoka::prepare_message(uint16_t cmd, message args) { message Madoka::prepare_message(uint16_t cmd, message args) {
message result({0x00, (cmd >> 8) & 0xFF, cmd & 0xFF}); message result({0x00, (uint8_t)((cmd >> 8) & 0xFF), (uint8_t)(cmd & 0xFF)});
result.insert(result.end(), args.begin(), args.end()); result.insert(result.end(), args.begin(), args.end());
return result; return result;
} }