Skip to content

Commit

Permalink
Merge pull request #189 from ayushsharma82/dev
Browse files Browse the repository at this point in the history
v3.1.2 Release
  • Loading branch information
ayushsharma82 authored Jun 28, 2024
2 parents d4f6bcd + 0132ffb commit adf7768
Show file tree
Hide file tree
Showing 12 changed files with 577 additions and 423 deletions.
172 changes: 113 additions & 59 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,85 +1,139 @@
name: Arduino Library CI

on:
on:
push:
paths-ignore:
- '**/**.md'
- '/keywords.txt'
- '/library.json'
- '/library.properties'
- '/ui'
- '/docs'
- "**/**.md"
- "/keywords.txt"
- "/library.json"
- "/library.properties"
- "/vue-frontend"
- "/docs"
pull_request:
paths-ignore:
- '**/**.md'
- '/keywords.txt'
- '/library.json'
- '/library.properties'
- '/ui'
- '/docs'
- "**/**.md"
- "/keywords.txt"
- "/library.json"
- "/library.properties"
- "/vue-frontend"
- "/docs"

jobs:
Async_CI:
arduino:
name: arduino ${{ matrix.name }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- name: package_esp32_index.json
core: esp32:esp32
board: esp32:esp32:esp32
index_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
- name: package_esp32_dev_index.json
core: esp32:esp32
board: esp32:esp32:esp32
index_url: https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json
- name: package_esp8266com_index.json
core: esp8266:esp8266
board: esp8266:esp8266:huzzah
index_url: https://arduino.esp8266.com/stable/package_esp8266com_index.json
- name: package_rp2040_index.json
core: rp2040:rp2040
board: rp2040:rp2040:rpipicow
index_url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json

steps:
- uses: actions/setup-python@v1
with:
python-version: '3.x'

- uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v4

- uses: actions/checkout@v2
- name: Arduino Lint
uses: arduino/arduino-lint-action@v1
with:
repository: ayushsharma82/ci-arduino
path: ci
library-manager: update

- name: pre-install
run: bash ci/actions_install.sh
- name: Install arduino-cli
run: curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=/usr/local/bin sh

- name: Set configuration
run: arduino-cli config set library.enable_unsafe_install true
- name: Update core index
run: arduino-cli core update-index --additional-urls "${{ matrix.index_url }}"

- name: Install test dependencies
run: arduino-cli lib install --git-url https://github.com/me-no-dev/ESPAsyncWebServer --git-url https://github.com/me-no-dev/ESPAsyncTCP --git-url https://github.com/me-no-dev/AsyncTCP

- name: Skip SyncDemo Example
run: |
cd examples
cd Demo
touch .esp32.test.skip
touch .esp8266.test.skip
- name: Install core
run: arduino-cli core install --additional-urls "${{ matrix.index_url }}" ${{ matrix.core }}

- name: Install AsyncTCP
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.1.4

- name: Install ESPAsyncTCP
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-ESPAsyncTCP#v2.0.0

- name: Install ESPAsyncWebServer
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.0.2

- name: Build Demo
run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/Demo/Demo.ino"

- name: Configure ElegantOTA to Async Mode
if: ${{ matrix.core != 'rp2040:rp2040' }}
run: |
cd src
sed -i 's/ELEGANTOTA_USE_ASYNC_WEBSERVER 0/ELEGANTOTA_USE_ASYNC_WEBSERVER 1/' ElegantOTA.h
- name: Test Async Demo
run: python3 ci/build_platform.py esp8266 esp32
Sync_CI:
- name: Build AsyncDemo
if: ${{ matrix.core != 'rp2040:rp2040' }}
run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/AsyncDemo/AsyncDemo.ino"

platformio:
name: pio ${{ matrix.name }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- name: esp32dev|arduino
board: esp32dev
platform: espressif32
opts: "--project-option 'lib_compat_mode = strict'"
- name: esp32dev|arduino-2
board: esp32dev
platform: [email protected]
opts: "--project-option 'lib_compat_mode = strict'"
- name: esp32dev|arduino-3
board: esp32dev
platform: espressif32
opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip'"
- name: esp32-s3-devkitc-1|arduino
board: esp32-s3-devkitc-1
platform: espressif32
opts: "--project-option 'lib_compat_mode = strict'"
- name: esp32-s3-devkitc-1|arduino-2
board: esp32-s3-devkitc-1
platform: [email protected]
opts: "--project-option 'lib_compat_mode = strict'"
- name: esp32-s3-devkitc-1|arduino-3
board: esp32-s3-devkitc-1
platform: espressif32
opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip'"
- name: huzzah|espressif8266
board: huzzah
platform: espressif8266
opts: "--project-option 'lib_compat_mode = strict'"
steps:
- uses: actions/setup-python@v1
- uses: actions/checkout@v4
- name: Set up cache
uses: actions/cache@v4
with:
python-version: '3.x'

- uses: actions/checkout@v2

- uses: actions/checkout@v2
path: |
~/.platformio
~/.cache/pip
key: ${{ matrix.name }}
- uses: actions/setup-python@v5
with:
repository: adafruit/ci-arduino
path: ci

- name: pre-install
run: bash ci/actions_install.sh

- name: Skip AsyncDemo Example
run: |
cd examples
cd AsyncDemo
touch .esp32.test.skip
touch .esp8266.test.skip
python-version: "3.x"
- name: Install PlatformIO
run: pip install platformio
- name: Install Platform
run: platformio platform install ${{ matrix.platform }}

- name: Test Sync Demo
run: python3 ci/build_platform.py esp8266 esp32 picow_rp2040
- run: platformio ci "examples/Demo/Demo.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }}
- run: PLATFORMIO_BUILD_FLAGS="-DELEGANTOTA_USE_ASYNC_WEBSERVER=1" platformio ci "examples/AsyncDemo/AsyncDemo.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }}
17 changes: 17 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: 'Close stale issues and PR'
on:
schedule:
- cron: '30 6 * * *'

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v9
with:
stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
stale-pr-message: 'This PR is marked as stale because it has been open 45 days with no activity. You can remove stale label or comment if this PR is still valid.'
close-issue-message: 'This issue was closed because it has been stalled for 5 days with no activity.'
days-before-stale: 30
days-before-close: 5
days-before-pr-close: -1
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ node_modules
.DS_Store
.vscode
/build
/portal
/portal
.pio
Empty file.
10 changes: 9 additions & 1 deletion library.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,15 @@
"maintainer": true
}
],
"version": "3.1.1",
"dependencies": [
{
"owner": "mathieucarbou",
"name": "ESP Async WebServer",
"version": "^3.0.2",
"platforms": ["espressif8266", "espressif32"]
}
],
"version": "3.1.2",
"frameworks": "arduino",
"platforms": ["espressif8266", "espressif32", "raspberrypi"]
}
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ElegantOTA
version=3.1.1
version=3.1.2
author=Ayush Sharma
category=Communication
maintainer=Ayush Sharma <[email protected]>
Expand Down
46 changes: 46 additions & 0 deletions platformio.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
[env]
framework = arduino
build_flags =
-Wall -Wextra
-D CONFIG_ARDUHAL_LOG_COLORS
-D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
-D ELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps =
mathieucarbou/Async TCP @ ^3.1.4
mathieucarbou/ESP Async WebServer @ 3.0.2
upload_protocol = esptool
monitor_speed = 115200
monitor_filters = esp32_exception_decoder, log2file

[platformio]
lib_dir = .
; src_dir = examples/Demo
src_dir = examples/AsyncDemo

[env:arduino]
platform = espressif32
board = esp32-s3-devkitc-1

[env:arduino-2]
platform = [email protected]
board = esp32-s3-devkitc-1

[env:arduino-3]
platform = espressif32
platform_packages=
platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2
platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip
board = esp32-s3-devkitc-1

[env:esp8266]
platform = espressif8266
board = huzzah
lib_deps =
mathieucarbou/ESP Async WebServer @ 3.0.2
esphome/ESPAsyncTCP-esphome @ 2.0.0

[env:pico]
platform = https://github.com/maxgerhardt/platform-raspberrypi.git
board = pico
framework = arduino
board_build.core = earlephilhower
43 changes: 26 additions & 17 deletions platformio_upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
#
# extra_scripts = platformio_upload.py
# upload_protocol = custom
# upload_url = <your upload URL>
# custom_upload_url = <your upload URL>
#
# An example of an upload URL:
# upload_url = http://192.168.1.123/update
# also possible: upload_url = http://domainname/update
# custom_upload_url = http://192.168.1.123/update
# also possible: custom_upload_url = http://domainname/update

import sys
import requests
import hashlib
from urllib.parse import urlparse
Expand Down Expand Up @@ -54,7 +55,10 @@ def on_upload(source, target, env):
'Connection': 'keep-alive'
}

checkAuthResponse = requests.get(f"{upload_url_compatibility}/update")
try:
checkAuthResponse = requests.get(f"{upload_url_compatibility}/update")
except Exception as e:
return 'Error checking auth: ' + repr(e)

if checkAuthResponse.status_code == 401:
try:
Expand All @@ -66,24 +70,27 @@ def on_upload(source, target, env):
print("No authentication values specified.")
print('Please, add some Options in your .ini file like: \n\ncustom_username=username\ncustom_password=password\n')
if username is None or password is None:
print("Authentication required, but no credentials provided.")
return
return "Authentication required, but no credentials provided."
print("Serverconfiguration: authentication needed.")
auth = HTTPDigestAuth(username, password)
doUpdateAuth = requests.get(start_url, headers=start_headers, auth=auth)
try:
doUpdateAuth = requests.get(start_url, headers=start_headers, auth=auth)
except Exception as e:
return 'Error while authenticating: ' + repr(e)

if doUpdateAuth.status_code != 200:
print("authentication faild " + str(doUpdateAuth.status_code))
return
print("Authentication successfull")
return "Authentication failed " + str(doUpdateAuth.status_code)
print("Authentication successful")
else:
auth = None
print("Serverconfiguration: autentication not needed.")
doUpdate = requests.get(start_url, headers=start_headers)
print("Serverconfiguration: authentication not needed.")
try:
doUpdate = requests.get(start_url, headers=start_headers)
except Exception as e:
return 'Error while starting upload: ' + repr(e)

if doUpdate.status_code != 200:
print("start-request faild " + str(doUpdate.status_code))
return
return "Start request failed " + str(doUpdate.status_code)

firmware.seek(0)
encoder = MultipartEncoder(fields={
Expand Down Expand Up @@ -114,14 +121,16 @@ def on_upload(source, target, env):
'Origin': f'{upload_url}'
}


response = requests.post(f"{upload_url}/ota/upload", data=monitor, headers=post_headers, auth=auth)
try:
response = requests.post(f"{upload_url}/ota/upload", data=monitor, headers=post_headers, auth=auth)
except Exception as e:
return 'Error while uploading: ' + repr(e)

bar.close()
time.sleep(0.1)

if response.status_code != 200:
message = "\nUpload faild.\nServer response: " + response.text
message = "\nUpload failed.\nServer response: " + response.text
tqdm.write(message)
else:
message = "\nUpload successful.\nServer response: " + response.text
Expand Down
Loading

0 comments on commit adf7768

Please sign in to comment.