Compare commits

...

2 Commits

Author SHA1 Message Date
SiegfriedSiegert 34023bd82f update printQR method 2026-06-08 08:46:29 +02:00
SiegfriedSiegert f7e9c74dde change printer codec to windows-1250 2026-06-08 08:46:02 +02:00
3 changed files with 46 additions and 5 deletions
+42 -5
View File
@@ -43,7 +43,8 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
// read variables from setting // read variables from setting
this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString(); this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString();
QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1(); // QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1();
QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "Windows-1250").toString().toLatin1();
QString printerLocaleString = settings.value("ATBDeviceControllerPlugin/printerLocale", "de_DE").toString().toLatin1(); QString printerLocaleString = settings.value("ATBDeviceControllerPlugin/printerLocale", "de_DE").toString().toLatin1();
this->printerLocale = QLocale(printerLocaleString); this->printerLocale = QLocale(printerLocaleString);
@@ -132,7 +133,7 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
this->codec = QTextCodec::codecForName(printerEncoding); this->codec = QTextCodec::codecForName(printerEncoding);
if (this->codec == nullptr) { if (this->codec == nullptr) {
printerEncoding = "ISO 8859-1"; printerEncoding = "Windows-1250";
qCritical() << "ATBDeviceControllerPlugin: ERROR: printer encoding \"" << printerEncoding << "\" is not supported!"; qCritical() << "ATBDeviceControllerPlugin: ERROR: printer encoding \"" << printerEncoding << "\" is not supported!";
qCritical() << " ... use default encoding: " << printerEncoding; qCritical() << " ... use default encoding: " << printerEncoding;
this->codec = QTextCodec::codecForName(printerEncoding); this->codec = QTextCodec::codecForName(printerEncoding);
@@ -833,16 +834,25 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QHash<QString, QVarian
void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingString) void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingString)
{ {
this->codec = QTextCodec::codecForName("Windows-1250");
qCritical() << "Printer codec forced:"
<< this->codec->name();
QByteArray ba_receipt = this->codec->fromUnicode(printingString); QByteArray ba_receipt = this->codec->fromUnicode(printingString);
//QByteArray ba = printingString.toUtf8(); //QByteArray ba = printingString.toUtf8();
hw->prn_switchPower(true); hw->prn_switchPower(true);
hw->prn_sendPrnSetup(100, 25, 'c', 0);
hw->prn_setFonts(printerDefaultFont.font, hw->prn_setFonts(printerDefaultFont.font,
printerDefaultFont.size, //printerDefaultFont.size,
11,
printerDefaultFont.width, printerDefaultFont.width,
printerDefaultFont.height); printerDefaultFont.height);
hw->prn_sendText(&ba_receipt);
qCritical() << "Receipt bytes (hex):";
qCritical().noquote() << ba_receipt.toHex(' ');
hw->prn_sendText(&ba_receipt);
// DEBUG // DEBUG
//qCritical() << "---------------------------------------------------------------"; //qCritical() << "---------------------------------------------------------------";
//qCritical() << "ATBDeviceControllerPlugin::requestPrintReceipt()"; //qCritical() << "ATBDeviceControllerPlugin::requestPrintReceipt()";
@@ -852,11 +862,38 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingStri
this->printResultCheckCounter = 0; this->printResultCheckCounter = 0;
QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingReceipt())); //QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingReceipt()));
//QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3); } ); //QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3); } );
} }
void ATBDeviceControllerPlugin::requestPrintQR(const QString & printingString)
{
QByteArray ba_qr = this->codec->fromUnicode(printingString);
//QByteArray ba = printingString.toUtf8();
hw->prn_switchPower(true);
hw->prn_sendQRdata(&ba_qr);
hw->prn_printQRcode();
// DEBUG
qCritical() << "---------------------------------------------------------------";
qCritical() << "ATBDeviceControllerPlugin::requestPrintQR()";
qCritical() << " QR data:";
qCritical() << QString(ba_qr);
qCritical() << "---------------------------------------------------------------";
this->printResultCheckCounter = 0;
//QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingReceipt()));
//QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3); } );
}
void ATBDeviceControllerPlugin::requestPrintCut(const qint16 & printTimer)
{
QTimer::singleShot(printTimer, this, SLOT(onPrinterWaitForPrintingReceipt()));
}
void ATBDeviceControllerPlugin::onPrinterWaitForPrintingReceipt() void ATBDeviceControllerPlugin::onPrinterWaitForPrintingReceipt()
{ {
quint8 printerResult = this->hw->prn_getPrintResult(); quint8 printerResult = this->hw->prn_getPrintResult();
+2
View File
@@ -79,6 +79,8 @@ public:
void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData); void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData);
void requestPrintReceipt(const QHash<QString, QVariant> & printingData); void requestPrintReceipt(const QHash<QString, QVariant> & printingData);
void requestPrintReceipt(const QString & printingString); void requestPrintReceipt(const QString & printingString);
void requestPrintQR(const QString & printingString);
void requestPrintCut(const qint16 & printTimer);
// TASKS: Account ------------------------------------------------------------- // TASKS: Account -------------------------------------------------------------
void requestAccount(); void requestAccount();
+2
View File
@@ -77,6 +77,8 @@ public:
virtual void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData) = 0; virtual void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData) = 0;
virtual void requestPrintReceipt(const QHash<QString, QVariant> & printingData) = 0; virtual void requestPrintReceipt(const QHash<QString, QVariant> & printingData) = 0;
virtual void requestPrintReceipt(const QString & printingString) = 0; virtual void requestPrintReceipt(const QString & printingString) = 0;
virtual void requestPrintQR(const QString & printingSTring) = 0;
virtual void requestPrintCut(const qint16 & printTimer) = 0;
// read coin/cash processing variants // read coin/cash processing variants
virtual nsDeviceControllerInterface::COIN_PROCESSOR coinProcessor() = 0; virtual nsDeviceControllerInterface::COIN_PROCESSOR coinProcessor() = 0;