diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..74faa00 --- /dev/null +++ b/.gitignore @@ -0,0 +1,68 @@ +###C++### + +# Compiled Object files +*.slo +*.lo +*.o + +# Compiled Dynamic libraries +*.so +*.dylib + +# Compiled Static libraries +*.lai +*.la +*.a + + +###OSX### + +.DS_Store +.AppleDouble +.LSOverride +Icon + + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + + +###Windows### + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + + +###Qt### + +# C++ objects and libs + +*.slo +*.lo +*.o +*.a +*.la +*.lai +*.so +*.dll +*.dylib + +# Qt-es + +*.pro.user +*.pro.user.* +moc_*.cpp +qrc_*.cpp +Makefile +*-build-* \ No newline at end of file diff --git a/README.md b/README.md index c4fbb64..65732cc 100644 --- a/README.md +++ b/README.md @@ -10,12 +10,21 @@ You can download prebuilt binaries from the [releases section](https://github.co ## Building +**Note:** Currently using esptool-ck 0.4.8 + ### OSX 1. You should have Qt5 and QtCreator developer tools installed in your system (https://www.qt.io/developers/). tested with Qt 5.6.0 and Qt Creator 4.0.0. 2. Clone this repo and open ``esptool-gui.pro`` with Qt Creator, build from there. 3. For deploying the application, you should include the Qt libraries in te app bundle, you can use the mac deployment tool, more info here: http://doc.qt.io/qt-5/osx-deployment.html -### Windows and Linux +### Windows -I haven't tested this in Windows and Linux, however building should be more or less straight forward. The only special build step that should change is the part where the [esptool-ck binary](https://github.com/igrr/esptool-ck/releases) is bundled, you should bundle the correct version for your operating system. You may also need to change the path in the code. \ No newline at end of file +1. You should have Qt5 and QtCreator developer tools installed in your system (https://www.qt.io/developers/). tested with Qt 5.7.0 and Qt Creator 4.0.1. +2. Clone this repo and open ``esptool-gui.pro`` with Qt Creator, build from there. +3. Copy ``tool-esptool`` folder from ``tools-windows`` to the folder where the compiled exe is. +4. For deploying the application, you should include the Qt libraries in te app folder: http://doc.qt.io/qt-5/windows-deployment.html + +### Linux and other systems + +I haven't tested this in Linux, however building should be more or less straight forward. The only special build step that should change is the part where the [esptool-ck binary](https://github.com/igrr/esptool-ck/releases) is bundled, you should bundle the correct version for your operating system. \ No newline at end of file diff --git a/esptool-gui.pro.user b/esptool-gui.pro.user index ed8a278..b2b40cd 100644 --- a/esptool-gui.pro.user +++ b/esptool-gui.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {19ca70ef-6911-496a-a7c7-e4e984b6f37f} + {d21aff1d-6fb6-4e42-a32d-f7d1ac8054b9} ProjectExplorer.Project.ActiveTarget @@ -61,14 +61,14 @@ ProjectExplorer.Project.Target.0 - Desktop Qt 5.7.0 MSVC2013 32bit - Desktop Qt 5.7.0 MSVC2013 32bit - qt.57.win32_msvc2013_kit + Desktop Qt 5.6.0 clang 64bit + Desktop Qt 5.6.0 clang 64bit + qt.56.clang_64_kit 1 0 0 - C:/Users/Usuario/Desktop/build-esptool-gui-Desktop_Qt_5_7_0_MSVC2013_32bit-Debug + /Users/rod/sandbox/build-esptool-gui-Desktop_Qt_5_6_0_clang_64bit-Debug true @@ -86,7 +86,10 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + false @@ -102,7 +105,10 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + true clean @@ -122,7 +128,7 @@ true - C:/Users/Usuario/Desktop/build-esptool-gui-Desktop_Qt_5_7_0_MSVC2013_32bit-Release + /Users/rod/sandbox/build-esptool-gui-Desktop_Qt_5_6_0_clang_64bit-Release true @@ -140,12 +146,24 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + false - 2 + + true + -r %{sourceDir}/tools-osx/tool-esptool %{buildDir}/esptool-gui.app/Contents/MacOS/ + cp + %{buildDir} + Custom Process Step + + ProjectExplorer.ProcessStep + + 3 Build ProjectExplorer.BuildSteps.Build @@ -156,7 +174,10 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + true clean @@ -176,7 +197,7 @@ true - C:/Users/Usuario/Desktop/build-esptool-gui-Desktop_Qt_5_7_0_MSVC2013_32bit-Profile + /Users/rod/sandbox/build-esptool-gui-Desktop_Qt_5_6_0_clang_64bit-Profile true @@ -194,7 +215,10 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + false @@ -210,7 +234,10 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + true clean @@ -287,14 +314,14 @@ 2 esptool-gui - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Usuario/Desktop/esptool-gui-public/esptool-gui.pro + esptool-gui2 + Qt4ProjectManager.Qt4RunConfiguration:/Users/rod/sandbox/esptool-gui-public/esptool-gui.pro true esptool-gui.pro false - C:/Users/Usuario/Desktop/build-esptool-gui-Desktop_Qt_5_7_0_MSVC2013_32bit-Release + /Users/rod/sandbox/build-esptool-gui-Desktop_Qt_5_6_0_clang_64bit-Release/esptool-gui.app/Contents/MacOS 3768 false true diff --git a/esptool-gui.pro.user.19ca70e b/esptool-gui.pro.user.19ca70e new file mode 100644 index 0000000..ed8a278 --- /dev/null +++ b/esptool-gui.pro.user.19ca70e @@ -0,0 +1,320 @@ + + + + + + EnvironmentId + {19ca70ef-6911-496a-a7c7-e4e984b6f37f} + + + 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.7.0 MSVC2013 32bit + Desktop Qt 5.7.0 MSVC2013 32bit + qt.57.win32_msvc2013_kit + 1 + 0 + 0 + + C:/Users/Usuario/Desktop/build-esptool-gui-Desktop_Qt_5_7_0_MSVC2013_32bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Users/Usuario/Desktop/build-esptool-gui-Desktop_Qt_5_7_0_MSVC2013_32bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + C:/Users/Usuario/Desktop/build-esptool-gui-Desktop_Qt_5_7_0_MSVC2013_32bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + 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 + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Usuario/Desktop/esptool-gui-public/esptool-gui.pro + true + + esptool-gui.pro + false + + C:/Users/Usuario/Desktop/build-esptool-gui-Desktop_Qt_5_7_0_MSVC2013_32bit-Release + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + +