Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/wifi_disconnection_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@yufengwangca
yufengwangca authored Jan 19, 2023
2 parents 86f6c17 + df07c87 commit c0ec91a
Show file tree
Hide file tree
Showing 3,028 changed files with 223,197 additions and 220,506 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .clang-tidy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Checks: >
readability-redundant-control-flow,
readability-redundant-string-cstr,
readability-redundant-string-init,
-bugprone-assignment-in-if-condition,
-bugprone-branch-clone,
-bugprone-copy-constructor-init,
-bugprone-easily-swappable-parameters,
Expand Down
75 changes: 29 additions & 46 deletions .devcontainer/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ ENV LANG en_US.utf8

# these are installed for terminal/dev convenience. If more tooling for build is required, please
# add them to chip-build (in integrations/docker/images/chip-build)
RUN apt-get update
RUN apt-get install -y locales && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
RUN apt-get -fy install git vim emacs sudo \
RUN apt-get update \
&& apt-get install -y locales \
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
&& apt-get -fy install git vim emacs sudo \
apt-utils dialog zsh \
iproute2 procps lsb-release \
bash-completion \
Expand All @@ -36,49 +37,31 @@ RUN apt-get -fy install git vim emacs sudo \
docker.io \
iputils-ping net-tools \
libncurses5 \
libpython2.7

RUN groupadd -g $USER_GID $USERNAME
RUN useradd -s /bin/bash -u $USER_UID -g $USER_GID -G docker -m $USERNAME
RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME
RUN chmod 0440 /etc/sudoers.d/$USERNAME

RUN mkdir -p /var/downloads
RUN cd /var/downloads
RUN curl -JL https://github.com/microsoft/vscode-cpptools/releases/download/0.27.0/cpptools-linux.vsix > extension.zip
RUN unzip extension.zip
RUN mkdir -p /home/$USERNAME/.vscode-server/extensions
RUN mv extension /home/$USERNAME/.vscode-server/extensions/ms-vscode.cpptools-0.27.0
RUN mkdir -p /home/$USERNAME/bin
RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/restyle-path -o /home/$USERNAME/bin/restyle-path
RUN chmod +x /home/$USERNAME/bin/restyle-path
RUN chown -R $USERNAME:$USERNAME /home/$USERNAME
RUN echo "PATH=/home/$USERNAME/bin:${PATH}" >> /home/$USERNAME/.bashrc

# $USERNAME needs to own the esp-idf and tools for the examples to build
RUN chown -R $USERNAME:$USERNAME /opt/espressif/esp-idf
RUN chown -R $USERNAME:$USERNAME /opt/espressif/tools

# $USERNAME needs to own west configuration to build nRF Connect examples
RUN chown -R $USERNAME:$USERNAME /opt/NordicSemiconductor/nrfconnect/

# allow read/write access to header and libraries
RUN chown -R $USERNAME:$USERNAME /opt/ubuntu-21.04-aarch64-sysroot/usr/

# allow licenses to be accepted
RUN chown -R $USERNAME:$USERNAME /opt/android/sdk

# AmebaD requires access to change build_info.h
RUN chown -R $USERNAME:$USERNAME /opt/ameba/ambd_sdk_with_chip_non_NDA/

# NXP uses a patch_sdk script to change SDK files
RUN mkdir -p /opt/sdk/sdks/
RUN chown -R $USERNAME:$USERNAME /opt/sdk/sdks/

RUN chown -R $USERNAME:$USERNAME /opt/fsl-imx-xwayland/5.15-kirkstone/

# Add access to openocd for VSCode debugging
RUN chown -R $USERNAME:$USERNAME /opt/openocd
libpython2.7 \
&& :

RUN groupadd -g $USER_GID $USERNAME \
&& useradd -s /bin/bash -u $USER_UID -g $USER_GID -G docker,sudo -m $USERNAME \
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
&& chmod 0440 /etc/sudoers.d/$USERNAME \
&& :

RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/restyle-path -o /usr/local/bin/restyle-path \
&& chmod +x /usr/local/bin/restyle-path \
&& :

RUN mkdir -p /opt/sdk/sdks/ \
&& chown -R $USERNAME:$USERNAME \
/opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
/opt/espressif/esp-idf `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
/opt/espressif/tools \
/opt/NordicSemiconductor/nrfconnect/ `# $USERNAME needs to own west configuration to build nRF Connect examples` \
/opt/ubuntu-21.04-aarch64-sysroot/usr/ `# allow read/write access to header and libraries` \
/opt/android/sdk `# allow licenses to be accepted` \
/opt/ameba/ambd_sdk_with_chip_non_NDA/ `# AmebaD requires access to change build_info.h` \
/opt/fsl-imx-xwayland/5.15-kirkstone/ \
/opt/openocd \
&& :

# Fix Tizen SDK paths for new user
RUN sed -i '/^TIZEN_SDK_DATA_PATH/d' $TIZEN_SDK_ROOT/sdk.info \
Expand Down
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"BUILD_VERSION": "0.6.18"
"BUILD_VERSION": "0.6.30"
}
},
"remoteUser": "vscode",
Expand All @@ -34,6 +34,7 @@
"maelvalais.autoconf",
"marus25.cortex-debug",
"ms-azuretools.vscode-docker",
"ms-vscode.cpptools",
"msedge-dev.gnls",
"redhat.vscode-yaml",
"vadimcn.vscode-lldb",
Expand Down
2 changes: 2 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ src/controller/python/chip/clusters/CHIPClusters.py linguist-generated
src/controller/python/chip/clusters/Objects.py linguist-generated
# Let bat file use CRLF linebreak
**/*.bat eol=crlf
# Mark Matter operational certificate/key files as binary
**/*.chip binary
15 changes: 9 additions & 6 deletions .github/.wordlist.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ AmebaZ
amebaz2
announcementReason
AnnounceOTAProvider
AnnounceOtaProviderRequest
AnnounceOTAProviderRequest
APIs
apk
AppConfig
Expand Down Expand Up @@ -125,6 +125,7 @@ backtrace
BallastConfiguration
BarrierControl
BasicCHIPRegression
BasicInformation
baudrate
BD
BDX
Expand Down Expand Up @@ -158,7 +159,7 @@ bouffalolab
BRD
breakpoint
bredr
BridgedDeviceBasic
BridgedDeviceBasicInformation
bridgedLightEndpoint
bringup
BromateConcentrationMeasurement
Expand Down Expand Up @@ -292,8 +293,8 @@ connstring
conntype
const
ContentApp
ContentAppPlatform
ContentApp's
ContentAppPlatform
ContentLaunch
ContentLauncher
continuousHinting
Expand Down Expand Up @@ -1120,8 +1121,8 @@ REPL
repo
req
Requestor
RequestorCanConsent
Requestor's
RequestorCanConsent
Requestors
responder
RestrictedEvent
Expand Down Expand Up @@ -1170,8 +1171,8 @@ SDB
SDC
SDHC
SDK
sdkconfig
SDK's
sdkconfig
SDKs
SDKTARGETSYSROOT
sdl
Expand Down Expand Up @@ -1199,6 +1200,7 @@ sexualized
sfv
SHA
ShadeConfiguration
SHAs
showDocumentation
shubhamdp
SIGINT
Expand Down Expand Up @@ -1323,14 +1325,15 @@ ths
Thunderboard
timedInteractionTimeoutMs
TimeFormatLocalization
timeframe
timeoutMs
TimeSynchronization
tinycrypt
Tizen
TKIP
TLS
tlsr
TLV
TLS
tmp
tngvndl
TODO
Expand Down
14 changes: 8 additions & 6 deletions .github/ISSUE_TEMPLATE/1-bug-report.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ body:
attributes:
label: Reproduction steps
description: "How do you trigger this bug? Please walk us through it step by step."
value: |
1.
2.
3.
...
render: bash
placeholder: |
Please list reproduction steps step by step.
Place shell commands between ```.
Attach logs as files instead of pasting them in.
1.
2.
3.
...
validations:
required: true
- type: input
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/100-documentation-issue.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ body:
2.
3.
...
render: bash
validations:
required: true
- type: dropdown
Expand Down
14 changes: 8 additions & 6 deletions .github/ISSUE_TEMPLATE/2-1.0-issue.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ body:
attributes:
label: Reproduction steps
description: "How do you trigger this bug? Please walk us through it step by step."
value: |
1.
2.
3.
...
render: bash
placeholder: |
Please list reproduction steps step by step.
Place shell commands between ```.
Attach logs as files instead of pasting them in.
1.
2.
3.
...
validations:
required: true
- type: input
Expand Down
14 changes: 8 additions & 6 deletions .github/ISSUE_TEMPLATE/3-sve-1.0-issue.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ body:
attributes:
label: Reproduction steps
description: "How do you trigger this bug? Please walk us through it step by step."
value: |
1.
2.
3.
...
render: bash
placeholder: |
Please list reproduction steps step by step.
Place shell commands between ```.
Attach logs as files instead of pasting them in.
1.
2.
3.
...
validations:
required: true
- type: input
Expand Down
14 changes: 8 additions & 6 deletions .github/ISSUE_TEMPLATE/50-tooling-fix.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ body:
attributes:
label: Reproduction steps / Feature
description: "How do you trigger this issue and/or can you please explain this new feature? Please walk us through it step by step."
value: |
1.
2.
3.
...
render: bash
placeholder: |
Please list reproduction steps step by step.
Place shell commands between ```.
Attach logs as files instead of pasting them in.
1.
2.
3.
...
validations:
required: true
- type: dropdown
Expand Down
14 changes: 8 additions & 6 deletions .github/ISSUE_TEMPLATE/60-platform-fix.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ body:
attributes:
label: Reproduction steps
description: "How do you trigger this issue? Please walk us through it step by step."
value: |
1.
2.
3.
...
render: bash
placeholder: |
Please list reproduction steps step by step.
Place shell commands between ```.
Attach logs as files instead of pasting them in.
1.
2.
3.
...
validations:
required: true
- type: dropdown
Expand Down
6 changes: 0 additions & 6 deletions .github/ISSUE_TEMPLATE/70-trivial-fix.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ body:
attributes:
label: Explanation
description: "(Optional) If other, why do you think this is trivial?"
value: |
1.
2.
3.
...
render: bash
validations:
required: false
- type: dropdown
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/80-feature-request.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ body:
description: "What feature are you looking to add? Please walk us through it!"
value: |
...
render: bash
validations:
required: true
- type: dropdown
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/99-github-workflow-issue.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ body:
2.
3.
...
render: bash
validations:
required: true
- type: dropdown
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bloat_check.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build:0.6.18
image: connectedhomeip/chip-build:0.6.31

steps:
- uses: Wandalen/[email protected]
Expand Down
Loading

0 comments on commit c0ec91a

Please sign in to comment.