Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jan 22, 2024
1 parent c6c5a81 commit a3b3c2b
Show file tree
Hide file tree
Showing 919 changed files with 54,338 additions and 55,520 deletions.
12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE/Issue-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ body:
- type: markdown
attributes:
value: |
* Before reporting a new issue please check and search in [List of existing issues](https://github.com/espressif/arduino-esp32/issues?q=is%3Aissue)
* Before reporting a new issue please check and search in [List of existing issues](https://github.com/espressif/arduino-esp32/issues?q=is%3Aissue)
* Please check [Online Documentation](https://docs.espressif.com/projects/arduino-esp32/en/latest/index.html)
* Take a look on [Troubleshooting guide](https://docs.espressif.com/projects/arduino-esp32/en/latest/troubleshooting.html)
* If still experiencing the issue, please provide as many details as possible below about your hardware, computer setup and code.
Expand Down Expand Up @@ -50,7 +50,7 @@ body:
- v2.0.8
- v2.0.7
- v2.0.6
- v2.0.5
- v2.0.5
- v2.0.4
- v2.0.3
- v2.0.2
Expand Down Expand Up @@ -85,13 +85,13 @@ body:
validations:
required: true
- type: dropdown
id: PSRAM
id: PSRAM
attributes:
label: PSRAM enabled
description: Is PSRAM enabled?
options:
- 'yes'
- 'no'
- 'no'
validations:
required: true
- type: input
Expand Down Expand Up @@ -127,11 +127,11 @@ body:
placeholder: Enable Core debug level - Debug on tools menu of Arduino IDE, then put the serial output here.
render: plain
validations:
required: true
required: true
- type: textarea
id: other-remarks
attributes:
label: Other Steps to Reproduce
label: Other Steps to Reproduce
description: Is there any other information you can think of which will help us reproduce this problem? Any additional info can be added as well.
placeholder: ex. I also tried on other OS, HW...it works correctly on that setup.
- type: checkboxes
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ contact_links:
about: Community channel for questions and help
- name: ESP32 Forum - Arduino
url: https://esp32.com/viewforum.php?f=19
about: Official Forum for questions
about: Official Forum for questions
4 changes: 2 additions & 2 deletions .github/scripts/find_new_boards.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ do
addition_line=$( echo "${params_array[c+1]}" | cut -d'+' -f2 | cut -d',' -f1 )
addition_count=$( echo "${params_array[c+1]}" | cut -d'+' -f2 | cut -d',' -f2 | cut -d' ' -f1 )
addition_end=$(($addition_line+$addition_count))

addition_line=$(($addition_line + 3))
addition_end=$(($addition_end - $deletion_count))

Expand Down Expand Up @@ -87,4 +87,4 @@ then
echo "FQBNS=${json_matrix}" >> $GITHUB_ENV
else
echo "FQBNS=" >> $GITHUB_ENV
fi
fi
1 change: 0 additions & 1 deletion .github/scripts/install-arduino-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,3 @@ if [ ! -d "$ARDUINO_IDE_PATH" ] || [ ! -f "$ARDUINO_IDE_PATH/arduino-cli" ]; the
mkdir -p "$ARDUINO_IDE_PATH"
curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR="$ARDUINO_IDE_PATH" sh
fi

1 change: 0 additions & 1 deletion .github/scripts/install-arduino-ide.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,3 @@ if [ ! -d "$ARDUINO_IDE_PATH" ]; then
echo "Arduino IDE Installed in '$ARDUINO_IDE_PATH'"
echo ""
fi

10 changes: 5 additions & 5 deletions .github/scripts/merge_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ def pkgVersionNormalized(versionString):

verStr = str(versionString)
verParts = re.split('\.|-rc', verStr, flags=re.IGNORECASE)

if len(verParts) == 3:
if (sys.version_info > (3, 0)): # Python 3
verStr = str(versionString) + '-rc' + str(sys.maxsize)
else: # Python 2
verStr = str(versionString) + '-rc' + str(sys.maxint)

elif len(verParts) != 4:
print("pkgVersionNormalized WARNING: unexpected version format: {0})".format(verStr), file=sys.stderr)

return verStr


Expand All @@ -53,7 +53,7 @@ def main(args):
return 1

tools = {}
platforms = {}
platforms = {}
pkg1 = load_package(args[1])
tools = merge_objects(tools, pkg1['tools']);
platforms = merge_objects(platforms, pkg1['platforms']);
Expand All @@ -73,7 +73,7 @@ def main(args):
for version in platforms[name]:
print("Adding platform {0}-{1}".format(name, version), file=sys.stderr)
pkg1['platforms'].append(platforms[name][version])

pkg1['platforms'] = sorted(pkg1['platforms'], key=lambda k: LooseVersion(pkgVersionNormalized(k['version'])), reverse=True)

json.dump({'packages':[pkg1]}, sys.stdout, indent=2)
Expand Down
5 changes: 2 additions & 3 deletions .github/scripts/sketch_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
echo "Skipping $sketchname for target $target"
exit 0
fi

ARDUINO_CACHE_DIR="$HOME/.arduino/cache.tmp"
if [ -n "$ARDUINO_BUILD_DIR" ]; then
build_dir="$ARDUINO_BUILD_DIR"
Expand Down Expand Up @@ -164,7 +164,7 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
--build-cache-path "$ARDUINO_CACHE_DIR" \
--build-path "$build_dir" \
$xtra_opts "${sketchdir}"

exit_status=$?
if [ $exit_status -ne 0 ]; then
echo ""ERROR: Compilation failed with error code $exit_status""
Expand Down Expand Up @@ -388,4 +388,3 @@ case "$cmd" in
echo "$USAGE"
exit 2
esac

1 change: 0 additions & 1 deletion .github/scripts/tests_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,3 @@ else
fi

${BUILD_CMD} ${args} $*

8 changes: 4 additions & 4 deletions .github/workflows/allboards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
ref: ${{ github.event.client_payload.branch }}

- name: Get boards fqbns
run:
run:
bash .github/scripts/find_all_boards.sh

setup-chunks:
Expand All @@ -43,7 +43,7 @@ jobs:

- id: set-test-chunks
name: Set Chunks
run:
run:
echo "test-chunks<<EOF" >> $GITHUB_OUTPUT

echo "$( jq -nc '${{ needs.find-boards.outputs.fqbns }} | [_nwise( ${{ needs.find-boards.outputs.board-count }}/15 | ceil)]')" >> $GITHUB_OUTPUT
Expand All @@ -61,7 +61,7 @@ jobs:
strategy:
fail-fast: false
matrix:
matrix:
chunk: ${{ fromJSON(needs.setup-chunks.outputs['test-chunks']) }}

steps:
Expand All @@ -73,7 +73,7 @@ jobs:
- name: Echo FQBNS to file
run:
echo "$FQBN" > fqbns.json
env:
env:
FQBN: ${{ toJSON(matrix.chunk) }}

- name: Compile sketch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/boards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: dcarbone/[email protected]

- name: Get board name
run:
run:
bash .github/scripts/find_new_boards.sh ${{ github.repository }} ${{github.event.number}}

test-boards:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dangerjs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ jobs:
- name: DangerJS pull request linter
uses: espressif/shared-github-dangerjs@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
"~/Arduino/libraries/WS2812FX/examples/ws2812fx_spi/ws2812fx_spi.ino"
]
}
]
]
8 changes: 4 additions & 4 deletions .github/workflows/lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

# Schedule weekly builds on every Sunday at 4 am
schedule:
- cron: '0 4 * * SUN'
- cron: '0 4 * * SUN'

env:
# It's convenient to set variables for values used multiple times in the workflow
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# Check out repository
- name: Checkout repository
- name: Checkout repository
uses: actions/checkout@v3
with:
token: ${{ env.GITHUB_TOKEN }}
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
git add ${{ env.RESULT_LIBRARY_TEST_FILE }}
git commit -m "Generated External Libraries Test Results"
git push origin HEAD:gh-pages
event_file:
name: "Event File"
if: |
Expand All @@ -132,4 +132,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: Event File
path: ${{github.event_path}}
path: ${{github.event_path}}
2 changes: 1 addition & 1 deletion .github/workflows/publishlib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
gh api $url > "$name.zip"
unzip -d "$name" "$name.zip"
done
- name: Report results
uses: P-R-O-C-H-Y/report-size-deltas@main
with:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tools/openocd-esp32

# Ignore build folder
/build

# Ignore files built by Visual Studio/Visual Micro
[Dd]ebug/
[Rr]elease/
Expand Down
1 change: 0 additions & 1 deletion Kconfig.projbuild
Original file line number Diff line number Diff line change
Expand Up @@ -409,4 +409,3 @@ config ARDUINO_SELECTIVE_Wire


endmenu

4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Version 2.1, February 1999

Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -500,4 +500,4 @@ if necessary. Here is a sample; alter the names:
signature of Ty Coon, 1 April 1990
Ty Coon, President of Vice

That's all there is to it!
That's all there is to it!
4 changes: 2 additions & 2 deletions boards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15227,7 +15227,7 @@ esp32s3-devkitlipo.menu.EraseFlash.none=Disabled
esp32s3-devkitlipo.menu.EraseFlash.none.upload.erase_cmd=
esp32s3-devkitlipo.menu.EraseFlash.all=Enabled
esp32s3-devkitlipo.menu.EraseFlash.all.upload.erase_cmd=-e

##############################################################

esp32c3-devkitlipo.name=OLIMEX ESP32-C3-DevKit-Lipo
Expand Down Expand Up @@ -30030,4 +30030,4 @@ makergo_c3_supermini.menu.EraseFlash.none.upload.erase_cmd=
makergo_c3_supermini.menu.EraseFlash.all=Enabled
makergo_c3_supermini.menu.EraseFlash.all.upload.erase_cmd=-e

##############################################################
##############################################################
Loading

0 comments on commit a3b3c2b

Please sign in to comment.