Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add WebUI-3 as an option to the manifest #1390

Merged
merged 1 commit into from
Nov 30, 2024
+9 −68
Merged

Add WebUI-3 as an option to the manifest #1390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@ dist/
data-wmb/
*#
/gcode_tests/venv
release/
Binary file removed FluidNC/data3/index.html.gz
View file
Open in desktop
Binary file not shown.
63 changes: 0 additions & 63 deletions ISSUE_TEMPLATE/problem.yml
View file
Open in desktop

This file was deleted.

13 changes: 8 additions & 5 deletions build-release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ def copyToZip(zipObj, platform, fileName, destPath, mode=0o100755):
# Copy the web application to the release directory
dataRelPath = os.path.join(manifestRelPath, 'data')
os.makedirs(dataRelPath)
shutil.copy(os.path.join("FluidNC", "data", "index.html.gz"), dataRelPath)
shutil.copy(os.path.join("FluidNC", "data", "index.html.gz"), os.path.join(dataRelPath, "index-webui-2.html.gz"))
urllib.request.urlretrieve("https://github.com/michmela44/ESP3D-WEBUI/releases/download/3.0.0-a77-FluidNC/index.html.gz", os.path.join("release", "current", "data", "index-webui-3.html.gz"))

manifest = {
"name": "FluidNC",
Expand Down Expand Up @@ -148,7 +149,9 @@ def addFile(name, controllerpath, filename, srcpath, dstpath):

fulldstfile = os.path.join(fulldstpath, filename)

shutil.copy(os.path.join(srcpath, filename), fulldstfile)
# Only copy files that are not already in the directory
if os.path.join(srcpath, filename) != fulldstfile:
shutil.copy(os.path.join(srcpath, filename), fulldstfile)

print("file ", name)

Expand Down Expand Up @@ -259,7 +262,6 @@ def makeManifest():
addVariant("wifi", "Supports WiFi and WebUI", "Installation type")
addInstallable(fresh_install, True, ["esp32-4m-partitions", "esp32-bootloader", "esp32-bootapp", "esp32-wifi-firmware", "esp32-wifi-4m-filesystem"])
addInstallable(firmware_update, False, ["esp32-wifi-firmware"])
addInstallable(filesystem_update, False, ["esp32-wifi-4m-filesystem"])

addVariant("bt", "Supports Bluetooth serial", "Installation type")
addInstallable(fresh_install, True, ["esp32-4m-partitions", "esp32-bootloader", "esp32-bootapp", "esp32-bt-firmware"])
Expand All @@ -269,10 +271,11 @@ def makeManifest():
addInstallable(fresh_install, True, ["esp32-4m-partitions", "esp32-bootloader", "esp32-bootapp", "esp32-noradio-firmware"])
addInstallable(firmware_update, False, ["esp32-noradio-firmware"])

addFile("WebUI-2", "/localfs/index.html.gz", "index.html.gz", os.path.join("FluidNC", "data"), "data")
# addFile("WebUI-3", "/localfs/index.html.gz", "3index.html.gz", os.path.join("FluidNC", "data"), "data")
addFile("WebUI-2", "/localfs/index.html.gz", "index-webui-2.html.gz", os.path.join("release", "current", "data"), "data")
addFile("WebUI-3", "/localfs/index.html.gz", "index-webui-3.html.gz", os.path.join("release", "current", "data"), "data")

addUpload("WebUI generation 2", "Add WebUI to local filesystem", ["WebUI-2"])
addUpload("WebUI generation 3", "Add WebUI to local filesystem", ["WebUI-3"])

makeManifest()

Expand Down