Skip to content

migrate from astyle to clang-format, add tests/ #8455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed

migrate from astyle to clang-format, add tests/ #8455

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e1c5387
apply Allman to tests/
d-a-v Jan 19, 2022
b130c8b
wip: use clang-format
d-a-v Jan 19, 2022
01e6b96
revert submodule update
d-a-v Jan 19, 2022
c5ecc72
use clang-format-12 instead of 10
d-a-v Jan 19, 2022
9a353cc
unsort #include order
d-a-v Jan 19, 2022
f2dae5f
apply new clang-format configuration
d-a-v Jan 19, 2022
015aacf
clang-format: based on WebKit style, added Arduino ino style
d-a-v Jan 19, 2022
3a40b86
one more pass
d-a-v Jan 20, 2022
591336c
update and embed clang-format configuration into tests/restyle.sh
d-a-v Jan 20, 2022
242b340
tuning
d-a-v Jan 20, 2022
9c427d7
move comment
d-a-v Jan 20, 2022
8866c89
trying to reduce changes
d-a-v Jan 20, 2022
a4bdd62
sync script, sync submodule
d-a-v Jan 20, 2022
69a23d8
missing change
d-a-v Jan 20, 2022
694d935
updates: ternary formats, line length limited to 100
d-a-v Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
BasedOnStyle: Chromium
AlignTrailingComments: true
BreakBeforeBraces: Allman
ColumnLimit: 0
IndentWidth: 4
KeepEmptyLinesAtTheStartOfBlocks: false
SpacesBeforeTrailingComments: 2
SortIncludes: false
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ jobs:
TRAVIS_TAG: ${{ github.ref }}
run: |
sudo apt update
sudo apt install astyle
sudo apt install astyle clang-format-12
bash ./tests/ci/style_check.sh


Expand Down
7 changes: 3 additions & 4 deletions cores/esp8266/LwipDhcpServer-NonOS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// these functions must exists as-is with "C" interface,
// nonos-sdk calls them at boot time and later

#include <lwip/init.h> // LWIP_VERSION
#include <lwip/init.h> // LWIP_VERSION

#include <lwip/netif.h>
#include "LwipDhcpServer.h"
Expand All @@ -35,8 +35,7 @@ DhcpServer dhcpSoftAP(&netif_git[SOFTAP_IF]);

extern "C"
{

void dhcps_start(struct ip_info *info, netif* apnetif)
void dhcps_start(struct ip_info* info, netif* apnetif)
{
// apnetif is esp interface, replaced by lwip2's
// netif_git[SOFTAP_IF] interface in constructor
Expand All @@ -61,4 +60,4 @@ extern "C"
dhcpSoftAP.end();
}

} // extern "C"
} // extern "C"
Loading