Skip to content

Commit 6bf549b

Browse files
committed
[misc] Update .clang-format style
1 parent 3054db9 commit 6bf549b

File tree

12 files changed

+262
-262
lines changed

12 files changed

+262
-262
lines changed

.clang-format

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
# 2024-07-30
1+
# 2025-02-12
22
Language: Cpp
33
BasedOnStyle: LLVM
44
AlignAfterOpenBracket: BlockIndent
55
AlignArrayOfStructures: Left
66
AlignConsecutiveAssignments: true
77
AlignConsecutiveMacros: AcrossComments
8+
AlignEscapedNewlinesLeft: true
89
AlignTrailingComments: true
910
AllowAllArgumentsOnNextLine: false
1011
AllowAllParametersOfDeclarationOnNextLine: false
@@ -24,7 +25,6 @@ IndentWidth: 4
2425
LambdaBodyIndentation: Signature
2526
MaxEmptyLinesToKeep: 1
2627
PenaltyReturnTypeOnItsOwnLine: 1000
27-
# PointerAlignment: Left # TODO enable this and reformat project
2828
QualifierAlignment: Left
2929
ReflowComments: true
3030
SeparateDefinitionBlocks: Always

cores/beken-72xx/arduino/libraries/WiFi/WiFiPrivate.h

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -79,34 +79,34 @@ typedef struct {
7979
#define IP_STATUS (DATA->statusIp)
8080
#define LINK_STATUS (DATA->statusLink)
8181

82-
#define STA_GET_LINK_STATUS_RETURN(ret) \
83-
{ \
84-
if (!sta_ip_is_start()) \
85-
return ret; \
86-
memset(&LINK_STATUS, 0x00, sizeof(LinkStatusTypeDef)); \
87-
bk_wlan_get_link_status(&LINK_STATUS); \
82+
#define STA_GET_LINK_STATUS_RETURN(ret) \
83+
{ \
84+
if (!sta_ip_is_start()) \
85+
return ret; \
86+
memset(&LINK_STATUS, 0x00, sizeof(LinkStatusTypeDef)); \
87+
bk_wlan_get_link_status(&LINK_STATUS); \
8888
}
8989

90-
#define STA_GET_IP_STATUS_RETURN(ret) \
91-
{ \
92-
if (!sta_ip_is_start()) \
93-
return ret; \
94-
memset(&IP_STATUS, 0x00, sizeof(IPStatusTypedef)); \
95-
bk_wlan_get_ip_status(&IP_STATUS, BK_STATION); \
90+
#define STA_GET_IP_STATUS_RETURN(ret) \
91+
{ \
92+
if (!sta_ip_is_start()) \
93+
return ret; \
94+
memset(&IP_STATUS, 0x00, sizeof(IPStatusTypedef)); \
95+
bk_wlan_get_ip_status(&IP_STATUS, BK_STATION); \
9696
}
9797

98-
#define AP_GET_LINK_STATUS_RETURN(ret) \
99-
{ \
100-
if (!uap_ip_is_start()) \
101-
return ret; \
98+
#define AP_GET_LINK_STATUS_RETURN(ret) \
99+
{ \
100+
if (!uap_ip_is_start()) \
101+
return ret; \
102102
}
103103

104-
#define AP_GET_IP_STATUS_RETURN(ret) \
105-
{ \
106-
if (!uap_ip_is_start()) \
107-
return ret; \
108-
memset(&IP_STATUS, 0x00, sizeof(IPStatusTypedef)); \
109-
bk_wlan_get_ip_status(&IP_STATUS, BK_SOFT_AP); \
104+
#define AP_GET_IP_STATUS_RETURN(ret) \
105+
{ \
106+
if (!uap_ip_is_start()) \
107+
return ret; \
108+
memset(&IP_STATUS, 0x00, sizeof(IPStatusTypedef)); \
109+
bk_wlan_get_ip_status(&IP_STATUS, BK_SOFT_AP); \
110110
}
111111

112112
} // extern "C"

cores/common/arduino/libraries/ext/WebServer/HTTP_Method.h

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
#pragma once
22

33
/* Request Methods */
4-
#define HTTP_METHOD_MAP(XX) \
5-
XX(0, DELETE, DELETE) \
6-
XX(1, GET, GET) \
7-
XX(2, HEAD, HEAD) \
8-
XX(3, POST, POST) \
9-
XX(4, PUT, PUT) \
10-
/* pathological */ \
11-
XX(5, CONNECT, CONNECT) \
12-
XX(6, OPTIONS, OPTIONS) \
13-
XX(7, TRACE, TRACE) \
14-
/* WebDAV */ \
15-
XX(8, COPY, COPY) \
16-
XX(9, LOCK, LOCK) \
17-
XX(10, MKCOL, MKCOL) \
18-
XX(11, MOVE, MOVE) \
19-
XX(12, PROPFIND, PROPFIND) \
20-
XX(13, PROPPATCH, PROPPATCH) \
21-
XX(14, SEARCH, SEARCH) \
22-
XX(15, UNLOCK, UNLOCK) \
23-
XX(16, BIND, BIND) \
24-
XX(17, REBIND, REBIND) \
25-
XX(18, UNBIND, UNBIND) \
26-
XX(19, ACL, ACL) \
27-
/* subversion */ \
28-
XX(20, REPORT, REPORT) \
29-
XX(21, MKACTIVITY, MKACTIVITY) \
30-
XX(22, CHECKOUT, CHECKOUT) \
31-
XX(23, MERGE, MERGE) \
32-
/* upnp */ \
33-
XX(24, MSEARCH, M - SEARCH) \
34-
XX(25, NOTIFY, NOTIFY) \
35-
XX(26, SUBSCRIBE, SUBSCRIBE) \
36-
XX(27, UNSUBSCRIBE, UNSUBSCRIBE) \
37-
/* RFC-5789 */ \
38-
XX(28, PATCH, PATCH) \
39-
XX(29, PURGE, PURGE) \
40-
/* CalDAV */ \
41-
XX(30, MKCALENDAR, MKCALENDAR) \
42-
/* RFC-2068, section 19.6.1.2 */ \
43-
XX(31, LINK, LINK) \
44-
XX(32, UNLINK, UNLINK) \
45-
/* icecast */ \
4+
#define HTTP_METHOD_MAP(XX) \
5+
XX(0, DELETE, DELETE) \
6+
XX(1, GET, GET) \
7+
XX(2, HEAD, HEAD) \
8+
XX(3, POST, POST) \
9+
XX(4, PUT, PUT) \
10+
/* pathological */ \
11+
XX(5, CONNECT, CONNECT) \
12+
XX(6, OPTIONS, OPTIONS) \
13+
XX(7, TRACE, TRACE) \
14+
/* WebDAV */ \
15+
XX(8, COPY, COPY) \
16+
XX(9, LOCK, LOCK) \
17+
XX(10, MKCOL, MKCOL) \
18+
XX(11, MOVE, MOVE) \
19+
XX(12, PROPFIND, PROPFIND) \
20+
XX(13, PROPPATCH, PROPPATCH) \
21+
XX(14, SEARCH, SEARCH) \
22+
XX(15, UNLOCK, UNLOCK) \
23+
XX(16, BIND, BIND) \
24+
XX(17, REBIND, REBIND) \
25+
XX(18, UNBIND, UNBIND) \
26+
XX(19, ACL, ACL) \
27+
/* subversion */ \
28+
XX(20, REPORT, REPORT) \
29+
XX(21, MKACTIVITY, MKACTIVITY) \
30+
XX(22, CHECKOUT, CHECKOUT) \
31+
XX(23, MERGE, MERGE) \
32+
/* upnp */ \
33+
XX(24, MSEARCH, M - SEARCH) \
34+
XX(25, NOTIFY, NOTIFY) \
35+
XX(26, SUBSCRIBE, SUBSCRIBE) \
36+
XX(27, UNSUBSCRIBE, UNSUBSCRIBE) \
37+
/* RFC-5789 */ \
38+
XX(28, PATCH, PATCH) \
39+
XX(29, PURGE, PURGE) \
40+
/* CalDAV */ \
41+
XX(30, MKCALENDAR, MKCALENDAR) \
42+
/* RFC-2068, section 19.6.1.2 */ \
43+
XX(31, LINK, LINK) \
44+
XX(32, UNLINK, UNLINK) \
45+
/* icecast */ \
4646
XX(33, SOURCE, SOURCE)
4747

4848
enum http_method {

cores/common/arduino/src/wiring/wiring_compat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extern "C" {
2626
#define digitalPinToInterrupt(pin) (pin)
2727

2828
// FreeRTOS utilities
29-
#define xTaskCreateUniversal(pxTaskCode, pcName, usStackDepth, pvParameters, uxPriority, pxCreatedTask, xCoreID) \
29+
#define xTaskCreateUniversal(pxTaskCode, pcName, usStackDepth, pvParameters, uxPriority, pxCreatedTask, xCoreID) \
3030
xTaskCreate(pxTaskCode, pcName, usStackDepth, pvParameters, uxPriority, pxCreatedTask)
3131
#define xTaskCreatePinnedToCore xTaskCreateUniversal
3232

cores/common/arduino/src/wiring/wiring_private.h

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,36 @@ inline void pinDisable(PinInfo *pin, uint32_t mask) {
2727
pin->enabled &= ~mask;
2828
}
2929

30-
#define pinCheckGetInfo(pinNumber, mask, ret) \
31-
PinInfo *pin = pinInfo(pinNumber); \
32-
if (!pin) \
33-
return ret; \
34-
if (!pinSupported(pin, mask)) \
30+
#define pinCheckGetInfo(pinNumber, mask, ret) \
31+
PinInfo *pin = pinInfo(pinNumber); \
32+
if (!pin) \
33+
return ret; \
34+
if (!pinSupported(pin, mask)) \
3535
return ret;
3636

37-
#define pinCheckGetData(pinNumber, mask, ret) \
38-
PinInfo *pin = pinInfo(pinNumber); \
39-
if (!pin) \
40-
return ret; \
41-
if (!pinSupported(pin, mask)) \
42-
return ret; \
37+
#define pinCheckGetData(pinNumber, mask, ret) \
38+
PinInfo *pin = pinInfo(pinNumber); \
39+
if (!pin) \
40+
return ret; \
41+
if (!pinSupported(pin, mask)) \
42+
return ret; \
4343
PinData *data = pinData(pin);
4444

4545
#define pinIsOutput(pin, data) (pinEnabled(pin, PIN_GPIO) && (data->gpioMode ^ 0b101) < 5)
4646
#define pinIsInput(pin, data) (pinEnabled(pin, PIN_GPIO) && (data->gpioMode ^ 0b101) > 4)
4747

48-
#define pinSetOutputPull(pin, data, pinNumber, status) \
49-
do { \
50-
if (!pinIsOutput(pin, data)) { \
51-
pinMode(pinNumber, INPUT_PULLDOWN ^ !!status); \
52-
return; \
53-
} \
48+
#define pinSetOutputPull(pin, data, pinNumber, status) \
49+
do { \
50+
if (!pinIsOutput(pin, data)) { \
51+
pinMode(pinNumber, INPUT_PULLDOWN ^ !!status); \
52+
return; \
53+
} \
5454
} while (0);
5555

56-
#define pinSetInputMode(pin, data, pinNumber) \
57-
do { \
58-
if (!pinIsInput(pin, data)) \
59-
pinMode(pinNumber, INPUT); \
56+
#define pinSetInputMode(pin, data, pinNumber) \
57+
do { \
58+
if (!pinIsInput(pin, data)) \
59+
pinMode(pinNumber, INPUT); \
6060
} while (0);
6161

6262
#ifdef __cplusplus

cores/common/base/api/lt_utils.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
#include <libretiny.h>
66

77
// https://stackoverflow.com/a/3437484
8-
#define MAX(a, b) \
9-
({ \
10-
__typeof__(a) _a = (a); \
11-
__typeof__(b) _b = (b); \
12-
_a > _b ? _a : _b; \
8+
#define MAX(a, b) \
9+
({ \
10+
__typeof__(a) _a = (a); \
11+
__typeof__(b) _b = (b); \
12+
_a > _b ? _a : _b; \
1313
})
14-
#define MIN(a, b) \
15-
({ \
16-
__typeof__(a) _a = (a); \
17-
__typeof__(b) _b = (b); \
18-
_a < _b ? _a : _b; \
14+
#define MIN(a, b) \
15+
({ \
16+
__typeof__(a) _a = (a); \
17+
__typeof__(b) _b = (b); \
18+
_a < _b ? _a : _b; \
1919
})
2020

2121
/**

cores/common/base/config/fal_cfg.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ extern const struct fal_flash_dev flash0;
2020

2121
#define FAL_FLASH_DEV_NAME "flash0"
2222

23-
#define FAL_FLASH_DEV_TABLE \
24-
{ \
25-
&flash0, \
23+
#define FAL_FLASH_DEV_TABLE \
24+
{ \
25+
&flash0, \
2626
}
2727

2828
#define FAL_DEV_NAME_MAX 16 // no need for 24 chars (default)
2929

3030
// Partition table
3131
#define FAL_PART_HAS_TABLE_CFG
3232

33-
#define FAL_PART_TABLE_ITEM(part_lower, part_upper) \
34-
{ \
35-
.magic_word = FAL_PART_MAGIC_WORD, /* magic word */ \
36-
.name = #part_lower, /* lowercase name as string */ \
37-
.flash_name = FAL_FLASH_DEV_NAME, /* flash device name */ \
38-
.offset = FLASH_##part_upper##_OFFSET, /* partition offset macro as uppercase string */ \
39-
.len = FLASH_##part_upper##_LENGTH, /* partition length macro as uppercase string */ \
33+
#define FAL_PART_TABLE_ITEM(part_lower, part_upper) \
34+
{ \
35+
.magic_word = FAL_PART_MAGIC_WORD, /* magic word */ \
36+
.name = #part_lower, /* lowercase name as string */ \
37+
.flash_name = FAL_FLASH_DEV_NAME, /* flash device name */ \
38+
.offset = FLASH_##part_upper##_OFFSET, /* partition offset macro as uppercase string */ \
39+
.len = FLASH_##part_upper##_LENGTH, /* partition length macro as uppercase string */ \
4040
},
4141

4242
// for fal_partition_t

0 commit comments

Comments
 (0)