Skip to content

Commit 3528530

Browse files
iabdalkaderiabdalkader
committed
Format repo.
Signed-off-by: iabdalkader <[email protected]>
1 parent 486e07c commit 3528530

37 files changed

+2433
-2396
lines changed

‎cores/arduino/Arduino.h

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626
/* Check all pins are defined only once */
2727
#define DIGITAL_PIN_CHECK_UNIQUE(i, _) \
28-
((DT_FOREACH_PROP_ELEM_SEP_VARGS( \
29-
DT_PATH(zephyr_user), digital_pin_gpios, DIGITAL_PIN_EXISTS, (+), \
30-
DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), digital_pin_gpios, i)), \
28+
((DT_FOREACH_PROP_ELEM_SEP_VARGS( \
29+
DT_PATH(zephyr_user), digital_pin_gpios, DIGITAL_PIN_EXISTS, (+), \
30+
DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), digital_pin_gpios, i)), \
3131
DT_PHA_BY_IDX(DT_PATH(zephyr_user), digital_pin_gpios, i, pin))) == 1)
3232

3333
#if !LISTIFY(DT_PROP_LEN(DT_PATH(zephyr_user), digital_pin_gpios), DIGITAL_PIN_CHECK_UNIQUE, (&&))
@@ -44,36 +44,37 @@
4444
(DIGITAL_PIN_EXISTS(n, p, i, dev, num) ? i : 0)
4545

4646
/* Only matched pin returns non-zero value, so the sum is matched pin's index */
47-
#define DIGITAL_PIN_GPIOS_FIND_PIN(dev, pin) \
48-
DT_FOREACH_PROP_ELEM_SEP_VARGS(DT_PATH(zephyr_user), digital_pin_gpios, \
49-
LED_BUILTIN_INDEX_BY_REG_AND_PINNUM, (+), dev, pin)
47+
#define DIGITAL_PIN_GPIOS_FIND_PIN(dev, pin) \
48+
DT_FOREACH_PROP_ELEM_SEP_VARGS(DT_PATH(zephyr_user), digital_pin_gpios, \
49+
LED_BUILTIN_INDEX_BY_REG_AND_PINNUM, (+), dev, pin)
5050

5151
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), builtin_led_gpios) && \
5252
(DT_PROP_LEN(DT_PATH(zephyr_user), builtin_led_gpios) > 0)
5353

54-
#if !(DT_FOREACH_PROP_ELEM_SEP_VARGS( \
55-
DT_PATH(zephyr_user), digital_pin_gpios, DIGITAL_PIN_EXISTS, (+), \
56-
DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), builtin_led_gpios, 0)), \
57-
DT_PHA_BY_IDX(DT_PATH(zephyr_user), builtin_led_gpios, 0, pin)) > 0)
54+
#if !(DT_FOREACH_PROP_ELEM_SEP_VARGS( \
55+
DT_PATH(zephyr_user), digital_pin_gpios, DIGITAL_PIN_EXISTS, (+), \
56+
DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), builtin_led_gpios, 0)), \
57+
DT_PHA_BY_IDX(DT_PATH(zephyr_user), builtin_led_gpios, 0, pin)) > 0)
5858
#warning "pin not found in digital_pin_gpios"
5959
#else
6060
#define LED_BUILTIN \
61-
DIGITAL_PIN_GPIOS_FIND_PIN( \
62-
DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), builtin_led_gpios, 0)), \
61+
DIGITAL_PIN_GPIOS_FIND_PIN( \
62+
DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), builtin_led_gpios, 0)), \
6363
DT_PHA_BY_IDX(DT_PATH(zephyr_user), builtin_led_gpios, 0, pin))
6464
#endif
6565

6666
/* If digital-pin-gpios is not defined, tries to use the led0 alias */
6767
#elif DT_NODE_EXISTS(DT_ALIAS(led0))
6868

69-
#if !(DT_FOREACH_PROP_ELEM_SEP_VARGS(DT_PATH(zephyr_user), digital_pin_gpios, DIGITAL_PIN_EXISTS, \
70-
(+), DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_ALIAS(led0), gpios, 0)), \
71-
DT_PHA_BY_IDX(DT_ALIAS(led0), gpios, 0, pin)) > 0)
69+
#if !(DT_FOREACH_PROP_ELEM_SEP_VARGS(DT_PATH(zephyr_user), digital_pin_gpios, DIGITAL_PIN_EXISTS, \
70+
(+), \
71+
DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_ALIAS(led0), gpios, 0)), \
72+
DT_PHA_BY_IDX(DT_ALIAS(led0), gpios, 0, pin)) > 0)
7273
#warning "pin not found in digital_pin_gpios"
7374
#else
7475
#define LED_BUILTIN \
75-
DIGITAL_PIN_GPIOS_FIND_PIN(DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_ALIAS(led0), gpios, 0)), \
76-
DT_PHA_BY_IDX(DT_ALIAS(led0), gpios, 0, pin))
76+
DIGITAL_PIN_GPIOS_FIND_PIN(DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_ALIAS(led0), gpios, 0)), \
77+
DT_PHA_BY_IDX(DT_ALIAS(led0), gpios, 0, pin))
7778
#endif
7879

7980
#endif // builtin_led_gpios
@@ -95,11 +96,13 @@ enum digitalPins {
9596

9697
#ifdef CONFIG_ADC
9798

98-
#define AN_ENUMS(n, p, i) A ## i = DIGITAL_PIN_GPIOS_FIND_PIN( \
99-
DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), p, i)), \
100-
DT_PHA_BY_IDX(DT_PATH(zephyr_user), p, i, pin)),
101-
enum analogPins { DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user),
102-
adc_pin_gpios, AN_ENUMS) };
99+
#define AN_ENUMS(n, p, i) \
100+
A##i = DIGITAL_PIN_GPIOS_FIND_PIN(DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), p, i)), \
101+
DT_PHA_BY_IDX(DT_PATH(zephyr_user), p, i, pin)),
102+
103+
enum analogPins {
104+
DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), adc_pin_gpios, AN_ENUMS)
105+
};
103106

104107
// We provide analogReadResolution APIs
105108
void analogReadResolution(int bits);
@@ -112,8 +115,11 @@ void analogReadResolution(int bits);
112115
#undef DAC1
113116
#undef DAC2
114117
#undef DAC3
115-
#define DAC_ENUMS(n, p, i) DAC ## i = i,
116-
enum dacPins { DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), dac_channels, DAC_ENUMS) NUM_OF_DACS };
118+
#define DAC_ENUMS(n, p, i) DAC##i = i,
119+
120+
enum dacPins {
121+
DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), dac_channels, DAC_ENUMS) NUM_OF_DACS
122+
};
117123

118124
#endif
119125

@@ -122,10 +128,10 @@ void noInterrupts(void);
122128

123129
int digitalPinToInterrupt(pin_size_t pin);
124130

125-
#define digitalPinToPort(x) (x)
131+
#define digitalPinToPort(x) (x)
126132
#define digitalPinToBitMask(x) (x)
127-
#define portOutputRegister(x) (x)
128-
#define portInputRegister(x) (x)
133+
#define portOutputRegister(x) (x)
134+
#define portInputRegister(x) (x)
129135

130136
void analogReadResolution(int bits);
131137
void analogWriteResolution(int bits);

‎cores/arduino/SerialUSB.h

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,38 @@ namespace arduino {
1212

1313
class SerialUSB_ : public ZephyrSerial {
1414

15-
public:
16-
SerialUSB_(const struct device *dev) : ZephyrSerial(dev) { }
15+
public:
16+
SerialUSB_(const struct device *dev) : ZephyrSerial(dev) {
17+
}
18+
1719
void begin(unsigned long baudrate, uint16_t config);
18-
void begin(unsigned long baudrate) { begin(baudrate, SERIAL_8N1); }
20+
21+
void begin(unsigned long baudrate) {
22+
begin(baudrate, SERIAL_8N1);
23+
}
1924

2025
operator bool() override;
2126
size_t write(const uint8_t *buffer, size_t size) override;
22-
size_t write(const uint8_t data) override { return write(&data, 1); }
27+
28+
size_t write(const uint8_t data) override {
29+
return write(&data, 1);
30+
}
31+
2332
void flush() override;
2433

25-
protected:
34+
protected:
2635
uint32_t dtr = 0;
2736
uint32_t baudrate;
2837
void _baudChangeHandler();
2938
static void _baudChangeDispatch(struct k_timer *timer);
3039

31-
private:
40+
private:
3241
struct k_timer baud_timer;
3342
bool started = false;
3443
};
35-
} // namespace arduino
44+
} // namespace arduino
3645

37-
#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && (CONFIG_USB_CDC_ACM || CONFIG_USBD_CDC_ACM_CLASS))
46+
#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && \
47+
(CONFIG_USB_CDC_ACM || CONFIG_USBD_CDC_ACM_CLASS))
3848
extern arduino::SerialUSB_ Serial;
39-
#endif
49+
#endif

‎cores/arduino/USB.cpp

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -10,53 +10,51 @@
1010
#include <zephyr/usb/usb_device.h>
1111
#include <SerialUSB.h>
1212

13-
#if ((DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)) && (CONFIG_USB_CDC_ACM || CONFIG_USBD_CDC_ACM_CLASS))
14-
const struct device *const usb_dev = DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), cdc_acm, 0));
13+
#if ((DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)) && \
14+
(CONFIG_USB_CDC_ACM || CONFIG_USBD_CDC_ACM_CLASS))
15+
const struct device *const usb_dev =
16+
DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), cdc_acm, 0));
1517

1618
void usb_status_cb(enum usb_dc_status_code cb_status, const uint8_t *param) {
17-
(void)param; // unused
18-
if (cb_status == USB_DC_CONFIGURED) {
19-
20-
}
19+
(void)param; // unused
20+
if (cb_status == USB_DC_CONFIGURED) {
21+
}
2122
}
2223

2324
void __attribute__((weak)) _on_1200_bps() {
24-
NVIC_SystemReset();
25+
NVIC_SystemReset();
2526
}
2627

27-
void arduino::SerialUSB_::_baudChangeHandler()
28-
{
29-
uart_line_ctrl_get(uart, UART_LINE_CTRL_BAUD_RATE, &baudrate);
30-
if (baudrate == 1200) {
31-
usb_disable();
32-
_on_1200_bps();
33-
}
28+
void arduino::SerialUSB_::_baudChangeHandler() {
29+
uart_line_ctrl_get(uart, UART_LINE_CTRL_BAUD_RATE, &baudrate);
30+
if (baudrate == 1200) {
31+
usb_disable();
32+
_on_1200_bps();
33+
}
3434
}
3535

36-
static void _baudChangeHandler(const struct device *dev, uint32_t rate)
37-
{
38-
(void)dev; // unused
39-
if (rate == 1200) {
40-
usb_disable();
41-
_on_1200_bps();
42-
}
36+
static void _baudChangeHandler(const struct device *dev, uint32_t rate) {
37+
(void)dev; // unused
38+
if (rate == 1200) {
39+
usb_disable();
40+
_on_1200_bps();
41+
}
4342
}
4443

4544
#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
4645

4746
extern "C" {
48-
#include <zephyr/usb/usbd.h>
49-
struct usbd_context *usbd_init_device(usbd_msg_cb_t msg_cb);
47+
#include <zephyr/usb/usbd.h>
48+
struct usbd_context *usbd_init_device(usbd_msg_cb_t msg_cb);
5049
}
5150

5251
struct usbd_context *_usbd;
5352

5453
int usb_disable() {
55-
return usbd_disable(_usbd);
54+
return usbd_disable(_usbd);
5655
}
5756

58-
static void usbd_next_cb(struct usbd_context *const ctx, const struct usbd_msg *msg)
59-
{
57+
static void usbd_next_cb(struct usbd_context *const ctx, const struct usbd_msg *msg) {
6058
if (usbd_can_detect_vbus(ctx)) {
6159
if (msg->type == USBD_MSG_VBUS_READY) {
6260
usbd_enable(ctx);
@@ -68,14 +66,13 @@ static void usbd_next_cb(struct usbd_context *const ctx, const struct usbd_msg *
6866
}
6967

7068
if (msg->type == USBD_MSG_CDC_ACM_LINE_CODING) {
71-
uint32_t baudrate;
69+
uint32_t baudrate;
7270
uart_line_ctrl_get(ctx->dev, UART_LINE_CTRL_BAUD_RATE, &baudrate);
73-
_baudChangeHandler(nullptr, baudrate);
71+
_baudChangeHandler(nullptr, baudrate);
7472
}
7573
}
7674

77-
static int enable_usb_device_next(void)
78-
{
75+
static int enable_usb_device_next(void) {
7976
int err;
8077

8178
//_usbd = usbd_init_device(usbd_next_cb);
@@ -95,44 +92,46 @@ static int enable_usb_device_next(void)
9592
#endif /* defined(CONFIG_USB_DEVICE_STACK_NEXT) */
9693

9794
void arduino::SerialUSB_::_baudChangeDispatch(struct k_timer *timer) {
98-
arduino::SerialUSB_* dev = (arduino::SerialUSB_*)k_timer_user_data_get(timer);
99-
dev->_baudChangeHandler();
95+
arduino::SerialUSB_ *dev = (arduino::SerialUSB_ *)k_timer_user_data_get(timer);
96+
dev->_baudChangeHandler();
10097
}
10198

102-
10399
void arduino::SerialUSB_::begin(unsigned long baudrate, uint16_t config) {
104-
if (!started) {
105-
#ifndef CONFIG_USB_DEVICE_STACK_NEXT
106-
usb_enable(NULL);
107-
#ifndef CONFIG_CDC_ACM_DTE_RATE_CALLBACK_SUPPORT
108-
k_timer_init(&baud_timer, SerialUSB_::_baudChangeDispatch, NULL);
109-
k_timer_user_data_set(&baud_timer, this);
110-
k_timer_start(&baud_timer, K_MSEC(100), K_MSEC(100));
111-
#else
112-
cdc_acm_dte_rate_callback_set(usb_dev, ::_baudChangeHandler);
113-
#endif
114-
#else
115-
enable_usb_device_next();
116-
#endif
117-
ZephyrSerial::begin(baudrate, config);
118-
started = true;
119-
}
100+
if (!started) {
101+
#ifndef CONFIG_USB_DEVICE_STACK_NEXT
102+
usb_enable(NULL);
103+
#ifndef CONFIG_CDC_ACM_DTE_RATE_CALLBACK_SUPPORT
104+
k_timer_init(&baud_timer, SerialUSB_::_baudChangeDispatch, NULL);
105+
k_timer_user_data_set(&baud_timer, this);
106+
k_timer_start(&baud_timer, K_MSEC(100), K_MSEC(100));
107+
#else
108+
cdc_acm_dte_rate_callback_set(usb_dev, ::_baudChangeHandler);
109+
#endif
110+
#else
111+
enable_usb_device_next();
112+
#endif
113+
ZephyrSerial::begin(baudrate, config);
114+
started = true;
115+
}
120116
}
121117

122118
arduino::SerialUSB_::operator bool() {
123-
uart_line_ctrl_get(uart, UART_LINE_CTRL_DTR, &dtr);
124-
return dtr;
119+
uart_line_ctrl_get(uart, UART_LINE_CTRL_DTR, &dtr);
120+
return dtr;
125121
}
126122

127-
128-
size_t arduino::SerialUSB_::write(const uint8_t *buffer, size_t size) {
129-
if (!Serial) return 0;
130-
return arduino::ZephyrSerial::write(buffer, size);
123+
size_t arduino::SerialUSB_::write(const uint8_t *buffer, size_t size) {
124+
if (!Serial) {
125+
return 0;
126+
}
127+
return arduino::ZephyrSerial::write(buffer, size);
131128
}
132129

133130
void arduino::SerialUSB_::flush() {
134-
if (!Serial) return;
135-
arduino::ZephyrSerial::flush();
131+
if (!Serial) {
132+
return;
133+
}
134+
arduino::ZephyrSerial::flush();
136135
}
137136

138137
arduino::SerialUSB_ Serial(usb_dev);

‎cores/arduino/abi.cpp

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,44 @@
77
#include <stdlib.h>
88

99
namespace std {
10-
void __throw_length_error(const char* __s __attribute__((unused))) {}
11-
void __throw_bad_alloc() {}
12-
void __throw_bad_function_call() {}
13-
};
10+
void __throw_length_error(const char *__s __attribute__((unused))) {
11+
}
12+
13+
void __throw_bad_alloc() {
14+
}
15+
16+
void __throw_bad_function_call() {
17+
}
18+
}; // namespace std
1419

1520
extern "C" {
1621

17-
void* __dso_handle = (void*) &__dso_handle;
22+
void *__dso_handle = (void *)&__dso_handle;
23+
24+
void __cxa_pure_virtual(void) {
25+
}
26+
27+
void __cxa_deleted_virtual(void) {
28+
}
1829

19-
void __cxa_pure_virtual(void) {}
20-
void __cxa_deleted_virtual(void) {}
21-
int __cxa_atexit(void (*func) (void *), void * arg, void * dso_handle) {
22-
(void)func; (void)arg; (void)dso_handle; // unused
23-
return 0;
30+
int __cxa_atexit(void (*func)(void *), void *arg, void *dso_handle) {
31+
(void)func;
32+
(void)arg;
33+
(void)dso_handle; // unused
34+
return 0;
2435
}
2536

2637
int atexit(void (*func)(void)) {
27-
(void)func;
28-
return 0;
38+
(void)func;
39+
return 0;
2940
}
3041

31-
int strcmp(const char* s1, const char* s2) {
32-
while(*s1 && (*s1 == *s2))
33-
{
34-
s1++;
35-
s2++;
36-
}
37-
return *(const unsigned char*)s1 - *(const unsigned char*)s2;
42+
int strcmp(const char *s1, const char *s2) {
43+
while (*s1 && (*s1 == *s2)) {
44+
s1++;
45+
s2++;
46+
}
47+
return *(const unsigned char *)s1 - *(const unsigned char *)s2;
3848
}
3949

4050
} /* extern "C" */

0 commit comments

Comments
 (0)