Skip to content

Commit

Permalink
Merge pull request #1 from MichaelDvP/main
Browse files Browse the repository at this point in the history
clone tasmota flasher, change partitions, rename, update tool
  • Loading branch information
proddy committed Oct 31, 2022
2 parents 94d1390 + 8899b2b commit 0e329ce
Show file tree
Hide file tree
Showing 25 changed files with 7,189 additions and 0 deletions.
96 changes: 96 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
name: Build Workflow

on:
workflow_dispatch: # Manually start a workflow
push:
branches:
- main
paths-ignore:
- '.github/**' # Ignore changes towards the .github directory

jobs:
build-windows:
runs-on: windows-2019
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Python
uses: actions/setup-python@v3
with:
python-version: '3.10'
architecture: 'x64'
- name: Install requirements
run: |
pip install -r requirements.txt -r requirements_build.txt
pip install -e .
- name: Run PyInstaller
run: |
python -m PyInstaller.__main__ -F -w -n ESP-Flasher -i icon.ico esp_flasher\__main__.py
- uses: actions/upload-artifact@v2
with:
name: Windows
path: dist/ESP-Flasher.exe

build-ubuntu:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Python
uses: actions/setup-python@v3
with:
python-version: '3.8'
- name: Install dependencies
run: |
sudo apt update
sudo apt install libgtk-3-dev libnotify-dev libsdl2-dev
pip install -U \
-f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04 \
wxPython
- name: Install requirements
run: |
pip install -r requirements.txt -r requirements_build.txt
pip install -e .
- name: Run PyInstaller
run: |
python -m PyInstaller.__main__ -F -w -n ESP-Flasher -i icon.ico esp_flasher/__main__.py
- name: See dist directory
run: ls dist
- name: 'Tar files'
run: gzip dist/ESP-Flasher
- name: 'show gzip'
run: ls dist
- uses: actions/upload-artifact@v2
with:
name: Ubuntu
path: dist/ESP-Flasher.gz


build-macos:
runs-on: macOS-10.15
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Python
uses: actions/setup-python@v3
with:
python-version: '3.9'
- name: Install requirements
run: |
pip install -r requirements.txt -r requirements_build.txt
pip install -e .
- name: Run PyInstaller
run: |
python -m PyInstaller.__main__ -F -w -n ESP-Flasher -i icon.icns esp_flasher/__main__.py
- name: See dist directory
run: ls dist
- name: Move app
run: |
mv dist/ESP-Flasher.app dist/ESP-Flasher-dev-macOS.app
- name: 'Tar files'
run: tar -cvf dist.tar dist/*
- name: 'Upload Artifact'
uses: actions/upload-artifact@v2
with:
name: macOS
path: dist.tar
109 changes: 109 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/

config/

.DS_Store
/.idea/
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021 Johann Obermeier

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
3 changes: 3 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
include LICENSE
include README.md
include requirements.txt
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
# EMS-ESP-Flasher

Flash tool for uploading EMS-ESP firmware

Forked from [https://github.com/Jason2866/ESP_Flasher/](https://github.com/Jason2866/ESP_Flasher/)

use partitions from ems-esp

## License

[MIT](http://opensource.org/licenses/MIT) © Marcel Stör, Otto Winter, Johann Obermeier
13 changes: 13 additions & 0 deletions build-instructions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# macOS

`pyinstaller -F -w -n ESP-Flasher -i icon.icns esp_flasher/__main__.py`

# Windows

1. Start up VM
2. Install Python (3) from App Store
3. Download esp-flasher from GitHub
4. `pip install -e.` and `pip install pyinstaller`
5. Check with `python -m esp_flasher.__main__`
6. `python -m PyInstaller.__main__ -F -w -n ESP-Flasher -i icon.ico esp_flasher\__main__.py`
7. Go to `dist` folder, check ESP-Flasher.exe works.
Empty file added esp_flasher/__init__.py
Empty file.
Loading

0 comments on commit 0e329ce

Please sign in to comment.