Skip to content

Commit

Permalink
minor: Apply clang-format on c-code (with pre-commit) as seen in #2740 (
Browse files Browse the repository at this point in the history
  • Loading branch information
mdeweerd authored Nov 29, 2023
1 parent 6278381 commit 3844005
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
16 changes: 9 additions & 7 deletions src/devices/bresser_lightning.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,22 @@ static int bresser_lightning_decode(r_device *decoder, bitbuffer_t *bitbuffer)
uint8_t const preamble_pattern[] = {0xaa, 0xaa, 0x2d, 0xd4};
uint8_t msg[25];

if (bitbuffer->num_rows != 1
|| bitbuffer->bits_per_row[0] < 160
|| bitbuffer->bits_per_row[0] > 440) {
/* clang-format off */
if ( bitbuffer->num_rows != 1
|| bitbuffer->bits_per_row[0] < 160
|| bitbuffer->bits_per_row[0] > 440) {
decoder_logf(decoder, 2, __func__, "bit_per_row %u out of range", bitbuffer->bits_per_row[0]);
return DECODE_ABORT_EARLY; // Unrecognized data
}
/* clang-format on */

unsigned start_pos = bitbuffer_search(bitbuffer, 0, 0,
preamble_pattern, sizeof (preamble_pattern) * 8);
preamble_pattern, sizeof(preamble_pattern) * 8);

if (start_pos >= bitbuffer->bits_per_row[0]) {
return DECODE_ABORT_LENGTH;
}
start_pos += sizeof (preamble_pattern) * 8;
start_pos += sizeof(preamble_pattern) * 8;

unsigned len = bitbuffer->bits_per_row[0] - start_pos;
if (len < sizeof(msg) * 8) {
Expand All @@ -69,7 +71,7 @@ static int bresser_lightning_decode(r_device *decoder, bitbuffer_t *bitbuffer)
int nstartup = (msg[6] & 0x08) >> 3;

// data de-whitening
for (unsigned i = 0; i < sizeof (msg); ++i) {
for (unsigned i = 0; i < sizeof(msg); ++i) {
msg[i] ^= 0xaa;
}
decoder_log_bitrow(decoder, 2, __func__, msg, sizeof(msg) * 8, "XOR");
Expand All @@ -85,7 +87,7 @@ static int bresser_lightning_decode(r_device *decoder, bitbuffer_t *bitbuffer)
int sensor_id = (msg[2] << 8) | (msg[3]);
int distance_km = msg[7];
int count = (msg[4] << 4) | (msg[5] & 0xf0) >> 4;
int unknown1 = ((msg[5] & 0x0f) << 8) | msg[6];
int unknown1 = ((msg[5] & 0x0f) << 8) | msg[6];
int unknown2 = (msg[8] << 8) | msg[9];

// Sanity checks
Expand Down
4 changes: 2 additions & 2 deletions src/devices/lacrosse_tx31u.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ These readings have not been tested.

#define BIT(pos) (1 << (pos))
#define CHECK_BIT(y, pos) ((0u == ((y) & (BIT(pos)))) ? 0u : 1u)
#define SET_LSBITS(len) (BIT(len) - 1) // the first len bits are '1' and the rest are '0'
#define BF_PREP(y, start, len) (((y)&SET_LSBITS(len)) << (start)) // Prepare a bitmask
#define SET_LSBITS(len) (BIT(len) - 1) // the first len bits are '1' and the rest are '0'
#define BF_PREP(y, start, len) (((y) & SET_LSBITS(len)) << (start)) // Prepare a bitmask
#define BF_GET(y, start, len) (((y) >> (start)) & SET_LSBITS(len))

#define TX31U_MIN_LEN_BYTES 9 // assume at least one measurement
Expand Down
2 changes: 1 addition & 1 deletion src/devices/schou_72543_rain.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static int schou_72543_rain_decode(r_device *decoder, bitbuffer_t *bitbuffer)
}

// Load bitbuffer data and validate checksum
uint8_t *b = bitbuffer->bb[row];
uint8_t *b = bitbuffer->bb[row];
int micsum = b[7]; // Checksum as read
int calsum = add_bytes(b, 7) & 0x0FF; // Checksum as calculated, accounting for the lowest 8 bit

Expand Down
2 changes: 1 addition & 1 deletion src/devices/tpms_nissan.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ static int tpms_nissan_decode(r_device *decoder, bitbuffer_t *bitbuffer, unsigne
int id = (unsigned)((b[0] & 0x1F) << 19) | (b[1] << 11) | (b[2] << 3) | (b[3] >> 5);

// (PSI+THREE)*FOUR=8d
int pressure_raw = ((b[3] & 0x1F) << 3) | (b[4] >> 5);
int pressure_raw = ((b[3] & 0x1F) << 3) | (b[4] >> 5);
float pressure_psi = (double)(pressure_raw / 4.0) - 3.0;

// UNKNOWN:2b
Expand Down

0 comments on commit 3844005

Please sign in to comment.