diff --git a/src/components/App/version.js b/src/components/App/version.js index 1f8a67c0..890fc06f 100644 --- a/src/components/App/version.js +++ b/src/components/App/version.js @@ -17,7 +17,7 @@ */ import { h } from "preact" import { webUIbuild } from "../../targets" -export const webUIversion = "3.0.0-a77" +export const webUIversion = "3.0.0-a78" export const Esp3dVersion = () => ( {webUIversion}.{webUIbuild} diff --git a/src/components/Helpers/http.js b/src/components/Helpers/http.js index a8de1a3e..47f57c31 100644 --- a/src/components/Helpers/http.js +++ b/src/components/Helpers/http.js @@ -50,21 +50,30 @@ const espHttpURL = (base = "", args = {}) => { function isLimitedEnvironment(mode) { let sitesList = [ - "clients3.google.com", //Android Captive Portal Detection + //google / android Captive Portal Detection + "google.com", "connectivitycheck.", - //Apple iPhone, iPad with iOS 6 Captive Portal Detection + "googleapis.com", + "gstatic.com", + // Apple iPhone, iPad with iOS 6 Captive Portal Detection "apple.com", ".akamaitechnologies.com", - //Apple iPhone, iPad with iOS 7, 8, 9 and recent versions of OS X + // Apple iPhone, iPad with iOS 7, 8, 9 and recent versions of OS X "www.appleiphonecell.com", "www.itools.info", "www.ibook.info", "www.airport.us", "www.thinkdifferent.us", ".akamaiedge.net", - //Windows + // Windows ".msftncsi.com", "microsoft.com", + ".msftconnecttest.com", + // Firefox + "detectportal.firefox.com", + // Linux + "network-test.debian.org", + "nmcheck.gnome.org", ] if (mode != "AP") return false for (let i = 0; i < sitesList.length; i++) { diff --git a/src/targets/Printer3D/Marlin/DIRECTSD-source.js b/src/targets/Printer3D/Marlin/DIRECTSD-source.js index e0fa2c60..a162e02c 100644 --- a/src/targets/Printer3D/Marlin/DIRECTSD-source.js +++ b/src/targets/Printer3D/Marlin/DIRECTSD-source.js @@ -74,7 +74,8 @@ const commands = { }, formatResult: (resultTxT) => { const res = JSON.parse(resultTxT) - if (useUiContextFn.getValue("sort_sd_files")){ + console.log("direct SD sort", useUiContextFn.getValue("sort_directsd_files")) + if (useUiContextFn.getValue("sort_directsd_files")){ res.files = sortedFilesList(res.files) } res.status = formatStatus(res.status) diff --git a/src/targets/Printer3D/Marlin/SD-source.js b/src/targets/Printer3D/Marlin/SD-source.js index cc64cc76..e77b2377 100644 --- a/src/targets/Printer3D/Marlin/SD-source.js +++ b/src/targets/Printer3D/Marlin/SD-source.js @@ -114,6 +114,7 @@ const commands = { formatResult: (result) => { const files = formatFileSerialLine(result.content) const isSorted = useUiContextFn.getValue("sort_sd_files") + console.log("sd is sorted", isSorted) return { files: isSorted? sortedFilesList(files, false) : files, status: formatStatus(result.status), diff --git a/src/targets/Printer3D/Marlin/SDEXT-source.js b/src/targets/Printer3D/Marlin/SDEXT-source.js index 18a7db3b..90924e1a 100644 --- a/src/targets/Printer3D/Marlin/SDEXT-source.js +++ b/src/targets/Printer3D/Marlin/SDEXT-source.js @@ -120,10 +120,11 @@ const commands = { } }, filterResult: (data, path) => { - //console.log(data) - const isSorted = useUiContextFn.getValue("sort_sd_files") + console.log(data) + const isSorted = useUiContextFn.getValue("sort_sdext_files") + console.log("is sorted ext", isSorted) const res = {} - res.files = isSorted? sortedFilesList(filterResultFiles(data.files, path), false) : filterResultFiles(data.files, path) + res.files = isSorted? sortedFilesList(filterResultFiles(data.files, path), true) : filterResultFiles(data.files, path) res.status = formatStatus(data.status) return res }, diff --git a/src/targets/Printer3D/Marlin/preferences.json b/src/targets/Printer3D/Marlin/preferences.json index 5057a4d5..d6bbb9af 100644 --- a/src/targets/Printer3D/Marlin/preferences.json +++ b/src/targets/Printer3D/Marlin/preferences.json @@ -152,7 +152,20 @@ "type": "boolean", "label": "S224", "value": true, - "depend": [{ "id": "sd", "value": true }] + "depend": [{ "id": "sd", "value": true },{ + "connection_id": "SDConnection", + "value": "=='none'" + } ] + }, + { + "id": "sort_directsd_files", + "type": "boolean", + "label": "S224", + "value": true, + "depend": [{ "id": "sd", "value": true },{ + "connection_id": "SDConnection", + "value": "!='none'" + } ] } ] },