Skip to content

Commit cc34b69

Browse files
committed
clang-format
1 parent 97d9a61 commit cc34b69

File tree

1 file changed

+17
-20
lines changed

1 file changed

+17
-20
lines changed

src/Primitives/zephyr.cpp

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#include <zephyr/device.h>
1515
#include <zephyr/devicetree.h>
1616
#include <zephyr/devicetree/gpio.h>
17+
#include <zephyr/drivers/adc.h>
1718
#include <zephyr/drivers/gpio.h>
1819
#include <zephyr/drivers/pwm.h>
19-
#include <zephyr/drivers/adc.h>
2020
#include <zephyr/kernel.h>
2121
#include <zephyr/sys/util_macro.h>
2222

@@ -473,13 +473,11 @@ int16_t read_value(int c, int *channels) {
473473
printf("Invalid channel for chip_analog_read(%d)\n", channel);
474474
return -1;
475475
}
476-
//printf("Configuring channel %d\n", channel);
477-
struct adc_sequence seq = {
478-
.channels = BIT(channel),
479-
.buffer = &buf,
480-
.buffer_size = sizeof(buf),
481-
.resolution = 12
482-
};
476+
// printf("Configuring channel %d\n", channel);
477+
struct adc_sequence seq = {.channels = BIT(channel),
478+
.buffer = &buf,
479+
.buffer_size = sizeof(buf),
480+
.resolution = 12};
483481

484482
const device *adc_dev;
485483
adc_channel_cfg cfg;
@@ -488,13 +486,12 @@ int16_t read_value(int c, int *channels) {
488486
if (c == 0) {
489487
adc_dev = DEVICE_DT_GET(DT_NODELABEL(adc3));
490488
struct adc_channel_cfg channel_cfgs[] = {
491-
DT_FOREACH_CHILD_SEP(DT_NODELABEL(adc3), ADC_CHANNEL_CFG_DT, (,))};
489+
DT_FOREACH_CHILD_SEP(DT_NODELABEL(adc3), ADC_CHANNEL_CFG_DT, (, ))};
492490
cfg = channel_cfgs[channel];
493-
}
494-
else {
491+
} else {
495492
adc_dev = DEVICE_DT_GET(DT_NODELABEL(adc1));
496493
struct adc_channel_cfg channel_cfgs[] = {
497-
DT_FOREACH_CHILD_SEP(DT_NODELABEL(adc1), ADC_CHANNEL_CFG_DT, (,))};
494+
DT_FOREACH_CHILD_SEP(DT_NODELABEL(adc1), ADC_CHANNEL_CFG_DT, (, ))};
498495
cfg = channel_cfgs[channel];
499496
}
500497

@@ -518,10 +515,10 @@ int16_t read_value(int c, int *channels) {
518515

519516
def_prim(nxt_touch_sensor, oneToOneU32) {
520517
int channels[4] = {
521-
12, // Port 1
522-
6, // Port 2
523-
7, // Port 3
524-
8, // Port 4
518+
12, // Port 1
519+
6, // Port 2
520+
7, // Port 3
521+
8, // Port 4
525522
};
526523
int16_t v = read_value(arg0.uint32, channels);
527524
pop_args(1);
@@ -534,10 +531,10 @@ def_prim(ev3_touch_sensor, oneToOneU32) {
534531
printf("ev3_touch_sensor(%u)\n", arg0.uint32);
535532

536533
int channels[4] = {
537-
13, // Port 1
538-
5, // Port 2
539-
9, // Port 3
540-
10, // Port 4
534+
13, // Port 1
535+
5, // Port 2
536+
9, // Port 3
537+
10, // Port 4
541538
};
542539
int16_t v = read_value(arg0.uint32, channels);
543540
pop_args(1);

0 commit comments

Comments
 (0)