Skip to content
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

Jump to bottom

Astyle to clang format #8464

Merged
merged 2 commits into from
Mar 3, 2022
Merged

Astyle to clang format #8464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9121332
Migrate from astyle to clang-format (#8464)
mcspr Feb 20, 2022
9019c28
Add .git-blame-ignore-revs (#8464)
mcspr Feb 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
4 changes: 4 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
9bdcd4f36a2e5285267b69b17e8fc26482dc1c72
eea9999dc5eaf464a432f77d5b65269f9baf198d
98125f88605cd7e46e9be4e1b3ad0600dd5d2b51
91213321df5d49622e7d03426da8366197fe0db0
11 changes: 10 additions & 1 deletion .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,20 @@ jobs:
python-version: '3.x'
- name: Style check
env:
LLVM_SNAPSHOT_KEY: "6084F3CF814B57C1CF12EFD515CF4D18AF4F7421"
TRAVIS_BUILD_DIR: ${{ github.workspace }}
TRAVIS_TAG: ${{ github.ref }}
run: |
export GNUPGHOME=$(mktemp -d)
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$LLVM_SNAPSHOT_KEY"
gpg --batch --armor --export "$LLVM_SNAPSHOT_KEY" | \
sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.gpg.asc
rm -r $GNUPGHOME
echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" | \
sudo tee /etc/apt/sources.list.d/llvm.list
sudo apt update
sudo apt install astyle
sudo apt install clang-format-13
pip3 install pyyaml
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