diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:14:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:14:26 -0600 |
| commit | 9d9fe02a944fe0719c2475739411727a729251ad (patch) | |
| tree | 5b05f738dd8631ae2c2e2ed46f4a7785fad410f7 /src/progs/pickit2v2 | |
| parent | ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 (diff) | |
| download | piklab-9d9fe02a944fe0719c2475739411727a729251ad.tar.gz piklab-9d9fe02a944fe0719c2475739411727a729251ad.zip | |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'src/progs/pickit2v2')
| -rw-r--r-- | src/progs/pickit2v2/base/pickit2v2.cpp | 4 | ||||
| -rw-r--r-- | src/progs/pickit2v2/base/pickit2v2.h | 4 | ||||
| -rw-r--r-- | src/progs/pickit2v2/base/pickit2v2_prog.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/progs/pickit2v2/base/pickit2v2.cpp b/src/progs/pickit2v2/base/pickit2v2.cpp index 478a0f7..fbd9997 100644 --- a/src/progs/pickit2v2/base/pickit2v2.cpp +++ b/src/progs/pickit2v2/base/pickit2v2.cpp @@ -45,9 +45,9 @@ bool Pickit2V2::Hardware::setTarget() return true; } -bool Pickit2V2::Hardware::readtqStatus(ushort &status) +bool Pickit2V2::Hardware::readStatus(ushort &status) { - if ( !port().command(ReadtqStatus) ) return false; + if ( !port().command(ReadStatus) ) return false; Array a; if ( !port().receive(a) ) return false; status = (a[1] << 8) + a[0]; diff --git a/src/progs/pickit2v2/base/pickit2v2.h b/src/progs/pickit2v2/base/pickit2v2.h index d1bd567..f50adb1 100644 --- a/src/progs/pickit2v2/base/pickit2v2.h +++ b/src/progs/pickit2v2/base/pickit2v2.h @@ -18,7 +18,7 @@ namespace Pickit2V2 enum FirmwareCommand { EnterBootloader = 0x42, NoOperation = 0x5A, FirmwareVersion = 0x76, - SetVdd = 0xA0, SetVpp = 0xA1, ReadtqStatus = 0xA2, ReadVoltages = 0xA3, + SetVdd = 0xA0, SetVpp = 0xA1, ReadStatus = 0xA2, ReadVoltages = 0xA3, DownloadScript = 0xA4, RunScript = 0xA5, ExecuteScript = 0xA6, ClearDownloadBuffer = 0xA7, DownloadData = 0xA8, ClearUploadBuffer = 0xA9, UploadData = 0xAA, ClearScriptBuffer = 0xAB, UploadDataNoLen = 0xAC, @@ -94,7 +94,7 @@ public: bool setTarget(); bool setFastProgramming(bool fast); virtual bool readVoltages(VoltagesData &voltagesData); - bool readtqStatus(ushort &status); + bool readStatus(ushort &status); bool readMemory(Pic::MemoryRangeType type, ::Device::Array &data, const ::Programmer::VerifyData *vdata); bool writeMemory(Pic::MemoryRangeType type, const ::Device::Array &data, bool force); bool eraseAll(); diff --git a/src/progs/pickit2v2/base/pickit2v2_prog.cpp b/src/progs/pickit2v2/base/pickit2v2_prog.cpp index 67788e9..ab378c4 100644 --- a/src/progs/pickit2v2/base/pickit2v2_prog.cpp +++ b/src/progs/pickit2v2/base/pickit2v2_prog.cpp @@ -92,7 +92,7 @@ bool Pickit2V2::Base::setTarget() bool Pickit2V2::Base::selfTest(bool ask) { ushort status; - if ( !hardware().readtqStatus(status) ) return false; + if ( !hardware().readStatus(status) ) return false; TQString error; if ( status & VppError ) error += i18n("Vpp voltage level error; "); if ( status & VddError ) error += i18n("Vdd voltage level error; "); |