To be used later, to replace some parts of interfaces.h

dCArun/CArun.cpp

@@ -1,8 +1,6 @@
 #include "CArun.h"
 #include "datei.h"
 
-#include "CCWakelineAbstraction.h"
-
 
 CArun::CArun(QObject *parent)
     : QObject(parent)
@@ -19,8 +17,6 @@ CArun::CArun(QObject *parent)
     qCritical() << "CArun: start setup...";
 
     this->timerChainCtrl->start();
-
-    this->ccWakelineAbstraction = new CCWakelineAbstraction(this->HWaccess, this);
 }
 
 

dCArun/CArun.h

@@ -22,7 +22,7 @@ enum class SETUP_STEP {
 };
 
 
-class CCWakelineAbstraction;
+
 
 class CArun : public QObject
 {
@@ -45,8 +45,6 @@ private:
 
     void openSerialPort();
 
-    CCWakelineAbstraction* ccWakelineAbstraction;
-
 signals:
 
 

dCArun/CCWakelineAbstraction.cpp

@@ -1,51 +0,0 @@
-#include <QFileSystemWatcher>
-#include <QFile>
-
-#include <QDebug>
-
-#include "CCWakelineAbstraction.h"
-#include "plugin.h"
-
-/**
- * this is based on a solution from:
- * https://embeddeduse.com/2018/09/18/monitoring-sys-files-qfilesystemwatcher/
- *
- */
-
-CCWakelineAbstraction::CCWakelineAbstraction(hwinf *dc, QObject *parent)
-    : QObject(parent)
-    , dc(dc)
-{
-    auto ccWakeMonitor = new QFileSystemWatcher(this);
-
-    ccWakeMonitor->addPath("/sys/class/leds/wakeupctrl_cc/brightness");
-    connect(ccWakeMonitor, &QFileSystemWatcher::fileChanged,
-                this, &CCWakelineAbstraction::ccWakeChanged);
-
-    qCritical() << "... init CCWakelineAbstraction";
-}
-
-
-void CCWakelineAbstraction::ccWakeChanged(const QString &path)
-{
-    QFile ccWakeFile(path);
-     if (!ccWakeFile.open(QIODevice::ReadOnly)) {
-         qWarning() << "ERROR: Could not open ccWakeFile file.";
-         return;
-     }
-     auto ccWake = ccWakeFile.readAll();
-     if (!ccWake.isEmpty()) {
-         int state = ccWake.at(0);
-         //qCritical() << "INFO: ccWake = " << state;
-         switch (state) {
-         case 0x30:  // '1'
-             qCritical() << "INFO: ccWake -> sleep";
-             this->dc->credit_switchWake(true); // switch 'sleep'
-             break;
-         case 0x31:  // '0'
-             qCritical() << "INFO: ccWake -> wake";
-             this->dc->credit_switchWake(false); // switch 'wake'
-             break;
-         }
-     }
-}

dCArun/CCWakelineAbstraction.h

@@ -1,25 +0,0 @@
-#ifndef CCWAKELINEABSTRACTION_H
-#define CCWAKELINEABSTRACTION_H
-
-
-#include <QObject>
-
-class hwinf;
-class QFileSystemWatcher;
-
-
-class CCWakelineAbstraction : public QObject
-{
-    Q_OBJECT
-
-public:
-    CCWakelineAbstraction(hwinf *dc, QObject *parent = nullptr);
-
-private:
-    hwinf *dc;
-    QFileSystemWatcher *ccWakeMonitor;
-
-    void ccWakeChanged(const QString &path);
-};
-
-#endif // CCWAKELINEABSTRACTION_H

dCArun/dCArun.pro

@@ -40,14 +40,12 @@ DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 
 SOURCES += \
     CArun.cpp \
-    CCWakelineAbstraction.cpp \
     main.cpp \
     tslib.cpp \
     datei.cpp
 
 HEADERS += \
     CArun.h \
-    CCWakelineAbstraction.h \
     guidefs.h \
     tslib.h \
     versionHistory.txt \

include/dynamic-machine-conditions.h

@@ -0,0 +1,84 @@
+#ifndef DYNAMIC_MACHINE_CONDITIONS_H_INCLUDED
+#define DYNAMIC_MACHINE_CONDITIONS_H_INCLUDED
+
+struct T_dynamicCondition
+{
+    char allDoorsDebounced;
+    char openedAuthorized;
+    uint8_t CBinDebounced;  // 0:fehlt  1:drin
+    char upperDoor;         // 99: undefined  0:closed  1:open
+    char middleDoor;		// 99: undefined  0:closed  1:open
+    char lowerDoor;         // 99: undefined  0:closed  1:open
+    char coinAttached;
+    char billBox;
+    char modeAbrech;
+    char onAlarm;           // 0:alarm aus  1:alarm  2:alarm mit Sirene   3: Sirenentest
+    char nowCardTest;
+    char nowPayment;        // not used, always 0
+    char lastMifCardType;
+    uint8_t lastSDoorState;
+    uint8_t lastVDoorState;
+    uint8_t lastCBstate;
+    char        paymentInProgress;
+    // Version Szeged:  aug2023
+    //	0: stopped by timeout
+    //  1: running  2: wait4lastCoin
+    //				3: payment stopped manually, coins in Escrow
+    //			    4: payment stopped autom, amount collected, coins in Escrow
+    //			    5: payment stopped, escrow full, coins in Escrow
+    //			    6: coins encashed   7:coins returned
+    //				8: CoinChecker or MDB on Error
+
+    // since Schoenau with bill and changer, nov2023
+    //0 = no payment
+    //will be set to 1 by cash_startCollection()
+    //neu 1: wait for devices getting ready for payment
+    //2 = payment,
+    //3 = wait for last coin/bill
+    //4 = Bezahlvorgang manuell beendet
+    //5 = payment stopped autom, amount collected, coins in Escrow
+    //6 = Bezahlvorgang beendet weil ZK voll
+    //4,5,6: payment done, keep on polling, wait for cash or return command
+    //7 = encash collected money from coin escrow into cash box
+    //8 = return "amountToReturn", can be complete inserted amount or only overpayment
+    //9 = wait for changer result
+    //10= print refund receipt with "amountToReturn"
+
+    char        res1;
+    uint16_t    U_Batt;
+    uint16_t	Temperatur;
+    uint16_t	nrCoinsInBox;
+    uint32_t	amountInBox;
+    uint32_t	totalTransVolume;
+    uint32_t	totalNrOfVends;
+    char        jsonValid_config;
+    char        jsonValid_device;
+    char        jsonValid_cash;
+    char        jsonValid_print;
+    // 40
+    char        jsonValid_serial;
+    char        jsonValid_time;
+    char        lastFileType;
+    uint8_t     MifCardHolder[8];
+    uint8_t     resultOfLastTemplPrint;
+                // 0: unknown or printing in progress
+                // 1: OK, doc was printed   2: error, doc was not printed
+    uint8_t     lastPrinterStatus;
+                //        0: printer OK
+                //          bit0: near paper end          bit1: no paper
+                //          bit2: temperature error       bit3: error head open
+                //          bit4: paper jam in cutter
+                //          bit6: no response             bit7: serial rec. error
+                //			bit5: printer not ready
+    uint8_t     startupTestIsRunning;
+
+    uint8_t     padd01;
+    uint8_t     padd02;
+    uint8_t     padd03;
+    uint32_t   padd04;
+    uint32_t   padd05;
+    uint32_t   padd06;
+    uint16_t   padd07;
+};
+
+#endif // DYNAMIC_MACHINE_CONDITIONS_H_INCLUDED