sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 06:33:51 +00:00
Code Issues Releases Wiki Activity

Force braces around multi-line statements (#3094)

Browse Source 
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
This commit is contained in:
Oxan van Leeuwen
2022-01-24 20:56:36 +01:00
committed by GitHub
parent 6b27f2d2cf
commit 80d03a631e
125 changed files with 770 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
esphome/components/remote_base/coolix_protocol.cpp
View File

@@ -51,10 +51,11 @@ static bool decode_data(RemoteReceiveData &src, CoolixData &dst) {
for (uint32_t mask = 1 << 7; mask; mask >>= 1) {
if (!src.expect_mark(BIT_MARK_US))
return false;
if (src.expect_space(BIT_ONE_SPACE_US))
if (src.expect_space(BIT_ONE_SPACE_US)) {
data |= mask;
else if (!src.expect_space(BIT_ZERO_SPACE_US))
} else if (!src.expect_space(BIT_ZERO_SPACE_US)) {
return false;
}
}
// Check for inverse byte
for (uint32_t mask = 1 << 7; mask; mask >>= 1) {

10
esphome/components/remote_base/dish_protocol.cpp
View File

@@ -24,18 +24,20 @@ void DishProtocol::encode(RemoteTransmitData *dst, const DishData &data) {
for (uint i = 0; i < 4; i++) {
// COMMAND (function, in MSB)
for (uint8_t mask = 1UL << 5; mask; mask >>= 1) {
if (data.command & mask)
if (data.command & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
// ADDRESS (unit code, in LSB)
for (uint8_t mask = 1UL; mask < 1UL << 4; mask <<= 1) {
if ((data.address - 1) & mask)
if ((data.address - 1) & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
// PADDING
for (uint j = 0; j < 6; j++)

5
esphome/components/remote_base/jvc_protocol.cpp
View File

@@ -20,10 +20,11 @@ void JVCProtocol::encode(RemoteTransmitData *dst, const JVCData &data) {
dst->item(HEADER_HIGH_US, HEADER_LOW_US);
for (uint32_t mask = 1UL << (NBITS - 1); mask != 0; mask >>= 1) {
if (data.data & mask)
if (data.data & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
dst->mark(BIT_HIGH_US);

5
esphome/components/remote_base/lg_protocol.cpp
View File

@@ -19,10 +19,11 @@ void LGProtocol::encode(RemoteTransmitData *dst, const LGData &data) {
dst->item(HEADER_HIGH_US, HEADER_LOW_US);
for (uint32_t mask = 1UL << (data.nbits - 1); mask != 0; mask >>= 1) {
if (data.data & mask)
if (data.data & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
dst->mark(BIT_HIGH_US);

11
esphome/components/remote_base/midea_protocol.cpp
View File

@@ -31,14 +31,16 @@ void MideaProtocol::encode(RemoteTransmitData *dst, const MideaData &src) {
dst->set_carrier_frequency(38000);
dst->reserve(2 + 48 * 2 + 2 + 2 + 48 * 2 + 1);
dst->item(HEADER_MARK_US, HEADER_SPACE_US);
for (unsigned idx = 0; idx < 6; idx++)
for (unsigned idx = 0; idx < 6; idx++) {
for (uint8_t mask = 1 << 7; mask; mask >>= 1)
dst->item(BIT_MARK_US, (src[idx] & mask) ? BIT_ONE_SPACE_US : BIT_ZERO_SPACE_US);
}
dst->item(FOOTER_MARK_US, FOOTER_SPACE_US);
dst->item(HEADER_MARK_US, HEADER_SPACE_US);
for (unsigned idx = 0; idx < 6; idx++)
for (unsigned idx = 0; idx < 6; idx++) {
for (uint8_t mask = 1 << 7; mask; mask >>= 1)
dst->item(BIT_MARK_US, (src[idx] & mask) ? BIT_ZERO_SPACE_US : BIT_ONE_SPACE_US);
}
dst->mark(FOOTER_MARK_US);
}
@@ -48,10 +50,11 @@ static bool decode_data(RemoteReceiveData &src, MideaData &dst) {
for (uint8_t mask = 1 << 7; mask; mask >>= 1) {
if (!src.expect_mark(BIT_MARK_US))
return false;
if (src.expect_space(BIT_ONE_SPACE_US))
if (src.expect_space(BIT_ONE_SPACE_US)) {
data |= mask;
else if (!src.expect_space(BIT_ZERO_SPACE_US))
} else if (!src.expect_space(BIT_ZERO_SPACE_US)) {
return false;
}
}
dst[idx] = data;
}

10
esphome/components/remote_base/nec_protocol.cpp
View File

@@ -18,17 +18,19 @@ void NECProtocol::encode(RemoteTransmitData *dst, const NECData &data) {
dst->item(HEADER_HIGH_US, HEADER_LOW_US);
for (uint16_t mask = 1; mask; mask <<= 1) {
if (data.address & mask)
if (data.address & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
for (uint16_t mask = 1; mask; mask <<= 1) {
if (data.command & mask)
if (data.command & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
dst->mark(BIT_HIGH_US);

25
esphome/components/remote_base/nexa_protocol.cpp
View File

@@ -41,43 +41,48 @@ void NexaProtocol::encode(RemoteTransmitData *dst, const NexaData &data) {
// Device (26 bits)
for (int16_t i = 26 - 1; i >= 0; i--) {
if (data.device & (1 << i))
if (data.device & (1 << i)) {
this->one(dst);
else
} else {
this->zero(dst);
}
}
// Group (1 bit)
if (data.group != 0)
if (data.group != 0) {
this->one(dst);
else
} else {
this->zero(dst);
}
// State (1 bit)
if (data.state == 2) {
// Special case for dimmers...send 00 as state
dst->item(TX_BIT_HIGH_US, TX_BIT_ZERO_LOW_US);
dst->item(TX_BIT_HIGH_US, TX_BIT_ZERO_LOW_US);
} else if (data.state == 1)
} else if (data.state == 1) {
this->one(dst);
else
} else {
this->zero(dst);
}
// Channel (4 bits)
for (int16_t i = 4 - 1; i >= 0; i--) {
if (data.channel & (1 << i))
if (data.channel & (1 << i)) {
this->one(dst);
else
} else {
this->zero(dst);
}
}
// Level (4 bits)
if (data.state == 2) {
for (int16_t i = 4 - 1; i >= 0; i--) {
if (data.level & (1 << i))
if (data.level & (1 << i)) {
this->one(dst);
else
} else {
this->zero(dst);
}
}
}

10
esphome/components/remote_base/panasonic_protocol.cpp
View File

@@ -19,17 +19,19 @@ void PanasonicProtocol::encode(RemoteTransmitData *dst, const PanasonicData &dat
uint32_t mask;
for (mask = 1UL << 15; mask != 0; mask >>= 1) {
if (data.address & mask)
if (data.address & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
for (mask = 1UL << 31; mask != 0; mask >>= 1) {
if (data.command & mask)
if (data.command & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
dst->mark(BIT_HIGH_US);
}

30
esphome/components/remote_base/pioneer_protocol.cpp
View File

@@ -42,26 +42,29 @@ void PioneerProtocol::encode(RemoteTransmitData *dst, const PioneerData &data) {
command1 = (command1 << 8) | ((~command1) & 0xff);
command2 = (command2 << 8) | ((~command2) & 0xff);
if (data.rc_code_2 == 0)
if (data.rc_code_2 == 0) {
dst->reserve(68);
else
} else {
dst->reserve((68 * 2) + 1);
}
dst->set_carrier_frequency(40000);
dst->item(HEADER_HIGH_US, HEADER_LOW_US);
for (uint32_t mask = 1UL << 15; mask; mask >>= 1) {
if (address1 & mask)
if (address1 & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
for (uint32_t mask = 1UL << 15; mask; mask >>= 1) {
if (command1 & mask)
if (command1 & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
dst->mark(BIT_HIGH_US);
@@ -70,17 +73,19 @@ void PioneerProtocol::encode(RemoteTransmitData *dst, const PioneerData &data) {
dst->space(TRAILER_SPACE_US);
dst->item(HEADER_HIGH_US, HEADER_LOW_US);
for (uint32_t mask = 1UL << 15; mask; mask >>= 1) {
if (address2 & mask)
if (address2 & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
for (uint32_t mask = 1UL << 15; mask; mask >>= 1) {
if (command2 & mask)
if (command2 & mask) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
dst->mark(BIT_HIGH_US);
@@ -140,10 +145,11 @@ optional<PioneerData> PioneerProtocol::decode(RemoteReceiveData src) {
return data;
}
void PioneerProtocol::dump(const PioneerData &data) {
if (data.rc_code_2 == 0)
if (data.rc_code_2 == 0) {
ESP_LOGD(TAG, "Received Pioneer: rc_code_X=0x%04X", data.rc_code_1);
else
} else {
ESP_LOGD(TAG, "Received Pioneer: rc_code_1=0x%04X, rc_code_2=0x%04X", data.rc_code_1, data.rc_code_2);
}
}
} // namespace remote_base

5
esphome/components/remote_base/raw_protocol.h
View File

@@ -50,10 +50,11 @@ template<typename... Ts> class RawAction : public RemoteTransmitterActionBase<Ts
if (this->code_static_ != nullptr) {
for (size_t i = 0; i < this->code_static_len_; i++) {
auto val = this->code_static_[i];
if (val < 0)
if (val < 0) {
dst->space(static_cast<uint32_t>(-val));
else
} else {
dst->mark(static_cast<uint32_t>(val));
}
}
} else {
dst->set_data(this->code_func_(x...));

10
esphome/components/remote_base/rc_switch_protocol.cpp
View File

@@ -57,10 +57,11 @@ void RCSwitchBase::transmit(RemoteTransmitData *dst, uint64_t code, uint8_t len)
dst->set_carrier_frequency(0);
this->sync(dst);
for (int16_t i = len - 1; i >= 0; i--) {
if (code & ((uint64_t) 1 << i))
if (code & ((uint64_t) 1 << i)) {
this->one(dst);
else
} else {
this->zero(dst);
}
}
}
@@ -148,10 +149,11 @@ void RCSwitchBase::simple_code_to_tristate(uint16_t code, uint8_t nbits, uint64_
*out_code = 0;
for (int8_t i = nbits - 1; i >= 0; i--) {
*out_code <<= 2;
if (code & (1 << i))
if (code & (1 << i)) {
*out_code |= 0b01;
else
} else {
*out_code |= 0b00;
}
}
}
void RCSwitchBase::type_a_code(uint8_t switch_group, uint8_t switch_device, bool state, uint64_t *out_code,

5
esphome/components/remote_base/samsung_protocol.cpp
View File

@@ -22,10 +22,11 @@ void SamsungProtocol::encode(RemoteTransmitData *dst, const SamsungData &data) {
dst->item(HEADER_HIGH_US, HEADER_LOW_US);
for (uint8_t bit = data.nbits; bit > 0; bit--) {
if ((data.data >> (bit - 1)) & 1)
if ((data.data >> (bit - 1)) & 1) {
dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
else
} else {
dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
}
}
dst->item(FOOTER_HIGH_US, FOOTER_LOW_US);

5
esphome/components/remote_base/sony_protocol.cpp
View File

@@ -19,10 +19,11 @@ void SonyProtocol::encode(RemoteTransmitData *dst, const SonyData &data) {
dst->item(HEADER_HIGH_US, HEADER_LOW_US);
for (uint32_t mask = 1UL << (data.nbits - 1); mask != 0; mask >>= 1) {
if (data.data & mask)
if (data.data & mask) {
dst->item(BIT_ONE_HIGH_US, BIT_LOW_US);
else
} else {
dst->item(BIT_ZERO_HIGH_US, BIT_LOW_US);
}
}
}
optional<SonyData> SonyProtocol::decode(RemoteReceiveData src) {

15
esphome/components/remote_base/toshiba_ac_protocol.cpp
View File

@@ -24,10 +24,11 @@ void ToshibaAcProtocol::encode(RemoteTransmitData *dst, const ToshibaAcData &dat
dst->item(HEADER_HIGH_US, HEADER_LOW_US);
for (uint8_t bit = 48; bit > 0; bit--) {
dst->mark(BIT_HIGH_US);
if ((data.rc_code_1 >> (bit - 1)) & 1)
if ((data.rc_code_1 >> (bit - 1)) & 1) {
dst->space(BIT_ONE_LOW_US);
else
} else {
dst->space(BIT_ZERO_LOW_US);
}
}
dst->item(FOOTER_HIGH_US, FOOTER_LOW_US);
}
@@ -36,10 +37,11 @@ void ToshibaAcProtocol::encode(RemoteTransmitData *dst, const ToshibaAcData &dat
dst->item(HEADER_HIGH_US, HEADER_LOW_US);
for (uint8_t bit = 48; bit > 0; bit--) {
dst->mark(BIT_HIGH_US);
if ((data.rc_code_2 >> (bit - 1)) & 1)
if ((data.rc_code_2 >> (bit - 1)) & 1) {
dst->space(BIT_ONE_LOW_US);
else
} else {
dst->space(BIT_ZERO_LOW_US);
}
}
dst->item(FOOTER_HIGH_US, FOOTER_LOW_US);
}
@@ -102,10 +104,11 @@ optional<ToshibaAcData> ToshibaAcProtocol::decode(RemoteReceiveData src) {
}
void ToshibaAcProtocol::dump(const ToshibaAcData &data) {
if (data.rc_code_2 != 0)
if (data.rc_code_2 != 0) {
ESP_LOGD(TAG, "Received Toshiba AC: rc_code_1=0x%" PRIX64 ", rc_code_2=0x%" PRIX64, data.rc_code_1, data.rc_code_2);
else
} else {
ESP_LOGD(TAG, "Received Toshiba AC: rc_code_1=0x%" PRIX64, data.rc_code_1);
}
}
} // namespace remote_base