Skip to content

Commit 447f945

Browse files
committed
Hopefully fixed all the non-namespace linter errors.
1 parent 3cae482 commit 447f945

9 files changed

+20
-13
lines changed

src/IRrecv.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1220,7 +1220,8 @@ uint32_t IRrecv::ticksLow(const uint32_t usecs, const uint8_t tolerance,
12201220
const uint16_t delta) {
12211221
// max() used to ensure the result can't drop below 0 before the cast.
12221222
return (static_cast<uint32_t>(std::max(
1223-
static_cast<int32_t>(usecs * (1.0 - _validTolerance(tolerance) / 100.0) - delta),
1223+
static_cast<int32_t>(usecs * (1.0 - _validTolerance(tolerance) / 100.0) -
1224+
delta),
12241225
static_cast<int32_t>(0))));
12251226
}
12261227

src/ir_Haier.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ void IRHaierAC176::setTemp(const uint8_t degree, const bool fahrenheit) {
743743
/// The unit of temperature is specified by UseFahrenheit value.
744744
/// @return The current setting for temperature.
745745
uint8_t IRHaierAC176::getTemp(void) const {
746-
if (!_.UseFahrenheit)
746+
if (!_.UseFahrenheit)
747747
return _.Temp + kHaierAcYrw02MinTempC;
748748
uint8_t degree = _.Temp*2 + kHaierAcYrw02MinTempF + _.ExtraDegreeF;
749749
// The way of coding the temperature in degree Fahrenheit is

src/ir_Panasonic.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ void IRsend::sendPanasonic64(const uint64_t data, const uint16_t nbits,
8989
void IRsend::sendPanasonic(const uint16_t address, const uint32_t data,
9090
const uint16_t nbits, const uint16_t repeat) {
9191
sendPanasonic64(static_cast<uint64_t>(address) << 32 |
92-
static_cast<uint64_t>(data),
93-
nbits, repeat);
92+
static_cast<uint64_t>(data), nbits, repeat);
9493
}
9594

9695
/// Calculate the raw Panasonic data based on device, subdevice, & function.

src/ir_RC5_RC6.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ uint16_t IRsend::encodeRC5X(const uint8_t address, const uint8_t command,
129129
// The 2nd start/field bit (MSB of the return value) is the value of the 7th
130130
// command bit.
131131
bool s2 = (command >> 6) & 1;
132-
return ((uint16_t)s2 << (kRC5XBits - 1)) |
132+
return (static_cast<uint16_t>(s2) << (kRC5XBits - 1)) |
133133
encodeRC5(address, command, key_released);
134134
}
135135

@@ -174,7 +174,8 @@ uint64_t IRsend::encodeRC6(const uint32_t address, const uint8_t command,
174174
case kRC6Mode0Bits:
175175
return ((address & 0xFFF) << 8) | (command & 0xFF);
176176
case kRC6_36Bits:
177-
return ((uint64_t)(address & 0xFFFFFFF) << 8) | (command & 0xFF);
177+
return (static_cast<uint64_t>(address & 0xFFFFFFF) << 8) |
178+
(command & 0xFF);
178179
default:
179180
return 0;
180181
}
@@ -360,7 +361,7 @@ bool IRrecv::decodeRC5(decode_results *results, uint16_t offset,
360361
results->repeat = false;
361362
if (is_rc5x) {
362363
results->decode_type = RC5X;
363-
results->command |= ((uint32_t)is_rc5x) << 6;
364+
results->command |= (static_cast<uint32_t>(is_rc5x)) << 6;
364365
} else {
365366
results->decode_type = RC5;
366367
actual_bits--; // RC5 doesn't count the field bit as data.

src/ir_Sanyo.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,8 @@ uint16_t IRSanyoAc88::getClock(void) const {
892892
/// Set the current clock time.
893893
/// @param[in] mins_since_midnight The time as nr. of minutes past midnight.
894894
void IRSanyoAc88::setClock(const uint16_t mins_since_midnight) {
895-
uint16_t mins = std::min(mins_since_midnight, (uint16_t)(23 * 60 + 59));
895+
uint16_t mins = std::min(mins_since_midnight,
896+
static_cast<uint16_t>(23 * 60 + 59));
896897
_.ClockMins = mins % 60;
897898
_.ClockHrs = mins / 60;
898899
_.ClockSecs = 0;

src/ir_Sharp.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ const uint16_t kSharpGapTicks = 1677;
3535
const uint16_t kSharpGap = kSharpGapTicks * kSharpTick;
3636
// Address(5) + Command(8) + Expansion(1) + Check(1)
3737
const uint64_t kSharpToggleMask =
38-
((uint64_t)1 << (kSharpBits - kSharpAddressBits)) - 1;
39-
const uint64_t kSharpAddressMask = ((uint64_t)1 << kSharpAddressBits) - 1;
40-
const uint64_t kSharpCommandMask = ((uint64_t)1 << kSharpCommandBits) - 1;
38+
(static_cast<uint64_t>(1) << (kSharpBits - kSharpAddressBits)) - 1;
39+
const uint64_t kSharpAddressMask = (static_cast<uint64_t>(1) <<
40+
kSharpAddressBits) - 1;
41+
const uint64_t kSharpCommandMask = (static_cast<uint64_t>(1) <<
42+
kSharpCommandBits) - 1;
4143

4244
using irutils::addBoolToString;
4345
using irutils::addFanToString;

src/ir_Xmp.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ void IRsend::sendXmp(const uint64_t data, const uint16_t nbits,
126126
uint64_t send_data = data;
127127
for (uint16_t r = 0; r <= repeat; r++) {
128128
uint16_t bits_so_far = kXmpWordSize;
129-
for (uint64_t mask = static_cast<uint64_t>(kXmpMaxWordValue) << (nbits -
130-
kXmpWordSize);
129+
for (uint64_t mask = static_cast<uint64_t>(kXmpMaxWordValue) <<
130+
(nbits - kXmpWordSize);
131131
mask;
132132
mask >>= kXmpWordSize) {
133133
uint8_t word = (send_data & mask) >> (nbits - bits_so_far);

test/ir_Argo_test.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
#include <gmock/gmock.h>
55
#include <algorithm>
66
#include <memory>
7+
#include <set>
78
#include <string>
9+
#include <tuple>
810
#include <utility>
911
#include <vector>
1012
#include "ir_Argo.h"

test/ir_Gorenje_test.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright 2022 Mateusz Bronk (mbronk)
22

3+
#include <tuple>
34
#include <vector>
45
#include "IRac.h"
56
#include "IRsend.h"

0 commit comments

Comments
 (0)