merge changes from T.Sax

include/com.h

@@ -64,8 +64,7 @@ public:
     bool readFromSerial(QByteArray &data, uint16_t &sendLength);
         // retval: true: data available
 
-    uint32_t getWriteCount() { return writeCount; }
-
+    void flushPort(void);
 /*
     uint8_t getAllPortPins(void);
         // rs232pins: all signals bitwise coded in one byte:

include/dcBL.h

@@ -69,6 +69,8 @@ bool dcBL_sendOneBlockCpl(uint16_t blockNumber);
 
 int8_t dcBL_getBlockResult(void);
 
+void dcBL_cancelSending(void);
+
 char dcBL_cycle(void);
     // to be called cyclic every 100ms
 

include/hwapi.h

@@ -41,6 +41,8 @@ V4.0  6.9.2023: activating DC-Bootloader in slve-lib (SM)
         several new functions for "direct ticket print", without the dueway loading jsons to DC and cmd DC to print
         The same rules as before apply to the json, but it can have any arbitrary length
 
+8.10.2024 extension in dc_autoRequest()
+
 */
 
 

include/prot.h

@@ -122,6 +122,8 @@ public:
                            uint8_t  *RdDlen, uint8_t *receivedData);
         // retval: data valid, only one time true
 
+    void flushPort(void);
+    
     uint16_t getReadSource() { return readSource; } // readSource contains last command sent to device controller
     T_com *getSerialPort() { return mySerialPort; } // utility function
 

include/runProc.h

@@ -52,6 +52,7 @@ class T_runProc : public QObject
 private slots:
     void runProc_slotProcess(void);
     bool bl_performComplStart(void);
+    bool bl_waitForRdyMsg(void);
 
 public:
     T_runProc();
@@ -70,9 +71,11 @@ public:
     void bl_rebootDC(void);
     void bl_startBL(void);
     void bl_checkBL(void);
-    bool bl_isUp(void);
-
-    // new from 21.5.24 ..................................................................
+    //uint8_t bl_isUp(void);  neuere Sax-Version, bisher nicht verwendet
+        // return 1: BL is up   2: BL error  0: stopped
+    bool bl_isUp(void);	    
+        
+    void resetBLvari(void);
 
     uint16_t sys_getCustomerNumber(void);
     uint16_t sys_getMachineNumber(void);

include/shared_mem_buffer.h

@@ -241,6 +241,8 @@ struct SharedMem
     bool    Sdata_coinPaymentNow;
     bool    Sdata_bootloadingNow;
 
+    bool    Sdata_ptuInSleep;
+    bool    Sdata_dcInSleep;
 
     // ------------------ Data OUTPUT --------------------------------
 

include/tslib.h

@@ -115,6 +115,10 @@ long tslib_atol( char *AscString);
     // AscString must be 0-terminated!
     // a leading '-' is ignored, a'.' or a ',' stops calculation
 
+void swl_returnWeekdayStr(char dow, char language, char *buf);
+    // dow=1...7
+    // always returns 10byte
+    // languages: 1=german  2=english