Fix: remove setting coinVal and acc to fixed (test) values,

plus remove call to emp_sendSettings().

datei.cpp

@@ -840,6 +840,9 @@ QByteArray datei_readFromFile(QString filename)
     return myBA;
 }
 
+/*
+ * deprecated - use QFileInfo
+ */
 bool datei_ifFileExists(QString filename)
 {
 

datei.h

@@ -28,13 +28,13 @@
 // all generated files located in sudirectory "dynamic machine data - dmd"
 
 #define FILENAME_COMPORT            "../comport.csv"
-#define FILENAME_CONFIG             "/own/work2023/PSA1256ptu5/smd/DC2C_conf.json"
+#define FILENAME_APSERVCONF         "../APserviceConfig.csv"
-#define FILENAME_DEVICE             "/own/work2023/PSA1256ptu5/smd/DC2C_device.json"
-#define FILENAME_CASH              "/own/work2023/PSA1256ptu5/smd/DC2C_cash.json"
-#define FILENAME_PRINT             "/own/work2023/PSA1256ptu5/smd/DC2C_print32.json"
-#define FILENAME_APSERVCONF        "../APserviceConfig.csv"
-
 
+const QString config_path = QStringLiteral("/etc/psa_config/");
+const QString filename_config = QStringLiteral("DC2C_conf.json");
+const QString filename_device = QStringLiteral("DC2C_device.json");
+const QString filename_cash   = QStringLiteral("DC2C_cash.json");
+const QString filename_print  = QStringLiteral("DC2C_print32.json");
 
 // -------------------------------------------------------------------------------------------------
 // ------------------------------------------------------ create csv file -------------------------------
@@ -194,6 +194,7 @@ void datei_closeFile(QString filename);
 // read content of an exiting file:
 QByteArray datei_readFromFile(QString filename);
 
+// deprecated - user QFileInfo
 bool datei_ifFileExists(QString filename);
 
 char datei_writeToFile(QString filename, QByteArray content);

win13_json.cpp

@@ -109,6 +109,13 @@ T_win13::T_win13(hwinf *HWaccess, QWidget *parent) : QWidget(parent)
     myTO->setSingleShot(true);
     myTO->start(2000);
 
+
+    this->config_filename = QString(config_path) + QString(filename_config);
+    this->device_filename = QString(config_path) + QString(filename_device);
+    this->cash_filename   = QString(config_path) + QString(filename_cash);
+    this->print_filename  = QString(config_path) + QString(filename_print);
+
+
 }
 
 T_win13::~T_win13()
@@ -132,9 +139,9 @@ void T_win13::Nav_next(void)
 void T_win13::slot_pb1(void)
 {
     showFile->clear();
-    if (datei_ifFileExists(FILENAME_CONFIG))
+    if (QFileInfo::exists(this->config_filename))
     {
-        loadedFile=datei_readFromFile(FILENAME_CONFIG);
+        loadedFile=datei_readFromFile(this->config_filename);
         showFile->append(loadedFile);
     } else
     {
@@ -145,9 +152,9 @@ void T_win13::slot_pb1(void)
 void T_win13::slot_pb2(void)
 {
     showFile->clear();
-    if (datei_ifFileExists(FILENAME_DEVICE))
+    if (QFileInfo::exists(this->device_filename))
     {
-        loadedFile=datei_readFromFile(FILENAME_DEVICE);
+        loadedFile=datei_readFromFile(this->device_filename);
         showFile->append(loadedFile);
     } else
     {
@@ -158,9 +165,9 @@ void T_win13::slot_pb2(void)
 void T_win13::slot_pb3(void)
 {
     showFile->clear();
-    if (datei_ifFileExists(FILENAME_CASH))
+    if (QFileInfo::exists(this->cash_filename))
     {
-        loadedFile=datei_readFromFile(FILENAME_CASH);
+        loadedFile=datei_readFromFile(this->cash_filename);
         showFile->append(loadedFile);
     } else
     {
@@ -171,9 +178,9 @@ void T_win13::slot_pb3(void)
 void T_win13::slot_pb4(void)
 {
     showFile->clear();
-    if (datei_ifFileExists(FILENAME_PRINT))
+    if (QFileInfo::exists(this->print_filename))
     {
-        loadedFile=datei_readFromFile(FILENAME_PRINT);
+        loadedFile=datei_readFromFile(this->print_filename);
         showFile->append(loadedFile);
     } else
     {

win13_json.h

@@ -71,6 +71,12 @@ public slots:
     void slot_pb7(void);
     void slot_pb8(void);
 
+private:
+    QString config_filename;
+    QString device_filename;
+    QString cash_filename;
+    QString print_filename;
+
 };
 
 #endif

win14_mw.cpp

@@ -649,13 +649,14 @@ bool T_win14::working(uint16_t *nextScreen, uint8_t *useNavi)
         {
             myStep++;
             myTO->start(200);
-            uint16_t acc=0x07;  // accept 5c,10c,20c
+            //uint16_t acc=0x7E;  // accept 10c-2€ & Token
             uint16_t coinVal[16];
             memset(coinVal,0,32);
-            coinVal[0]=2;
+            //coinVal[0]=5;
-            coinVal[3]=49;
+            //coinVal[3]=50;
-            coinVal[10]=230;
+            //coinVal[10]=0;
-            HWaccess->emp_sendSettings(acc, 12, coinVal);   // getestet 19.10.23TS
+            // 17.11.23 raus.
+            //HWaccess->emp_sendSettings(acc, 12, coinVal);   // getestet 19.10.23TS
         }
     } else