8000 Merge branch 'master' into pr-umm_malloc-panic-cleanup · esp8266/Arduino@74118c0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 74118c0

Browse files
mcsprmcspr
authored
Merge branch 'master' into pr-umm_malloc-panic-cleanup
2 parents e6c8beb + 32939c4 commit 74118c0

File tree

261 files changed

+15631
-15783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

261 files changed

+15631
-15783
lines changed

‎.git-blame-ignore-revs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
9bdcd4f36a2e5285267b69b17e8fc26482dc1c72
2+
eea9999dc5eaf464a432f77d5b65269f9baf198d
3+
98125f88605cd7e46e9be4e1b3ad0600dd5d2b51
4+
91213321df5d49622e7d03426da8366197fe0db0

‎.github/workflows/pull-request.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,20 @@ jobs:
238238
python-version: '3.x'
239239
- name: Style check
240240
env:
241+
LLVM_SNAPSHOT_KEY: "6084F3CF814B57C1CF12EFD515CF4D18AF4F7421"
241242
TRAVIS_BUILD_DIR: ${{ github.workspace }}
242243
TRAVIS_TAG: ${{ github.ref }}
243244
run: |
245+
export GNUPGHOME=$(mktemp -d)
246+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$LLVM_SNAPSHOT_KEY"
247+
gpg --batch --armor --export "$LLVM_SNAPSHOT_KEY" | \
248+
sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.gpg.asc
249+
rm -r $GNUPGHOME
250+
echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" | \
251+
sudo tee /etc/apt/sources.list.d/llvm.list
244252
sudo apt update
245-
sudo apt install astyle
253+
sudo apt install clang-format-13
254+
pip3 install pyyaml
246255
bash ./tests/ci/style_check.sh
247256
248257

‎cores/esp8266/LwipDhcpServer-NonOS.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// these functions must exists as-is with "C" interface,
2424
// nonos-sdk calls them at boot time and later
2525

26-
#include <lwip/init.h> // LWIP_VERSION
26+
#include <lwip/init.h> // LWIP_VERSION
2727

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

3636
extern "C"
3737
{
38-
39-
void dhcps_start(struct ip_info *info, netif* apnetif)
38+
void dhcps_start(struct ip_info* info, netif* apnetif)
4039
{
4140
// apnetif is esp interface, replaced by lwip2's
4241
// netif_git[SOFTAP_IF] interface in constructor
@@ -61,4 +60,4 @@ extern "C"
6160
dhcpSoftAP.end();
6261
}
6362

64-
} // extern "C"
63+
} // extern "C"

0 commit comments

Comments
 (0)
0