summaryrefslogtreecommitdiffstats
path: root/src/progs/icd1
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:30 -0600
commitad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 (patch)
treec47273eb6595f763c282d33fb89affe1f8866120 /src/progs/icd1
parent9d6927a7d6a543332f828bffedf65eecf6774c6d (diff)
downloadpiklab-ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7.tar.gz
piklab-ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d.
Diffstat (limited to 'src/progs/icd1')
-rw-r--r--src/progs/icd1/base/icd1.cpp10
-rw-r--r--src/progs/icd1/base/icd1_serial.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/progs/icd1/base/icd1.cpp b/src/progs/icd1/base/icd1.cpp
index 3cba20c..2ce3c80 100644
--- a/src/progs/icd1/base/icd1.cpp
+++ b/src/progs/icd1/base/icd1.cpp
@@ -31,7 +31,7 @@ bool Icd1::Hardware::internalConnect(const TQString &mode)
Port::msleep(1);
port()->setPinOn(Port::Serial::RTS, true, Port::PositiveLogic);
if ( s.upper()!=mode ) {
- log(Log::LineType::Error, i18n("Failed to set port mode to '%1'.").arg(mode));
+ log(Log::LineType::Error, i18n("Failed to set port mode to '%1'.").tqarg(mode));
return false;
}
return true;
@@ -79,12 +79,12 @@ bool Icd1::Hardware::readVoltages(VoltagesData &voltages)
if ( !sendCommand(0x701C, &res) ) return false;
voltages[Pic::TargetVdd].value = (2.050 / 256) * res.toUInt(); // voltage at AN0 pin
voltages[Pic::TargetVdd].value /= (4.7 / 14.7); // voltage at Vcc
- log(Log::DebugLevel::Max, TQString("Vdd: %1 %2").arg(toHexLabel(res, 4)).arg(voltages[Pic::TargetVdd].value));
+ log(Log::DebugLevel::Max, TQString("Vdd: %1 %2").tqarg(toHexLabel(res, 4)).tqarg(voltages[Pic::TargetVdd].value));
voltages[Pic::TargetVdd].error = false;
if ( !sendCommand(0x701D, &res) ) return false;
voltages[Pic::TargetVpp].value = (2.050 / 256) * res.byte(0); // voltage at AN1 pin
voltages[Pic::TargetVpp].value /= (10.0 / 110.0); // voltage at Vpp
- log(Log::DebugLevel::Max, TQString("Vpp: %1 %2").arg(toHexLabel(res, 4)).arg(voltages[Pic::TargetVpp].value));
+ log(Log::DebugLevel::Max, TQString("Vpp: %1 %2").tqarg(toHexLabel(res, 4)).tqarg(voltages[Pic::TargetVpp].value));
voltages[Pic::TargetVpp].error = false;
return sendCommand(0x7001);
}
@@ -106,7 +106,7 @@ bool Icd1::Hardware::selfTest()
BitValue res;
if ( !sendCommand(0x700B, &res, 5000) ) return false;
if ( res!=0 ) {
- log(Log::LineType::Warning, i18n("Self-test failed (returned value is %1)").arg(toLabel(res)));
+ log(Log::LineType::Warning, i18n("Self-test failed (returned value is %1)").tqarg(toLabel(res)));
return false;
}
return true;
@@ -152,7 +152,7 @@ bool Icd1::Hardware::eraseAll()
if ( !sendCommand(0x7007, &res) ) return false;
if ( !sendCommand(0x7001) ) return false; // disable Vpp
if ( res!=0x3FFF ) {
- log(Log::LineType::Error, i18n("Erase failed (returned value is %1)").arg(toHexLabel(res, 4)));
+ log(Log::LineType::Error, i18n("Erase failed (returned value is %1)").tqarg(toHexLabel(res, 4)));
return false;
}
return true;
diff --git a/src/progs/icd1/base/icd1_serial.cpp b/src/progs/icd1/base/icd1_serial.cpp
index 164502f..8d40697 100644
--- a/src/progs/icd1/base/icd1_serial.cpp
+++ b/src/progs/icd1/base/icd1_serial.cpp
@@ -61,7 +61,7 @@ bool Icd1::SerialPort::sendCommand(uint cmd)
synchronize();
char c[7] = "$XXXX\r";
TQString cs = toHex(cmd, 4);
- log(Log::DebugLevel::Extra, TQString("Send command: %1").arg(toPrintable(cs, PrintAlphaNum)));
+ log(Log::DebugLevel::Extra, TQString("Send command: %1").tqarg(toPrintable(cs, PrintAlphaNum)));
c[1] = cs[0].latin1();
c[2] = cs[1].latin1();
c[3] = cs[2].latin1();