diff --git a/ATBHMIconfig.cpp b/ATBHMIconfig.cpp index c684275..881b7a1 100644 --- a/ATBHMIconfig.cpp +++ b/ATBHMIconfig.cpp @@ -213,8 +213,6 @@ void ATBHMIconfig::initDefered() { this->HelpButtonUsed = settings->value("showHelpButton", "0").toBool(); this->InfoButtonUsed = settings->value("showInfoButton", "0").toBool(); - this->ScreenChangeTimeoutTime = settings->value("screenChangeTimeoutTime", "10").toUInt(); - settings->endGroup(); // [PAYMENT] @@ -357,8 +355,6 @@ QString ATBHMIconfig::getSuspendTime() { return this->SuspendTime; */ QString ATBHMIconfig::getSellTimeoutTime() { return this->SellTimeoutTime; } -quint32 ATBHMIconfig::getHMIScreenChangeTimeoutTime() { return this->ScreenChangeTimeoutTime; } - QString ATBHMIconfig::getQmPath() { return this->qmPath; } bool ATBHMIconfig::hasFeatureTF() { return ((this->features & this->featureMaskTF) != 0); } diff --git a/ATBHMIconfig.h b/ATBHMIconfig.h index f26a5b4..fa6e45a 100644 --- a/ATBHMIconfig.h +++ b/ATBHMIconfig.h @@ -107,22 +107,6 @@ class ATBHMIconfig : public QObject QString currencySymbol; -#ifdef USE_BARCODESCANNER - bool useBarcode; - QString barcodeScannerInputDeviceName; -#endif - -#ifdef USE_RFIDREADER - bool useRFID; - QString rfidReaderInputDeviceName; -#endif - -#ifdef USE_EXTERNAL_TICKETMANAGER - // for ticket management - QString endOfSellingTime; - int blockingTimeMin; -#endif - quint8 defaultLanguage; @@ -141,18 +125,6 @@ class ATBHMIconfig : public QObject QByteArray characterSet; -#ifdef USE_ISMAS - QString ismasHost; - quint16 ismasPort; - QString ismasID; - bool ismasDebug; - bool ismasCheckEntries; - quint16 ismasConnectionTimeout; - bool usePINgenerator; -#endif - - quint32 ScreenChangeTimeoutTime; - PAYMENT_VARIANTS::CASH_VARIANT cashVariant; // ErrorCode-mapping @@ -219,31 +191,6 @@ public: const QString & getPaymentCurrencySymbol(); -#ifdef USE_BARCODESCANNER - bool getUseBarcodeScanner(); - QString & getBarcodeScannerInputDevice(); -#endif - -#ifdef USE_RFIDREADER - bool getUseRFIDReader(); - QString & getRFIDReaderInputDevice(); -#endif - -#ifdef USE_EXTERNAL_TICKETMANAGER - QString getEndOfSellingTime(); - int getBlockingTime(); -#endif - -#ifdef USE_ISMAS - QString getISMASHost(); - quint16 getISMASPort(); - QString getISMASId(); - bool isIsmasDebug(); - bool IsmasCheckEntries(); - bool UsePINgenerator(); - quint16 getIsmasConnectionTimeout(); -#endif - void setFeatureTF(); void unsetFeatureTF(); diff --git a/atb_system.cpp b/atb_system.cpp index d4207e2..7a6a855 100644 --- a/atb_system.cpp +++ b/atb_system.cpp @@ -125,77 +125,6 @@ void ATB_system::BeepStop() { } -int ATB_system::init_touch_feedback() { -#if defined (ARCH_PTU2) - QString GPIODirName("/sys/class/gpio/"); - QString directionFileName; - QString valueFileName; - - // # echo 129 > /sys/class/gpio/export - QFile file("/sys/class/gpio/export"); - file.open(QIODevice::WriteOnly | QIODevice::Text); - QTextStream out(&file); - out << config->getTouchFeedbackGPIO(); - file.close(); - - // check, if gpio-dir was created - GPIODirName.append("gpio"); - GPIODirName.append(config->getTouchFeedbackGPIO()); - QFileInfo fileinfo1(GPIODirName); - if (! fileinfo1.isDir() ) { - qDebug() << "ATB_system::init_touch_feedback(): \"" << GPIODirName << "\" is not a directory"; - config->unsetFeatureTF(); - return -1; - } - directionFileName = GPIODirName + "/direction"; - QFileInfo fileinfo2(directionFileName); - if (! fileinfo2.isWritable() ) { - qDebug() << "ATB_system::init_touch_feedback(): \"" << directionFileName << "\" is not writable"; - config->unsetFeatureTF(); - return -1; - } - - // # echo out > /sys/class/gpio/gpio129/direction - QFile directionfile(directionFileName); - directionfile.open(QIODevice::ReadWrite | QIODevice::Text); - QTextStream out2(&directionfile); - out2 << "out"; - out2.flush(); - - // re-read 'direction' for confirmation - // -> the following is disabled because this sometimes failed - //QTextStream in(&directionfile); - //QString line = in.readLine(); - //if (line != "out") { - // qDebug() << "ATB_system::init_touch_feedback(): re-read directionfile failed"; - // config->unsetFeatureTF(); - // return -1; - //} - directionfile.close(); - - // open gpio file - valueFileName = GPIODirName + "/value"; - this->tf_gpio = new QFile(valueFileName); - - this->tf_gpio->open(QIODevice::WriteOnly); - this->tf_gpio_outstream = new QTextStream(this->tf_gpio); - - qDebug() << "ATB_system::init_touch_feedback(): GPIODirName = \"" << GPIODirName << "\""; - qDebug() << "ATB_system::init_touch_feedback(): valueFileName = \"" << valueFileName << "\""; - -#elif defined (ARCH_PTU4) - QString sysfs_buzzer("/sys/class/leds/Buzzer/brightness"); - - this->tf_gpio = new QFile(sysfs_buzzer); - tf_gpio->open(QIODevice::WriteOnly); - - this->tf_gpio_outstream = new QTextStream(this->tf_gpio); -#endif - - return 1; -} - - /******************************************************************************** * set date/time * diff --git a/atb_system.h b/atb_system.h index 5a45c8f..c8d0860 100644 --- a/atb_system.h +++ b/atb_system.h @@ -31,9 +31,6 @@ class ATB_system : public QObject { Q_OBJECT private: - int init_touch_feedback(); - int init_sc_dbus(); - ATBHMIconfig *config; QFile *tf_gpio; QTextStream *tf_gpio_outstream;