diff --git a/esptool-gui.pro.user b/esptool-gui.pro.user index adb3353..ed8a278 100644 --- a/esptool-gui.pro.user +++ b/esptool-gui.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {d21aff1d-6fb6-4e42-a32d-f7d1ac8054b9} + {19ca70ef-6911-496a-a7c7-e4e984b6f37f} ProjectExplorer.Project.ActiveTarget @@ -61,14 +61,14 @@ ProjectExplorer.Project.Target.0 - Desktop Qt 5.6.0 clang 64bit - Desktop Qt 5.6.0 clang 64bit - qt.56.clang_64_kit + Desktop Qt 5.7.0 MSVC2013 32bit + Desktop Qt 5.7.0 MSVC2013 32bit + qt.57.win32_msvc2013_kit 1 0 0 - /Users/rod/sandbox/build-esptool-gui-Desktop_Qt_5_6_0_clang_64bit-Debug + C:/Users/Usuario/Desktop/build-esptool-gui-Desktop_Qt_5_7_0_MSVC2013_32bit-Debug true @@ -86,10 +86,7 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + false @@ -105,10 +102,7 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + true clean @@ -128,7 +122,7 @@ true - /Users/rod/sandbox/build-esptool-gui-Desktop_Qt_5_6_0_clang_64bit-Release + C:/Users/Usuario/Desktop/build-esptool-gui-Desktop_Qt_5_7_0_MSVC2013_32bit-Release true @@ -146,24 +140,12 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + false - - true - -r %{sourceDir}/tool-esptool %{buildDir}/esptool-gui.app/Contents/MacOS/ - cp - %{buildDir} - Custom Process Step - - ProjectExplorer.ProcessStep - - 3 + 2 Build ProjectExplorer.BuildSteps.Build @@ -174,10 +156,7 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + true clean @@ -197,7 +176,7 @@ true - /Users/rod/sandbox/build-esptool-gui-Desktop_Qt_5_6_0_clang_64bit-Profile + C:/Users/Usuario/Desktop/build-esptool-gui-Desktop_Qt_5_7_0_MSVC2013_32bit-Profile true @@ -215,10 +194,7 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + false @@ -234,10 +210,7 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + true clean @@ -314,14 +287,14 @@ 2 esptool-gui - esptool-gui2 - Qt4ProjectManager.Qt4RunConfiguration:/Users/rod/sandbox/esptool-gui-public/esptool-gui.pro + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Usuario/Desktop/esptool-gui-public/esptool-gui.pro true esptool-gui.pro false - /Users/rod/sandbox/build-esptool-gui-Desktop_Qt_5_6_0_clang_64bit-Release/esptool-gui.app/Contents/MacOS + C:/Users/Usuario/Desktop/build-esptool-gui-Desktop_Qt_5_7_0_MSVC2013_32bit-Release 3768 false true diff --git a/esptool-gui.pro.user.d21aff1 b/esptool-gui.pro.user.d21aff1 new file mode 100644 index 0000000..b309062 --- /dev/null +++ b/esptool-gui.pro.user.d21aff1 @@ -0,0 +1,347 @@ + + + + + + EnvironmentId + {d21aff1d-6fb6-4e42-a32d-f7d1ac8054b9} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.6.0 clang 64bit + Desktop Qt 5.6.0 clang 64bit + qt.56.clang_64_kit + 1 + 0 + 0 + + /Users/rod/sandbox/build-esptool-gui-Desktop_Qt_5_6_0_clang_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /Users/rod/sandbox/build-esptool-gui-Desktop_Qt_5_6_0_clang_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + -r %{sourceDir}/tool-esptool %{buildDir}/esptool-gui.app/Contents/MacOS/ + cp + %{buildDir} + Custom Process Step + + ProjectExplorer.ProcessStep + + 3 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /Users/rod/sandbox/build-esptool-gui-Desktop_Qt_5_6_0_clang_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + esptool-gui + esptool-gui2 + Qt4ProjectManager.Qt4RunConfiguration:/Users/rod/sandbox/esptool-gui-public/esptool-gui.pro + true + + esptool-gui.pro + false + + /Users/rod/sandbox/build-esptool-gui-Desktop_Qt_5_6_0_clang_64bit-Release/esptool-gui.app/Contents/MacOS + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/tools-linux/tool-esptool/esptool b/tools-linux/tool-esptool/esptool new file mode 100644 index 0000000..33536cf Binary files /dev/null and b/tools-linux/tool-esptool/esptool differ diff --git a/tool-esptool/esptool b/tools-osx/tool-esptool/esptool old mode 100755 new mode 100644 similarity index 100% rename from tool-esptool/esptool rename to tools-osx/tool-esptool/esptool diff --git a/tool-esptool/package.json b/tools-osx/tool-esptool/package.json old mode 100755 new mode 100644 similarity index 100% rename from tool-esptool/package.json rename to tools-osx/tool-esptool/package.json diff --git a/tools-windows/tool-esptool/esptool.exe b/tools-windows/tool-esptool/esptool.exe new file mode 100644 index 0000000..0a1bfc8 Binary files /dev/null and b/tools-windows/tool-esptool/esptool.exe differ