diff --git a/CMakeLists.txt b/CMakeLists.txt index 20c49d6..4b3b1b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,7 +118,7 @@ # SET(PONYPROG_PACKAGE ponyprog) SET(PONYPROG_HOST ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR}) -SET(PONYPROG_COPYRIGHT "Copyright (c) 1997-2019 ${APP_AUTHOR}, All Rights Reserved.") +SET(PONYPROG_COPYRIGHT "Copyright (c) 1997-2020 ${APP_AUTHOR}, All Rights Reserved.") SET(PONYPROG_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) # Setup high-level build options diff --git a/HISTORY b/HISTORY index 87391de..8736288 100644 --- a/HISTORY +++ b/HISTORY @@ -1,5 +1,6 @@ Version history +3.1.1 Bug fix: correct device selection by menu entries and load file. Translation fixes 3.1.0 Add USB PonyProgFT interface, redesigned interface dialog, several fixes 3.0.2 Default build to Qt5, smal fixes to build on non-X86 ARCHs 3.0.1 Small fixes, Build scripts, compiler warnings, mispelled words diff --git a/README.md b/README.md index 4e5ca1f..6270c82 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 3.1.0 - PonyProg - Serial Device Programmer +# 3.1.1 - PonyProg - Serial Device Programmer PonyProg is a serial device programmer software with a user friendly GUI framework available for Windows and Linux. It's purpose is reading and writing every serial device. With PonyProg and SI-Prog you can program Wafercard for SAT, eeprom within GSM, TV or CAR-RADIO. Furthermore it can be used as a low cost starter kit for PIC and AVR. Ponyprog supports AVR, SPI eeprom, AVR micro, 12C bus 8bit eeprom, PIC 16 micro, PIC 12 micro, AT89S micro and SDE2506 eeprom family chips. You can open any HEX, e2p, mot, csm, rom, eep, bin files and burn them to uC or PIC. You can even backup the old program on the chip using Ponyprog. Ponyprog enables the user to write, verify and erase data on the microchip. diff --git a/SrcPony/Translator.cpp b/SrcPony/Translator.cpp index d636162..e6580c5 100644 --- a/SrcPony/Translator.cpp +++ b/SrcPony/Translator.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // @@ -543,7 +543,8 @@ "UnChecked items means unprogrammed", "Save the result in the buffer at given location", - "Preferences" + "Preferences", //STR_PREFERENCES + "Be sure the VTarget is on (check J3) and NO target attached for the test" //STR_EXTRAPROBEMSG_FTPROG }; @@ -760,5 +761,3 @@ return m; } - - diff --git a/SrcPony/Translator.h b/SrcPony/Translator.h index 0957d22..c46999b 100644 --- a/SrcPony/Translator.h +++ b/SrcPony/Translator.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // @@ -481,7 +481,8 @@ STR_FUSEDLGNOTECLR, STR_CALIBRENABLED, - STR_PREFERENCES + STR_PREFERENCES, //287 + STR_EXTRAPROBEMSG_FTPROG }; diff --git a/SrcPony/aboutmdlg.cpp b/SrcPony/aboutmdlg.cpp index 9c68ef1..0853a27 100644 --- a/SrcPony/aboutmdlg.cpp +++ b/SrcPony/aboutmdlg.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // @@ -35,7 +35,7 @@ #include "e2profil.h" static const QString AUTHORWEB = "http://www.LancOS.com"; -static const QString COPYRIGHTYEAR = "1997-2019"; +static const QString COPYRIGHTYEAR = "1997-2020"; static const QString PORTERGQT = "Eduard Kalinowski"; static const QString PORTERMAIL = "eduard_kalinowski@yahoo.de"; diff --git a/SrcPony/aboutmdlg.h b/SrcPony/aboutmdlg.h index 2fdc60f..8f92401 100644 --- a/SrcPony/aboutmdlg.h +++ b/SrcPony/aboutmdlg.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at17xxx.cpp b/SrcPony/at17xxx.cpp index d01629e..7b9eb68 100644 --- a/SrcPony/at17xxx.cpp +++ b/SrcPony/at17xxx.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at17xxx.h b/SrcPony/at17xxx.h index 63d7519..fd6db68 100644 --- a/SrcPony/at17xxx.h +++ b/SrcPony/at17xxx.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at250bus.cpp b/SrcPony/at250bus.cpp index 2bead50..5db77f2 100644 --- a/SrcPony/at250bus.cpp +++ b/SrcPony/at250bus.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at250bus.h b/SrcPony/at250bus.h index fcaee9e..5101186 100644 --- a/SrcPony/at250bus.h +++ b/SrcPony/at250bus.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at250bus2.cpp b/SrcPony/at250bus2.cpp index 9586a6e..5d7eb2a 100644 --- a/SrcPony/at250bus2.cpp +++ b/SrcPony/at250bus2.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at250bus2.h b/SrcPony/at250bus2.h index b5fd254..686a758 100644 --- a/SrcPony/at250bus2.h +++ b/SrcPony/at250bus2.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at250xx.cpp b/SrcPony/at250xx.cpp index f298ead..9a43c42 100644 --- a/SrcPony/at250xx.cpp +++ b/SrcPony/at250xx.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at250xx.h b/SrcPony/at250xx.h index 951a4f2..16d8969 100644 --- a/SrcPony/at250xx.h +++ b/SrcPony/at250xx.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at25xxx.cpp b/SrcPony/at25xxx.cpp index 8c1133c..4104878 100644 --- a/SrcPony/at25xxx.cpp +++ b/SrcPony/at25xxx.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at25xxx.h b/SrcPony/at25xxx.h index eba97fc..34aeae3 100644 --- a/SrcPony/at25xxx.h +++ b/SrcPony/at25xxx.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at89sbus.cpp b/SrcPony/at89sbus.cpp index 323a760..8763f50 100644 --- a/SrcPony/at89sbus.cpp +++ b/SrcPony/at89sbus.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at89sbus.h b/SrcPony/at89sbus.h index 9b43fdc..0ae7dd4 100644 --- a/SrcPony/at89sbus.h +++ b/SrcPony/at89sbus.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at89sxx.cpp b/SrcPony/at89sxx.cpp index 2b3ff3f..bc1aadc 100644 --- a/SrcPony/at89sxx.cpp +++ b/SrcPony/at89sxx.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at89sxx.h b/SrcPony/at89sxx.h index 9f2ffbd..30c550b 100644 --- a/SrcPony/at89sxx.h +++ b/SrcPony/at89sxx.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at90sbus.cpp b/SrcPony/at90sbus.cpp index 281ce09..eaf316e 100644 --- a/SrcPony/at90sbus.cpp +++ b/SrcPony/at90sbus.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at90sbus.h b/SrcPony/at90sbus.h index 4afbf98..8ebeac3 100644 --- a/SrcPony/at90sbus.h +++ b/SrcPony/at90sbus.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at90sxx.cpp b/SrcPony/at90sxx.cpp index 7946156..b1b7ad2 100644 --- a/SrcPony/at90sxx.cpp +++ b/SrcPony/at90sxx.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at90sxx.h b/SrcPony/at90sxx.h index b6ad4aa..4335855 100644 --- a/SrcPony/at90sxx.h +++ b/SrcPony/at90sxx.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at93cbus.cpp b/SrcPony/at93cbus.cpp index f5d70f9..b971877 100644 --- a/SrcPony/at93cbus.cpp +++ b/SrcPony/at93cbus.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at93cbus.h b/SrcPony/at93cbus.h index 09e75f9..e0ae3c5 100644 --- a/SrcPony/at93cbus.h +++ b/SrcPony/at93cbus.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at93cxx.cpp b/SrcPony/at93cxx.cpp index a2a006d..6652a01 100644 --- a/SrcPony/at93cxx.cpp +++ b/SrcPony/at93cxx.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at93cxx.h b/SrcPony/at93cxx.h index 88c65f8..992168b 100644 --- a/SrcPony/at93cxx.h +++ b/SrcPony/at93cxx.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at93cxx8.cpp b/SrcPony/at93cxx8.cpp index 2588f21..a88538a 100644 --- a/SrcPony/at93cxx8.cpp +++ b/SrcPony/at93cxx8.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/at93cxx8.h b/SrcPony/at93cxx8.h index aa7d78b..2adb3de 100644 --- a/SrcPony/at93cxx8.h +++ b/SrcPony/at93cxx8.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/binfbuf.cpp b/SrcPony/binfbuf.cpp index b03effe..207c50c 100644 --- a/SrcPony/binfbuf.cpp +++ b/SrcPony/binfbuf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/binfbuf.h b/SrcPony/binfbuf.h index 28e3d2f..6caa8de 100644 --- a/SrcPony/binfbuf.h +++ b/SrcPony/binfbuf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/bitfield.cpp b/SrcPony/bitfield.cpp index 00cd59d..c76d569 100644 --- a/SrcPony/bitfield.cpp +++ b/SrcPony/bitfield.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/bitfield.h b/SrcPony/bitfield.h index 68634f0..64e8685 100644 --- a/SrcPony/bitfield.h +++ b/SrcPony/bitfield.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/blockmdlg.cpp b/SrcPony/blockmdlg.cpp index d2979b8..0ab2269 100644 --- a/SrcPony/blockmdlg.cpp +++ b/SrcPony/blockmdlg.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/blockmdlg.h b/SrcPony/blockmdlg.h index 50f67f0..0237da2 100644 --- a/SrcPony/blockmdlg.h +++ b/SrcPony/blockmdlg.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/businter.h b/SrcPony/businter.h index b360a4f..b9fb5bc 100644 --- a/SrcPony/businter.h +++ b/SrcPony/businter.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/busio.cpp b/SrcPony/busio.cpp index c02bed4..a1a2d1a 100644 --- a/SrcPony/busio.cpp +++ b/SrcPony/busio.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/busio.h b/SrcPony/busio.h index 167225d..e40e752 100644 --- a/SrcPony/busio.h +++ b/SrcPony/busio.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/ch341a.cpp b/SrcPony/ch341a.cpp index d55e19d..eda83a0 100644 --- a/SrcPony/ch341a.cpp +++ b/SrcPony/ch341a.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // https://github.com/lancos/ponyprog // // // diff --git a/SrcPony/ch341a.h b/SrcPony/ch341a.h index d2d9380..79e0cbb 100644 --- a/SrcPony/ch341a.h +++ b/SrcPony/ch341a.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // https://github.com/lancos/ponyprog // // // diff --git a/SrcPony/csmfbuf.cpp b/SrcPony/csmfbuf.cpp index 89e580e..0d89859 100644 --- a/SrcPony/csmfbuf.cpp +++ b/SrcPony/csmfbuf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/csmfbuf.h b/SrcPony/csmfbuf.h index 2d227bc..b498fb3 100644 --- a/SrcPony/csmfbuf.h +++ b/SrcPony/csmfbuf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/device.cpp b/SrcPony/device.cpp index 241fc62..f596e9d 100644 --- a/SrcPony/device.cpp +++ b/SrcPony/device.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/device.h b/SrcPony/device.h index 2798742..7b59011 100644 --- a/SrcPony/device.h +++ b/SrcPony/device.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/dt006interf.cpp b/SrcPony/dt006interf.cpp index 21c9422..51273e8 100644 --- a/SrcPony/dt006interf.cpp +++ b/SrcPony/dt006interf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/dt006interf.h b/SrcPony/dt006interf.h index 7d02ac3..a6a845e 100644 --- a/SrcPony/dt006interf.h +++ b/SrcPony/dt006interf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e2401.cpp b/SrcPony/e2401.cpp index d25d1fa..f7d6278 100644 --- a/SrcPony/e2401.cpp +++ b/SrcPony/e2401.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e2401.h b/SrcPony/e2401.h index b932513..44dcd50 100644 --- a/SrcPony/e2401.h +++ b/SrcPony/e2401.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e24xx-1.cpp b/SrcPony/e24xx-1.cpp index 5eed506..8958bb8 100644 --- a/SrcPony/e24xx-1.cpp +++ b/SrcPony/e24xx-1.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e24xx-1.h b/SrcPony/e24xx-1.h index 8f65dc9..09ead44 100644 --- a/SrcPony/e24xx-1.h +++ b/SrcPony/e24xx-1.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e24xx-2.cpp b/SrcPony/e24xx-2.cpp index a2a2d2a..33c64c5 100644 --- a/SrcPony/e24xx-2.cpp +++ b/SrcPony/e24xx-2.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e24xx-2.h b/SrcPony/e24xx-2.h index d1d98a9..b2a2a6e 100644 --- a/SrcPony/e24xx-2.h +++ b/SrcPony/e24xx-2.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e24xx-5.cpp b/SrcPony/e24xx-5.cpp index 8114b3b..5ab0c86 100644 --- a/SrcPony/e24xx-5.cpp +++ b/SrcPony/e24xx-5.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e24xx-5.h b/SrcPony/e24xx-5.h index 278d627..13abb15 100644 --- a/SrcPony/e24xx-5.h +++ b/SrcPony/e24xx-5.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e24xx.cpp b/SrcPony/e24xx.cpp index 47ff94d..9a5568a 100644 --- a/SrcPony/e24xx.cpp +++ b/SrcPony/e24xx.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e24xx.h b/SrcPony/e24xx.h index 9eaab8e..d572f09 100644 --- a/SrcPony/e24xx.h +++ b/SrcPony/e24xx.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e2app.cpp b/SrcPony/e2app.cpp index 1dec5d0..4578e16 100644 --- a/SrcPony/e2app.cpp +++ b/SrcPony/e2app.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e2app.h b/SrcPony/e2app.h index d444558..8e69bdb 100644 --- a/SrcPony/e2app.h +++ b/SrcPony/e2app.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e2awinfo.cpp b/SrcPony/e2awinfo.cpp index cc4f1bc..fade2b4 100644 --- a/SrcPony/e2awinfo.cpp +++ b/SrcPony/e2awinfo.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e2awinfo.h b/SrcPony/e2awinfo.h index d043954..3d22b63 100644 --- a/SrcPony/e2awinfo.h +++ b/SrcPony/e2awinfo.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e2cmdw.cpp b/SrcPony/e2cmdw.cpp index 1fe629f..e76193f 100644 --- a/SrcPony/e2cmdw.cpp +++ b/SrcPony/e2cmdw.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // @@ -1309,7 +1309,7 @@ QString t = ((QAction *)a->parent())->text(); // current type QString st = a->text(); // current subtype - selectTypeSubtype(t, st); + long new_id = selectTypeSubtype(t, st); if (currentAct != NULL) { @@ -1318,10 +1318,17 @@ currentAct = a; currentAct->setChecked(true); -} - - -void e2CmdWindow::selectTypeSubtype(const QString &tp, const QString &subtp) + + qDebug() << Q_FUNC_INFO << "Id: " << (hex) << awip->GetEEPId() << " NewId: " << new_id; + + if (awip->GetEEPId() != new_id) + { + CmdSelectDevice(new_id); + } +} + + +long e2CmdWindow::selectTypeSubtype(const QString &tp, const QString &subtp) { QString t_tmp = tp; t_tmp.remove(QChar('&')); @@ -1400,7 +1407,7 @@ else { qDebug() << "selectTypeSubtype, something is wrong with search" << currentMenu->title; - return; + return EID_INVALID; } connect(cbxEEPSubType, SIGNAL(currentIndexChanged(int)), this, SLOT(onDevSubType(int))); @@ -1417,15 +1424,15 @@ cbxEEPSubType->setCurrentIndex(nst); connect(cbxEEPSubType, SIGNAL(currentIndexChanged(int)), this, SLOT(onDevSubType(int))); + if (currentMenu == NULL) + { + qDebug() << "selectTypeSubtype, something is wrong with data pointer"; + return EID_INVALID; + } + // search id long new_id = EID_INVALID; - if (currentMenu == NULL) - { - qDebug() << "selectTypeSubtype, something is wrong with data pointer"; - return; - } - for (int i = 0; i < currentMenu->info.count(); i++) { if (currentMenu->info.at(i).name == st_tmp) @@ -1436,7 +1443,7 @@ Q_ASSERT(new_id != EID_INVALID); - CmdSelectDevice(new_id); + return new_id; } @@ -5102,34 +5109,18 @@ // new_type is the chip id int e2CmdWindow::CmdSelectDevice(long new_type, bool init) { - if (init) - { - awip->SetEEProm(new_type); - UpdateMenuType(new_type); - - first_line = 0; - //curIndex = 0; - Draw(); - awip->RecalcCRC(); - UpdateStatusBar(); - } - else - { - long old_type = awip->GetEEPId(); - - if (new_type != old_type) - { - awip->SetEEProm(new_type); - UpdateMenuType(new_type/*, old_type*/); - - first_line = 0; - //curIndex = 0; - Draw(); - awip->RecalcCRC(); - UpdateStatusBar(); - - E2Profile::SetLastDevType(new_type); - } + awip->SetEEProm(new_type); + UpdateMenuType(new_type); + + first_line = 0; + //curIndex = 0; + Draw(); + awip->RecalcCRC(); + UpdateStatusBar(); + + if (!init) + { + E2Profile::SetLastDevType(new_type); } return OK; @@ -5840,7 +5831,7 @@ { QString oldfname = awip->GetFileName(); awip->SetFileName(fileName); - //long old_type = awip->GetEEPId(); //EEP type can be changed by E2P file load + long old_type = awip->GetEEPId(); //EEP type can be changed by E2P file load rval = awip->Load(); @@ -5863,7 +5854,10 @@ UpdateStrFromBuf(); //UpdateChipType(); - UpdateMenuType(awip->GetEEPId()/*, old_type*/); + if (awip->GetEEPId() != old_type) + { + UpdateMenuType(awip->GetEEPId()); + } first_line = 0; //curIndex = 0; diff --git a/SrcPony/e2cmdw.h b/SrcPony/e2cmdw.h index e5d46be..4d7c317 100644 --- a/SrcPony/e2cmdw.h +++ b/SrcPony/e2cmdw.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // @@ -360,7 +360,7 @@ // int CoordToIndex(int row, int col); // void IndexToCoord(int index, int &row, int &col); // void setMenuIndexes(); - void selectTypeSubtype(const QString &t, const QString &st); + long selectTypeSubtype(const QString &t, const QString &st); int ScriptError(int line_number, int arg_index, const QString &s, const QString msg = ""); diff --git a/SrcPony/e2dlg.cpp b/SrcPony/e2dlg.cpp index a66a846..ce22f37 100644 --- a/SrcPony/e2dlg.cpp +++ b/SrcPony/e2dlg.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // @@ -554,10 +554,12 @@ if (test) { QString extraMsg = ""; - if (test == E2ERR_IOTEST) + if (test == E2ERR_IOTEST || E2ERR_NOTINSTALLED) { if (cmdWin->GetInterfaceType() == PONYPROG_FT) - extraMsg = "\nBe sure the VTarget is on (check J3)"; + { + extraMsg = "\n" + translate(STR_EXTRAPROBEMSG_FTPROG); + } } QMessageBox msgBox(QMessageBox::Critical, "Failed", translate(STR_TEST) + " " + translate(STR_MSGFAILED) + extraMsg, QMessageBox::Ok); msgBox.setStyleSheet(cmdWin->getStyleSheet()); diff --git a/SrcPony/e2dlg.h b/SrcPony/e2dlg.h index 821a338..40a36ab 100644 --- a/SrcPony/e2dlg.h +++ b/SrcPony/e2dlg.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e2pfbuf.cpp b/SrcPony/e2pfbuf.cpp index 1567fdc..5616599 100644 --- a/SrcPony/e2pfbuf.cpp +++ b/SrcPony/e2pfbuf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e2pfbuf.h b/SrcPony/e2pfbuf.h index 28bc9b8..5defecd 100644 --- a/SrcPony/e2pfbuf.h +++ b/SrcPony/e2pfbuf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e2phead.h b/SrcPony/e2phead.h index 1bc2f5e..40a257a 100644 --- a/SrcPony/e2phead.h +++ b/SrcPony/e2phead.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e2profil.cpp b/SrcPony/e2profil.cpp index 17a31c2..6b98923 100644 --- a/SrcPony/e2profil.cpp +++ b/SrcPony/e2profil.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/e2profil.h b/SrcPony/e2profil.h index fc3d60a..4c8e158 100644 --- a/SrcPony/e2profil.h +++ b/SrcPony/e2profil.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/easyi2c_interf.cpp b/SrcPony/easyi2c_interf.cpp index 80489d0..2c3a268 100644 --- a/SrcPony/easyi2c_interf.cpp +++ b/SrcPony/easyi2c_interf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/easyi2c_interf.h b/SrcPony/easyi2c_interf.h index 8a497e8..01ee540 100644 --- a/SrcPony/easyi2c_interf.h +++ b/SrcPony/easyi2c_interf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/eeptypes.cpp b/SrcPony/eeptypes.cpp index 2a05311..45d5560 100644 --- a/SrcPony/eeptypes.cpp +++ b/SrcPony/eeptypes.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/eeptypes.h b/SrcPony/eeptypes.h index 9985b81..2a408f5 100644 --- a/SrcPony/eeptypes.h +++ b/SrcPony/eeptypes.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/errcode.h b/SrcPony/errcode.h index 1a67978..a4bdd5e 100644 --- a/SrcPony/errcode.h +++ b/SrcPony/errcode.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/filebuf.cpp b/SrcPony/filebuf.cpp index b9403b3..9786e79 100644 --- a/SrcPony/filebuf.cpp +++ b/SrcPony/filebuf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/filebuf.h b/SrcPony/filebuf.h index d88b6d6..33eb7f0 100644 --- a/SrcPony/filebuf.h +++ b/SrcPony/filebuf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/filldlg.cpp b/SrcPony/filldlg.cpp index f1c79db..efa5d0b 100644 --- a/SrcPony/filldlg.cpp +++ b/SrcPony/filldlg.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/filldlg.h b/SrcPony/filldlg.h index 897b421..e6f70c9 100644 --- a/SrcPony/filldlg.h +++ b/SrcPony/filldlg.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/fusemdlg.cpp b/SrcPony/fusemdlg.cpp index 55e847c..afaec87 100644 --- a/SrcPony/fusemdlg.cpp +++ b/SrcPony/fusemdlg.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/fusemdlg.h b/SrcPony/fusemdlg.h index fca0f2f..cc31a4f 100644 --- a/SrcPony/fusemdlg.h +++ b/SrcPony/fusemdlg.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/globals.h b/SrcPony/globals.h index 435a20b..b5443d2 100644 --- a/SrcPony/globals.h +++ b/SrcPony/globals.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/i2cbus.cpp b/SrcPony/i2cbus.cpp index 6ce5c0a..2b697e9 100644 --- a/SrcPony/i2cbus.cpp +++ b/SrcPony/i2cbus.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/i2cbus.h b/SrcPony/i2cbus.h index 4484bef..65dc55f 100644 --- a/SrcPony/i2cbus.h +++ b/SrcPony/i2cbus.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/imbus.cpp b/SrcPony/imbus.cpp index 9a6e4dc..95fb2eb 100644 --- a/SrcPony/imbus.cpp +++ b/SrcPony/imbus.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/imbus.h b/SrcPony/imbus.h index 81f8370..9acca40 100644 --- a/SrcPony/imbus.h +++ b/SrcPony/imbus.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/infomdlg.cpp b/SrcPony/infomdlg.cpp index e390cfb..a0afb89 100644 --- a/SrcPony/infomdlg.cpp +++ b/SrcPony/infomdlg.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/interfconv.cpp b/SrcPony/interfconv.cpp index 7b77361..edc2c4f 100644 --- a/SrcPony/interfconv.cpp +++ b/SrcPony/interfconv.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/interfconv.h b/SrcPony/interfconv.h index df065f6..5283572 100644 --- a/SrcPony/interfconv.h +++ b/SrcPony/interfconv.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // @@ -50,7 +50,8 @@ }; enum -{ //Directly correspond to setup interface dialog tab index +{ + //Directly correspond to setup interface dialog tab index INTERF_USB = 0, INTERF_COM, INTERF_LPT, diff --git a/SrcPony/intfbuf.cpp b/SrcPony/intfbuf.cpp index a9d59ca..acd8a89 100644 --- a/SrcPony/intfbuf.cpp +++ b/SrcPony/intfbuf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/intfbuf.h b/SrcPony/intfbuf.h index 163ac24..3403c91 100644 --- a/SrcPony/intfbuf.h +++ b/SrcPony/intfbuf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/ispinterf.cpp b/SrcPony/ispinterf.cpp index da6608f..0e35644 100644 --- a/SrcPony/ispinterf.cpp +++ b/SrcPony/ispinterf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/ispinterf.h b/SrcPony/ispinterf.h index 8c390b6..6fcdc5e 100644 --- a/SrcPony/ispinterf.h +++ b/SrcPony/ispinterf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/jdminter.h b/SrcPony/jdminter.h index 2b5a2bb..45974ba 100644 --- a/SrcPony/jdminter.h +++ b/SrcPony/jdminter.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/linuxsysfsint.cpp b/SrcPony/linuxsysfsint.cpp index c2f67a5..cda6a89 100644 --- a/SrcPony/linuxsysfsint.cpp +++ b/SrcPony/linuxsysfsint.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/linuxsysfsint.h b/SrcPony/linuxsysfsint.h index e4b7025..d676ad1 100644 --- a/SrcPony/linuxsysfsint.h +++ b/SrcPony/linuxsysfsint.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/lpt_ext_interf.cpp b/SrcPony/lpt_ext_interf.cpp index cbb428e..f16e026 100644 --- a/SrcPony/lpt_ext_interf.cpp +++ b/SrcPony/lpt_ext_interf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/lpt_ext_interf.h b/SrcPony/lpt_ext_interf.h index c9df178..5664abd 100644 --- a/SrcPony/lpt_ext_interf.h +++ b/SrcPony/lpt_ext_interf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/lpt_io_interf.cpp b/SrcPony/lpt_io_interf.cpp index 6287ea4..000378c 100644 --- a/SrcPony/lpt_io_interf.cpp +++ b/SrcPony/lpt_io_interf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/lpt_io_interf.h b/SrcPony/lpt_io_interf.h index 5072b27..47c318b 100644 --- a/SrcPony/lpt_io_interf.h +++ b/SrcPony/lpt_io_interf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/lptinterf.cpp b/SrcPony/lptinterf.cpp index d3fcc80..715e525 100644 --- a/SrcPony/lptinterf.cpp +++ b/SrcPony/lptinterf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/lptinterf.h b/SrcPony/lptinterf.h index 2b0f235..9acbcb2 100644 --- a/SrcPony/lptinterf.h +++ b/SrcPony/lptinterf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/main.cpp b/SrcPony/main.cpp index 6923f0b..d59e3eb 100644 --- a/SrcPony/main.cpp +++ b/SrcPony/main.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/microbus.cpp b/SrcPony/microbus.cpp index 3c78107..022a30b 100644 --- a/SrcPony/microbus.cpp +++ b/SrcPony/microbus.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/microbus.h b/SrcPony/microbus.h index bf4f152..affe888 100644 --- a/SrcPony/microbus.h +++ b/SrcPony/microbus.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/motsfbuf.cpp b/SrcPony/motsfbuf.cpp index 99c7481..4e0cb8b 100644 --- a/SrcPony/motsfbuf.cpp +++ b/SrcPony/motsfbuf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/motsfbuf.h b/SrcPony/motsfbuf.h index 11ee6e8..43184be 100644 --- a/SrcPony/motsfbuf.h +++ b/SrcPony/motsfbuf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/mpsse_interf.cpp b/SrcPony/mpsse_interf.cpp index 4409371..747ffa2 100644 --- a/SrcPony/mpsse_interf.cpp +++ b/SrcPony/mpsse_interf.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // @@ -1116,9 +1116,13 @@ return E2ERR_NOTINSTALLED; } if ((val & pin_datain) != 0) + { val = 1; + } else + { val = 0; + } if (val != geti) { qWarning() << Q_FUNC_INFO << " Data Write " << seto << " read " << val << "(" << geti << ")"; @@ -1138,9 +1142,13 @@ return E2ERR_NOTINSTALLED; } if ((val & pmask_clkin) != 0) + { val = 1; + } else + { val = 0; + } if (val != geti) { qWarning() << Q_FUNC_INFO << " Clock Write " << seto << " read " << val << "(" << geti << ")"; @@ -1149,7 +1157,7 @@ } SendPins(OutDataMask(pin_enbus, 1)); - SendPins(OutDataMask(pin_ctrl|pin_dataout|pin_clock, 0)); + SendPins(OutDataMask(pin_ctrl | pin_dataout | pin_clock, 0)); SetPower(false); if (errcount > 0) @@ -1166,7 +1174,7 @@ if (ret_val == OK) { SendPins(OutDataMask(pin_enbus, 1)); //en_bus active low - SendPins(OutDataMask(pin_ctrl|pin_dataout|pin_clock, 0)); + SendPins(OutDataMask(pin_ctrl | pin_dataout | pin_clock, 0)); SetPower(true); w.WaitMsec(150); int val = GetPins(); @@ -1191,7 +1199,7 @@ ret_val = E2ERR_NOTINSTALLED; } } - SendPins(OutDataMask(pin_ctrl|pin_dataout|pin_clock, 0)); + SendPins(OutDataMask(pin_ctrl | pin_dataout | pin_clock, 0)); SetPower(false); } } diff --git a/SrcPony/mpsse_interf.h b/SrcPony/mpsse_interf.h index f2d92ff..03b976c 100644 --- a/SrcPony/mpsse_interf.h +++ b/SrcPony/mpsse_interf.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/nvm3060.cpp b/SrcPony/nvm3060.cpp index a687a6b..2d2b3f3 100644 --- a/SrcPony/nvm3060.cpp +++ b/SrcPony/nvm3060.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/nvm3060.h b/SrcPony/nvm3060.h index 500b209..1644da1 100644 --- a/SrcPony/nvm3060.h +++ b/SrcPony/nvm3060.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/pgminter.cpp b/SrcPony/pgminter.cpp index f624db8..b3ba8f5 100644 --- a/SrcPony/pgminter.cpp +++ b/SrcPony/pgminter.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/pgminter.h b/SrcPony/pgminter.h index 84d4d76..31ae5d3 100644 --- a/SrcPony/pgminter.h +++ b/SrcPony/pgminter.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/pic125xx.cpp b/SrcPony/pic125xx.cpp index 4e6d91b..49de6f9 100644 --- a/SrcPony/pic125xx.cpp +++ b/SrcPony/pic125xx.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/pic125xx.h b/SrcPony/pic125xx.h index 26163fc..279eb3d 100644 --- a/SrcPony/pic125xx.h +++ b/SrcPony/pic125xx.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/pic12bus.cpp b/SrcPony/pic12bus.cpp index 36f4ea4..0c3741c 100644 --- a/SrcPony/pic12bus.cpp +++ b/SrcPony/pic12bus.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/pic12bus.h b/SrcPony/pic12bus.h index 89ea6ae..13e7679 100644 --- a/SrcPony/pic12bus.h +++ b/SrcPony/pic12bus.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/pic168xx.cpp b/SrcPony/pic168xx.cpp index 4cc0da2..fbbecff 100644 --- a/SrcPony/pic168xx.cpp +++ b/SrcPony/pic168xx.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/pic168xx.h b/SrcPony/pic168xx.h index a8a0687..722b751 100644 --- a/SrcPony/pic168xx.h +++ b/SrcPony/pic168xx.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/pic16xx.cpp b/SrcPony/pic16xx.cpp index 3234c44..4b44753 100644 --- a/SrcPony/pic16xx.cpp +++ b/SrcPony/pic16xx.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/pic16xx.h b/SrcPony/pic16xx.h index 542b4de..abcb854 100644 --- a/SrcPony/pic16xx.h +++ b/SrcPony/pic16xx.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/picbus.cpp b/SrcPony/picbus.cpp index a8346c8..a984793 100644 --- a/SrcPony/picbus.cpp +++ b/SrcPony/picbus.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/picbus.h b/SrcPony/picbus.h index d7b07b9..84d1df4 100644 --- a/SrcPony/picbus.h +++ b/SrcPony/picbus.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/picbusnew.cpp b/SrcPony/picbusnew.cpp index 162494a..d5e4ba3 100644 --- a/SrcPony/picbusnew.cpp +++ b/SrcPony/picbusnew.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/picbusnew.h b/SrcPony/picbusnew.h index 743391b..574c8a4 100644 --- a/SrcPony/picbusnew.h +++ b/SrcPony/picbusnew.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/ponyioint.cpp b/SrcPony/ponyioint.cpp index 2164e09..20d2805 100644 --- a/SrcPony/ponyioint.cpp +++ b/SrcPony/ponyioint.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/ponyioint.h b/SrcPony/ponyioint.h index 324933d..7c70229 100644 --- a/SrcPony/ponyioint.h +++ b/SrcPony/ponyioint.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/portint.cpp b/SrcPony/portint.cpp index c901b92..0587db3 100644 --- a/SrcPony/portint.cpp +++ b/SrcPony/portint.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/portint.h b/SrcPony/portint.h index c61b517..bfc6621 100644 --- a/SrcPony/portint.h +++ b/SrcPony/portint.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/prefdialog.cpp b/SrcPony/prefdialog.cpp index 80cece7..a29b687 100644 --- a/SrcPony/prefdialog.cpp +++ b/SrcPony/prefdialog.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/prefdialog.h b/SrcPony/prefdialog.h index 4dada64..baf4860 100644 --- a/SrcPony/prefdialog.h +++ b/SrcPony/prefdialog.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/progoption.cpp b/SrcPony/progoption.cpp index be1f516..5471cbf 100644 --- a/SrcPony/progoption.cpp +++ b/SrcPony/progoption.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/progoption.h b/SrcPony/progoption.h index 95ec4e3..e7dc786 100644 --- a/SrcPony/progoption.h +++ b/SrcPony/progoption.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/rs232int.cpp b/SrcPony/rs232int.cpp index 9ec38a7..b9ec558 100644 --- a/SrcPony/rs232int.cpp +++ b/SrcPony/rs232int.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/rs232int.h b/SrcPony/rs232int.h index b941683..8958b59 100644 --- a/SrcPony/rs232int.h +++ b/SrcPony/rs232int.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/sde2506.cpp b/SrcPony/sde2506.cpp index abea163..d15906f 100644 --- a/SrcPony/sde2506.cpp +++ b/SrcPony/sde2506.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/sde2506.h b/SrcPony/sde2506.h index ff95b48..2edc971 100644 --- a/SrcPony/sde2506.h +++ b/SrcPony/sde2506.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/sdebus.cpp b/SrcPony/sdebus.cpp index 77328de..bc79eaa 100644 --- a/SrcPony/sdebus.cpp +++ b/SrcPony/sdebus.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/sdebus.h b/SrcPony/sdebus.h index 37a3f11..51a0fcf 100644 --- a/SrcPony/sdebus.h +++ b/SrcPony/sdebus.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/sernumdlg.cpp b/SrcPony/sernumdlg.cpp index a35766f..706c9f1 100644 --- a/SrcPony/sernumdlg.cpp +++ b/SrcPony/sernumdlg.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/sernumdlg.h b/SrcPony/sernumdlg.h index 0170165..9baefa6 100644 --- a/SrcPony/sernumdlg.h +++ b/SrcPony/sernumdlg.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/spi-bus.cpp b/SrcPony/spi-bus.cpp index f817252..850bc26 100644 --- a/SrcPony/spi-bus.cpp +++ b/SrcPony/spi-bus.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/spi-bus.h b/SrcPony/spi-bus.h index 8c899a2..a8aacf7 100644 --- a/SrcPony/spi-bus.h +++ b/SrcPony/spi-bus.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/usbwatcher.cpp b/SrcPony/usbwatcher.cpp index 2360c84..9b9e833 100644 --- a/SrcPony/usbwatcher.cpp +++ b/SrcPony/usbwatcher.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // Copyright (C) 2019 LibUSB part, Eduard Kalinowski // // // diff --git a/SrcPony/usbwatcher.h b/SrcPony/usbwatcher.h index 8cd2092..b38e8e3 100644 --- a/SrcPony/usbwatcher.h +++ b/SrcPony/usbwatcher.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // Copyright (C) 2019 LibUSB part, Eduard Kalinowski // // // diff --git a/SrcPony/wait.cpp b/SrcPony/wait.cpp index 9ce492c..781b0ac 100644 --- a/SrcPony/wait.cpp +++ b/SrcPony/wait.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/wait.h b/SrcPony/wait.h index 13d4efa..1eca5f9 100644 --- a/SrcPony/wait.h +++ b/SrcPony/wait.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/x2444.cpp b/SrcPony/x2444.cpp index 99f090a..bf49084 100644 --- a/SrcPony/x2444.cpp +++ b/SrcPony/x2444.cpp @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/x2444.h b/SrcPony/x2444.h index 6c10b50..aabb1d7 100644 --- a/SrcPony/x2444.h +++ b/SrcPony/x2444.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/SrcPony/x2444bus.h b/SrcPony/x2444bus.h index ffc7d51..d8c9198 100644 --- a/SrcPony/x2444bus.h +++ b/SrcPony/x2444bus.h @@ -2,7 +2,7 @@ // // // PonyProg - Serial Device Programmer // // // -// Copyright (C) 1997-2019 Claudio Lanconelli // +// Copyright (C) 1997-2020 Claudio Lanconelli // // // // http://ponyprog.sourceforge.net // // // diff --git a/create_rpm_package.sh b/create_rpm_package.sh index ee5fb2b..f662eaa 100755 --- a/create_rpm_package.sh +++ b/create_rpm_package.sh @@ -30,7 +30,7 @@ if [ -d "$DIRECTORY" ]; then cd "$DIRECTORY" rm * -rf - cmake -DUSE_DEBUGGER=OFF .. + cmake -DUSE_DEBUGGER=OFF -DUSE_QT5=ON -DUDEV_INSTALL_DIR="/usr/lib/udev/rules.d" .. make -j$CPU_NUM strip -s ponyprog make package-binary-rpm diff --git a/distribution/posix/CMakeLists.txt b/distribution/posix/CMakeLists.txt index 123b0e5..6f923bb 100644 --- a/distribution/posix/CMakeLists.txt +++ b/distribution/posix/CMakeLists.txt @@ -6,6 +6,13 @@ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr") INCLUDE(GNUInstallDirs) + +MESSAGE("UDEV_INSTALL_DIR ${UDEV_INSTALL_DIR}") + +#SET(UDEV_INSTALL_DIR "/usr/lib/udev/rules.d") +IF(NOT EXISTS "${UDEV_INSTALL_DIR}" OR NOT IS_DIRECTORY "${UDEV_INSTALL_DIR}") + SET(UDEV_INSTALL_DIR "/lib/udev/rules.d") +ENDIF() MESSAGE("CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}") @@ -49,8 +56,8 @@ # MESSAGE("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}") INSTALL(FILES "${PROJECT_SOURCE_DIR}/udev/rules.d/90-ponyprog.rules" - DESTINATION "/lib/udev/rules.d/" - COMPONENT "application" + DESTINATION "${UDEV_INSTALL_DIR}" + COMPONENT "application" PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) @@ -86,7 +93,7 @@ MESSAGE("DEBIAN_ARCHITECTURE ${DEBIAN_ARCHITECTURE}") SET( PONYPROG_CPACK_PACKAGE_FILE_NAME "ponyprog-${APP_VERSION}-${DEBIAN_ARCHITECTURE}" ) SET(DEBIAN_POSTINST postinst.in) - + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/package-binary-deb.cpack.in ${CMAKE_CURRENT_BINARY_DIR}/package-binary-deb.cpack) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${DEBIAN_POSTINST} ${CMAKE_CURRENT_BINARY_DIR}/packaging/debian-control/postinst) ADD_CUSTOM_TARGET(package-binary-deb @@ -116,10 +123,10 @@ MESSAGE("RPM_ARCHITECTURE ${RPM_ARCHITECTURE}") SET( PONYPROG_CPACK_PACKAGE_FILE_NAME "ponyprog-${APP_VERSION}-${RPM_ARCHITECTURE}" ) SET( RPM_POSTINST postinst.in) - + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/package-binary-rpm.cpack.in ${CMAKE_CURRENT_BINARY_DIR}/package-binary-rpm.cpack) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RPM_POSTINST} ${CMAKE_CURRENT_BINARY_DIR}/packaging/rpm-script/postinst.sh) - + ADD_CUSTOM_TARGET(package-binary-rpm WORKING_DIRECTORY "${PONYPROG_PACKAGE_DIRECTORY}" COMMAND ${CMAKE_CPACK_COMMAND} --config ${CMAKE_CURRENT_BINARY_DIR}/package-binary-rpm.cpack diff --git a/fixyear.sh b/fixyear.sh index 85e298b..f31b45c 100755 --- a/fixyear.sh +++ b/fixyear.sh @@ -2,7 +2,7 @@ set -o errexit -OLD_YEAR=2017 +OLD_YEAR=2019 CURRENT_YEAR=`date +%Y` FILESC=`find -name "*.cpp" -type f` diff --git a/lang/english.utf b/lang/english.utf index 4f0168f..cfae805 100644 --- a/lang/english.utf +++ b/lang/english.utf @@ -340,3 +340,6 @@ t283=Refer to device datasheet, please t284=Checked items means programmed t285=UnChecked items means unprogrammed +t286=Save the result in the buffer at given location +t287=Preferences +t288=Be sure the VTarget is on (check J3) and NO target attached for the test diff --git a/lang/italiano.utf b/lang/italiano.utf index 43009d9..875d5c8 100644 --- a/lang/italiano.utf +++ b/lang/italiano.utf @@ -1,7 +1,7 @@ LANGUAGE_NAME italiano LANGUAGE_CHARSET -UTF-8 +UTF-8 t0=italiano t1=Traduttori: t2= @@ -9,14 +9,14 @@ t4=Scarica l'ultima versione di t5=all'indirizzo: t6=Senza Nome -//Button captions +//Button captions t7=OK t8=Annulla t9=Aiuto t10=Prova t12=Note t13=Edit -//Dialog messages +//Dialog messages t14=Versione t15=Si t16=No @@ -75,8 +75,8 @@ t74=Salvataggio del File per il dispositivo t75=Salvataggio del File di Programma (FLASH) t76=Salvataggio del File di Dati (EEPROM) -//Menu entries -//Main Menu +//Menu entries +//Main Menu t80=&File t81=&Edit t82=&Dispositivi @@ -85,7 +85,7 @@ t86=&Impostazioni t87=&Opzioni t88=&? -//Menu File +//Menu File t89=&Nuova Finestra t90=&Apri File del Dispositivo... t91=Apri File di &Programma (FLASH)... @@ -98,10 +98,10 @@ t98=&Stampa... t99=&Chiudi t100=&Esci -//Menu Edit +//Menu Edit t101=Edit &Note... t102=Modifica Bu&ffer abilitata -//Menu Command +//Menu Command t103=&Leggi Tutto t104=Leggi Memoria Pro&gramma (FLASH) t105=Leggi Memoria &Dati (EEPROM) @@ -119,26 +119,26 @@ t117=&Reset t118=Esegui &Programmazione t119=&Opzioni di Programmazione... -//Menu Setup +//Menu Setup t120=&Scheda di Interfaccia... t121=&Calibrazione t122=&Modalita` Remota -//Menu Utility +//Menu Utility t123=&Ripulisci Buffer t124=R&iempi Buffer... t125=Ra&ddoppia Banchi t126=&Scambia Byte t127=Scarica &Numero di Serie t128=&Configurazione Numero di Serie... -//Menu Help +//Menu Help t129=&Aiuto t130=&Informazioni -//Menu Options +//Menu Options t131=&Log File... -//Tool Bar -//Dialog Messages +//Tool Bar +//Dialog Messages t136=Modello -//Tool Tips +//Tool Tips t137=Apri File Dispositivo t138=Salva File Dispositivo t139=Stampa Buffer @@ -156,7 +156,7 @@ t151=Seleziona la famiglia di dispositivi t152=Seleziona il tipo di dispositivo t153=Modifica Note Dispositivo -//Error Messages +//Error Messages t154=Il dispositivo non risponde t155=Dispositivo sbagliato, seleziona il modello corretto t156=Dispositivo mancante o sconosciuto @@ -174,11 +174,11 @@ t168=Errore generico di scrittura t169=Errore eprom non cancellata t170=Errore n. -//----Setup dialog -//Dialog title +//----Setup dialog +//Dialog title t172=Impostazioni porta di I/O t173=Impostazioni Scheda di interfaccia -//Dialog messages +//Dialog messages t174=Interfaccia COM/LPT t175=Seriale t176=Parallela @@ -193,59 +193,59 @@ t187=Inverti SCKL t188=Inverti D-IN t189=Inverti D-OUT -//Tool tips +//Tool tips t190=Seleziona la porta seriale COM t192=Seleziona la porta parallela LPT -//----Fill dialog -//Dialog title +//----Fill dialog +//Dialog title t193=Riempi Buffer -//Dialog messages +//Dialog messages t194=Da t195=A t196=Valore -//----Fuse dialog -//Button captions +//----Fuse dialog +//Button captions t197=Azzera Tutto t198=Imposta Tutto t199=Scrivi t200=Leggi -//Dialog title +//Dialog title t201=Bit di Configurazione e Sicurezza -//Dialog messages +//Dialog messages t202=Primo blocco da proteggere t203=Numero di blocchi da proteggere t204=Blocco ad elevata durata -//Tool tips +//Tool tips t205=Imposta tutti i bit a '0' t206=Imposta tutti i bit a '1' t207=Scrivi i bit nel dispositivo t208=Legge i bit dal dispositivo -//----Info dialog -//Button captions +//----Info dialog +//Button captions t209=Chiudi -//Dialog title +//Dialog title t210=Informazioni sul Dispositivo -//Dialog messages +//Dialog messages t211=Caratteristica dello 'sforamento del banco': t212=Dimensione: t213=CRC: t214=Blocco protetto: t215=Blocco ad elevata durata: -//----Char Edit dialog -//Dialog title +//----Char Edit dialog +//Dialog title t216=Modifica Buffer -//Dialog messages: NB should be of the same size (number of char) +//Dialog messages: NB should be of the same size (number of char) t217=Esadecimale t218=Decimale t219=Carattere -//Tool tips +//Tool tips t222=Valore esadecimale t223=Valore decimale t224=Valore carattere -//----Program Option dialog -//Dialog title +//----Program Option dialog +//Dialog title t225=Opzioni di Programmazione -//Dialog messages +//Dialog messages t226=Ricarica i File t227=Leggi Memoria Progamma (FLASH) t228=Leggi Memoria Dati (EEPROM) @@ -257,39 +257,39 @@ t234=Scrivi Memoria Dati (EEPROM) t235=Scrivi Bit di Configurazione e Sicurezza t236=Verifica Bit di Configurazione e Sicurezza -//----Serial Number dialog -//Dialog title +//----Serial Number dialog +//Dialog title t237=Configurazione Numero di Serie -//Dialog messages: NB should be of the same size (number of char) +//Dialog messages: NB should be of the same size (number of char) t238=Indirizzo t239=Dimensione t240=Valore t241=Formato -//next 2 probably can't be translated +//next 2 probably can't be translated t242=Little endian t243=Big endian t244=Scostamento dalla Memoria Dati -//Tool tips +//Tool tips t245=Indirizzo di memoria t246=Dimensione in byte t247=Prossimo valore da usare t248=Considera l'indirizzo relativo alla memoria Dati anziché quella Programma t249=Cifra più significativa nell'indirizzo di memoria alto t250=Cifra più significativa nell'indirizzo di memoria basso -//----Retry dialog -//Button captions +//----Retry dialog +//Button captions t251=Interrompi t252=Riprova t253=Ignora -//Dialog title +//Dialog title t254=Attenzione -//----Notes dialog -//Dialog title +//----Notes dialog +//Dialog title t255=Modifica Note al Dispositivo -//----Progress dialog -//Dialog title +//----Progress dialog +//Dialog title t256=Stato -//Script +//Script t84=Scri&pt t132=&Edit... t133=&Apri ed Esegui... @@ -307,7 +307,7 @@ t220=Inserisci il nuovo valore t221=Inserisci il testo dalla locazione t258=Disabilita il suono -//---- Oscillator Calibration Byte +//---- Oscillator Calibration Byte t260=Byte di Calibrazione Oscillatore t261=Leggi Byte di Calibrazione Oscillatore t262=Configura Byte di Calibrazione Oscillatore... @@ -334,3 +334,6 @@ t283=Consulta il datasheet del dispositivo t284=Il bit selezionato significa programmato t285=Il bit non selezionato significa non programmato +t286=Salva il risultato nel buffer alla locazione indicata +t287=Preferenze +t288=Assicurati che VTarget sia ON (controlla il jumper J3) e di non avere nessun dispositivo 'target' collegato diff --git a/ponyprog.pro b/ponyprog.pro index bea0dec..f1c4205 100644 --- a/ponyprog.pro +++ b/ponyprog.pro @@ -25,8 +25,8 @@ APP_LOW_NAME = "ponyprog" APP_LOW_H_NAME = ".ponyprog" APP_AUTHOR = "Claudio Lanconelli" -APP_COPYRIGHT = "(C) 1997-2019 $$APP_AUTHOR" -APP_VERSION = "3.1.0" +APP_COPYRIGHT = "(C) 1997-2020 $$APP_AUTHOR" +APP_VERSION = "3.1.1" # APP_BUILD_DATE = $$_DATE_ APP_LONG_NAME = "$$APP_NAME $$APP_VERSION" APP_EMAIL = "PonyProg2000@gmail.com"