From 3714d21ca4ab2c933c63a4f9b3b053f90330f34c Mon Sep 17 00:00:00 2001 From: Claudio Lanconelli Date: Sat, 29 Apr 2017 01:48:38 +0200 Subject: [PATCH] removed duplicated cmdwrite() --- CMakeLists.txt.user | 390 -------------------------------------------- SrcPony/e2cmdw.cpp | 24 ++- SrcPony/e2cmdw.h | 2 +- 3 files changed, 11 insertions(+), 405 deletions(-) delete mode 100644 CMakeLists.txt.user diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user deleted file mode 100644 index 99c9576..0000000 --- a/CMakeLists.txt.user +++ /dev/null @@ -1,390 +0,0 @@ - - - - - - EnvironmentId - {d7ee7e17-f527-4cb2-af5d-2fd1b08e8544} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - qt2 - - - - 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 - Desktop - {2c327ca8-10af-4dd7-8de3-0cbee2744aa3} - 0 - 0 - 0 - - - CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} - CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} - QT_QMAKE_EXECUTABLE:FILEPATH=/usr/bin/qmake - USE_DEBUGGER:BOOL=OFF - - /home/lancos/Projects/ponyprog/build - - - - - all - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Default - Default - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=Debug - CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} - CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} - PONYPROG_ENABLE_DISTRIBUTION:BOOL=OFF - QT_QMAKE_EXECUTABLE:FILEPATH=/usr/bin/qmake-qt4 - USE_DEBUGGER:BOOL=ON - - /home/lancos/Projects/ponyprog/build-ponyprog-Desktop-Debug - - - - - all - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=Release - CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} - CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} - QT_QMAKE_EXECUTABLE:FILEPATH=/usr/bin/qmake-qt4 - - /home/lancos/Projects/ponyprog/build-ponyprog-Desktop-Release - - - - - all - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=RelWithDebInfo - - /home/lancos/Projects/build-ponyprog-Desktop-Release with Debug Information - - - - - - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release with Debug Information - Release with Debug Information - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=MinSizeRel - - /home/lancos/Projects/build-ponyprog-Desktop-Minimum Size Release - - - - - all - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - Make - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Minimum Size Release - Minimum Size Release - CMakeProjectManager.CMakeBuildConfiguration - - 5 - - - 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 - - ponyprog - - - /bin - 2 - - ponyprog - - CMakeProjectManager.CMakeRunConfiguration.ponyprog - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - diff --git a/SrcPony/e2cmdw.cpp b/SrcPony/e2cmdw.cpp index 079289c..d8b4954 100644 --- a/SrcPony/e2cmdw.cpp +++ b/SrcPony/e2cmdw.cpp @@ -1766,16 +1766,12 @@ void e2CmdWindow::onWrite() if (a == actionWriteAll) { CmdWrite(ALL_TYPE, verify ); - return; } - - if (a == actionWriteFlash) + else if (a == actionWriteFlash) { CmdWrite(PROG_TYPE, verify ); - return; } - - if (a == actionWriteEep) + else if (a == actionWriteEep) { CmdWrite(DATA_TYPE, verify ); } @@ -2485,14 +2481,14 @@ int e2CmdWindow::CmdCalibration() } //====================>>> e2CmdWindow::CmdWrite <<<==================== -int e2CmdWindow::CmdWrite(int type) -{ - int res; - SetAppBusy(); - res = CmdWrite(type, E2Profile::GetVerifyAfterWrite()); - SetAppReady(); - return res; -} +//int e2CmdWindow::CmdWrite(int type) +//{ +// int res; +// SetAppBusy(); +// res = CmdWrite(type, E2Profile::GetVerifyAfterWrite()); +// SetAppReady(); +// return res; +//} //====================>>> e2CmdWindow::CmdRead <<<==================== diff --git a/SrcPony/e2cmdw.h b/SrcPony/e2cmdw.h index 08ae74e..0de00f6 100644 --- a/SrcPony/e2cmdw.h +++ b/SrcPony/e2cmdw.h @@ -258,7 +258,7 @@ private: int CmdGetInfo(); int CmdReset(); int CmdReadLock(); - int CmdWrite(int type); +// int CmdWrite(int type); // int CmdRunScript(); int CmdLoadScript(); int CmdWriteLock();