Skip to content

Commit cf09e5a

Browse files
LesordsLesords
committed
style: update code format
1 parent 7fad3cd commit cf09e5a

File tree

1 file changed

+61
-106
lines changed

1 file changed

+61
-106
lines changed

‎sensors/hm0360.c

+61-106
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ static int read_reg(uint8_t slv_addr, const uint16_t reg)
2929
{
3030
int ret = SCCB_Read16(slv_addr, reg);
3131
#ifdef REG_DEBUG_ON
32-
if (ret < 0)
33-
{
32+
if (ret < 0) {
3433
ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret);
3534
}
3635
#endif
@@ -45,20 +44,18 @@ static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask)
4544
static int read_reg16(uint8_t slv_addr, const uint16_t reg)
4645
{
4746
int ret = 0, ret2 = 0;
47+
4848
ret = read_reg(slv_addr, reg);
49-
if (ret >= 0)
50-
{
49+
if (ret >= 0) {
5150
ret = (ret & 0xFF) << 8;
5251
ret2 = read_reg(slv_addr, reg + 1);
53-
if (ret2 < 0)
54-
{
52+
if (ret2 < 0) {
5553
ret = ret2;
56-
}
57-
else
58-
{
54+
} else {
5955
ret |= ret2 & 0xFF;
6056
}
6157
}
58+
6259
return ret;
6360
}
6461

@@ -69,22 +66,18 @@ static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value)
6966
ret = SCCB_Write16(slv_addr, reg, value);
7067
#else
7168
int old_value = read_reg(slv_addr, reg);
72-
if (old_value < 0)
73-
{
69+
if (old_value < 0) {
7470
return old_value;
7571
}
76-
if ((uint8_t)old_value != value)
77-
{
72+
73+
if ((uint8_t)old_value != value) {
7874
ESP_LOGD(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value);
7975
ret = SCCB_Write16(slv_addr, reg, value);
80-
}
81-
else
82-
{
76+
} else {
8377
ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value);
8478
ret = SCCB_Write16(slv_addr, reg, value); // maybe not?
8579
}
86-
if (ret < 0)
87-
{
80+
if (ret < 0) {
8881
ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret);
8982
}
9083
#endif
@@ -95,11 +88,12 @@ static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t
9588
{
9689
int ret = 0;
9790
uint8_t c_value, new_value;
91+
9892
ret = read_reg(slv_addr, reg);
99-
if (ret < 0)
100-
{
93+
if (ret < 0) {
10194
return ret;
10295
}
96+
10397
c_value = ret;
10498
new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset);
10599
ret = write_reg(slv_addr, reg, new_value);
@@ -109,34 +103,30 @@ static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t
109103
static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2])
110104
{
111105
int i = 0, ret = 0;
112-
while (!ret && regs[i][0] != REGLIST_TAIL)
113-
{
114-
if (regs[i][0] == REG_DLY)
115-
{
106+
107+
while (!ret && regs[i][0] != REGLIST_TAIL) {
108+
if (regs[i][0] == REG_DLY) {
116109
vTaskDelay(regs[i][1] / portTICK_PERIOD_MS);
117-
}
118-
else
119-
{
110+
} else {
120111
ret = write_reg(slv_addr, regs[i][0], regs[i][1]);
121112
}
122113
i++;
123114
}
115+
124116
return ret;
125117
}
126118

127119
static int write_reg16(uint8_t slv_addr, const uint16_t reg, uint16_t value)
128120
{
129-
if (write_reg(slv_addr, reg, value >> 8) || write_reg(slv_addr, reg + 1, value))
130-
{
121+
if (write_reg(slv_addr, reg, value >> 8) || write_reg(slv_addr, reg + 1, value)) {
131122
return -1;
132123
}
133124
return 0;
134125
}
135126

136127
static int write_addr_reg(uint8_t slv_addr, const uint16_t reg, uint16_t x_value, uint16_t y_value)
137128
{
138-
if (write_reg16(slv_addr, reg, x_value) || write_reg16(slv_addr, reg + 2, y_value))
139-
{
129+
if (write_reg16(slv_addr, reg, x_value) || write_reg16(slv_addr, reg + 2, y_value)) {
140130
return -1;
141131
}
142132
return 0;
@@ -148,20 +138,21 @@ static int reset(sensor_t *sensor)
148138
{
149139
vTaskDelay(100 / portTICK_PERIOD_MS);
150140
int ret = 0;
141+
151142
// Software Reset: clear all registers and reset them to their default values
152143
ret = write_reg(sensor->slv_addr, SW_RESET, 0x00);
153-
if (ret)
154-
{
144+
if (ret) {
155145
ESP_LOGE(TAG, "Software Reset FAILED!");
156146
return ret;
157147
}
148+
158149
vTaskDelay(100 / portTICK_PERIOD_MS);
159150
ret = write_regs(sensor->slv_addr, sensor_default_regs);
160-
if (ret == 0)
161-
{
151+
if (ret == 0) {
162152
ESP_LOGD(TAG, "Camera defaults loaded");
163153
vTaskDelay(100 / portTICK_PERIOD_MS);
164154
}
155+
165156
return ret;
166157
}
167158

@@ -188,31 +179,23 @@ static int set_framesize(sensor_t *sensor, framesize_t framesize)
188179
sensor->status.framesize = framesize;
189180
ret = write_regs(sensor->slv_addr, sensor_default_regs);
190181

191-
if (framesize == FRAMESIZE_QQVGA)
192-
{
182+
if (framesize == FRAMESIZE_QQVGA) {
193183
ESP_LOGI(TAG, "Set FRAMESIZE_QQVGA");
194184
ret |= write_regs(sensor->slv_addr, sensor_framesize_QQVGA);
195185
ret |= set_reg_bits(sensor->slv_addr, 0x3024, 0, 0x01, 1);
196-
}
197-
else if (framesize == FRAMESIZE_QVGA)
198-
{
186+
} else if (framesize == FRAMESIZE_QVGA) {
199187
ESP_LOGI(TAG, "Set FRAMESIZE_QVGA");
200188
ret |= write_regs(sensor->slv_addr, sensor_framesize_QVGA);
201189
ret |= set_reg_bits(sensor->slv_addr, 0x3024, 0, 0x01, 1);
202-
}
203-
else if (framesize == FRAMESIZE_VGA)
204-
{
190+
} else if (framesize == FRAMESIZE_VGA) {
205191
ESP_LOGI(TAG, "Set FRAMESIZE_VGA");
206192
ret |= set_reg_bits(sensor->slv_addr, 0x3024, 0, 0x01, 0);
207-
}
208-
else
209-
{
193+
} else {
210194
ESP_LOGI(TAG, "Dont suppost this size, Set FRAMESIZE_VGA");
211195
ret |= set_reg_bits(sensor->slv_addr, 0x3024, 0, 0x01, 0);
212196
}
213197

214-
if (ret == 0)
215-
{
198+
if (ret == 0) {
216199
_set_pll(sensor, 0, 0, 0, 0, 0, 0, 0, 0);
217200
ret |= write_reg(sensor->slv_addr, 0x0104, 0x01);
218201
}
@@ -291,28 +274,22 @@ static int set_brightness(sensor_t *sensor, int level)
291274
static int get_reg(sensor_t *sensor, int reg, int mask)
292275
{
293276
int ret = 0, ret2 = 0;
294-
if (mask > 0xFF)
295-
{
277+
278+
if (mask > 0xFF) {
296279
ret = read_reg16(sensor->slv_addr, reg);
297-
if (ret >= 0 && mask > 0xFFFF)
298-
{
280+
if (ret >= 0 && mask > 0xFFFF) {
299281
ret2 = read_reg(sensor->slv_addr, reg + 2);
300-
if (ret2 >= 0)
301-
{
282+
if (ret2 >= 0) {
302283
ret = (ret << 8) | ret2;
303-
}
304-
else
305-
{
284+
} else {
306285
ret = ret2;
307286
}
308287
}
309-
}
310-
else
311-
{
288+
} else {
312289
ret = read_reg(sensor->slv_addr, reg);
313290
}
314-
if (ret > 0)
315-
{
291+
292+
if (ret > 0) {
316293
ret &= mask;
317294
}
318295
return ret;
@@ -321,47 +298,37 @@ static int get_reg(sensor_t *sensor, int reg, int mask)
321298
static int set_reg(sensor_t *sensor, int reg, int mask, int value)
322299
{
323300
int ret = 0, ret2 = 0;
324-
if (mask > 0xFF)
325-
{
301+
302+
if (mask > 0xFF) {
326303
ret = read_reg16(sensor->slv_addr, reg);
327-
if (ret >= 0 && mask > 0xFFFF)
328-
{
304+
if (ret >= 0 && mask > 0xFFFF) {
329305
ret2 = read_reg(sensor->slv_addr, reg + 2);
330-
if (ret2 >= 0)
331-
{
306+
if (ret2 >= 0) {
332307
ret = (ret << 8) | ret2;
333-
}
334-
else
335-
{
308+
} else {
336309
ret = ret2;
337310
}
338311
}
339-
}
340-
else
341-
{
312+
} else {
342313
ret = read_reg(sensor->slv_addr, reg);
343314
}
344-
if (ret < 0)
345-
{
315+
316+
if (ret < 0) {
346317
return ret;
347318
}
319+
348320
value = (ret & ~mask) | (value & mask);
349-
if (mask > 0xFFFF)
350-
{
321+
if (mask > 0xFFFF) {
351322
ret = write_reg16(sensor->slv_addr, reg, value >> 8);
352-
if (ret >= 0)
353-
{
323+
if (ret >= 0) {
354324
ret = write_reg(sensor->slv_addr, reg + 2, value & 0xFF);
355325
}
356-
}
357-
else if (mask > 0xFF)
358-
{
326+
} else if (mask > 0xFF) {
359327
ret = write_reg16(sensor->slv_addr, reg, value);
360-
}
361-
else
362-
{
328+
} else {
363329
ret = write_reg(sensor->slv_addr, reg, value);
364330
}
331+
365332
return ret;
366333
}
367334

@@ -370,8 +337,7 @@ static int set_xclk(sensor_t *sensor, int timer, int xclk)
370337
int ret = 0;
371338
sensor->xclk_freq_hz = xclk * 1000000U;
372339
ret = xclk_timer_conf(timer, sensor->xclk_freq_hz);
373-
if (ret == 0)
374-
{
340+
if (ret == 0) {
375341
ESP_LOGD(TAG, "Set xclk to %d", xclk);
376342
}
377343
return ret;
@@ -382,20 +348,13 @@ static int _set_pll(sensor_t *sensor, int bypass, int multiplier, int sys_div, i
382348
uint8_t value = 0;
383349
uint8_t pll_cfg = 0;
384350

385-
if (sensor->xclk_freq_hz <= 6000000)
386-
{
351+
if (sensor->xclk_freq_hz <= 6000000) {
387352
value = 0x03;
388-
}
389-
else if (sensor->xclk_freq_hz <= 12000000)
390-
{
353+
} else if (sensor->xclk_freq_hz <= 12000000) {
391354
value = 0x02;
392-
}
393-
else if (sensor->xclk_freq_hz <= 18000000)
394-
{
355+
} else if (sensor->xclk_freq_hz <= 18000000) {
395356
value = 0x01;
396-
}
397-
else
398-
{ // max is 48000000
357+
} else { // max is 48000000
399358
value = 0x00;
400359
}
401360

@@ -416,19 +375,15 @@ static int init_status(sensor_t *sensor)
416375

417376
int hm0360_detect(int slv_addr, sensor_id_t *id)
418377
{
419-
if (HM1055_SCCB_ADDR == slv_addr)
420-
{
378+
if (HM1055_SCCB_ADDR == slv_addr) {
421379
uint8_t h = SCCB_Read16(slv_addr, MODEL_ID_H);
422380
uint8_t l = SCCB_Read16(slv_addr, MODEL_ID_L);
423381
uint16_t PID = (h << 8) | l;
424-
if (HM0360_PID == PID)
425-
{
382+
if (HM0360_PID == PID) {
426383
id->PID = PID;
427384
id->VER = SCCB_Read16(slv_addr, SILICON_REV);
428385
return PID;
429-
}
430-
else
431-
{
386+
} else {
432387
ESP_LOGD(TAG, "Mismatch PID=0x%x", PID);
433388
}
434389
}

0 commit comments

Comments
 (0)