a67ff36c68
	 
				 
					 
					
						
						
							
							Add auto version generation script  
						
						 
						
						
						
						
					 
					
						2023-04-28 13:56:44 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						21fb07b81c
	 
				 
					 
					
						
						
							
							Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/DCPlugin  
						
						 
						
						
						
						
					 
					
						2023-04-19 16:27:27 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d992ee3fad 
					 
					
						
						
							
							Added dc_getStatus() to send info to ISMAS  
						
						 
						
						
						
						
					 
					
						2023-04-18 15:06:57 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b7d8fabfd0 
					 
					
						
						
							
							Added dc_getStatus() to send info to ISMAS  
						
						 
						
						
						
						
					 
					
						2023-04-18 15:06:48 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7129805f4e 
					 
					
						
						
							
							Added dc_getStatus() to send info to ISMAS  
						
						 
						
						
						
						
					 
					
						2023-04-18 15:06:36 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						01140c523b 
					 
					
						
						
							
							Using std::min from algorithm-header  
						
						 
						
						
						
						
					 
					
						2023-04-18 14:43:30 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c99d0730ce 
					 
					
						
						
							
							Added additional variables into shared memory.  
						
						 
						
						... 
						
						
						
						Cleaned source. 
						
						
					 
					
						2023-04-18 14:42:09 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						81c610c48b 
					 
					
						
						
							
							Included additional variables into shared memory  
						
						 
						
						
						
						
					 
					
						2023-04-18 14:41:05 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6ae7c06d42 
					 
					
						
						
							
							Changed to const-pointer  
						
						 
						
						
						
						
					 
					
						2023-04-18 14:40:16 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1eb2ac3a1d 
					 
					
						
						
							
							Use const-pointer  
						
						 
						
						
						
						
					 
					
						2023-04-18 13:55:46 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f3adba2f0f 
					 
					
						
						
							
							Change parameter type from uint8_t to bool  
						
						 
						
						
						
						
					 
					
						2023-04-18 13:52:43 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						652ad9b43d 
					 
					
						
						
							
							Included changes of TS for version 3.5.  
						
						 
						
						
						
						
					 
					
						2023-04-18 13:41:04 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c85b090306 
					 
					
						
						
							
							Added ulong2uchar (version 3.5).  
						
						 
						
						
						
						
					 
					
						2023-04-18 13:39:52 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						87a6ed0795 
					 
					
						
						
							
							Include changes of Thomas for version 3.5.  
						
						 
						
						... 
						
						
						
						virtual bool cash_startPayment(uint32_t amount) const=0;
        // 17.4.23TS: extended to 32bit
    virtual uint8_t prn_getPrintResult() const=0;
    // in case of print-error get detailed error:
    virtual uint8_t prn_getCurrentPrinterState() const=0;
        //        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
signals:
    virtual void hwapi_templatePrintFinished_OK(void) const=0;
    virtual void hwapi_templatePrintFinished_Err(void) const=0;
    virtual void hwapi_gotNewCoin(void) const=0;
    virtual void hwapi_vendStopByMax(void) const=0;
    virtual void hwapi_vendStopByPushbutton(void) const=0; 
						
						
					 
					
						2023-04-18 13:38:07 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						99c88c7825 
					 
					
						
						
							
							Included changes of Thomas for version 3.5.  
						
						 
						
						... 
						
						
						
						prn_getPrintResult(),
signals:
    void hwapi_templatePrintFinished_OK(void) const override;
    void hwapi_templatePrintFinished_Err(void) const override;
    void hwapi_gotNewCoin(void) const override;
    void hwapi_vendStopByMax(void) const override;
    void hwapi_vendStopByPushbutton(void) const override;
 private slots:
    void hwapi_slotPrintFinished_OK(void);
    void hwapi_slotPrintFinished_Err(void);
    void hwapi_slotGotCoin(void); 
						
						
					 
					
						2023-04-18 13:36:20 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						712ea0fc6e 
					 
					
						
						
							
							Included changes of Thomas for version 3.5 of library:  
						
						 
						
						... 
						
						
						
						datif_templatePrintFinished_OK(), datif_templatePrintFinished_Err(),
datif_gotNewCoin(). 
						
						
					 
					
						2023-04-18 13:34:05 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						86311de486 
					 
					
						
						
							
							Add use of shared memory.  
						
						 
						
						... 
						
						
						
						Add changes for version 3.4. of library. 
						
						
					 
					
						2023-04-18 12:23:18 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cb4412779f 
					 
					
						
						
							
							Added check4freeFDshortCmd.  
						
						 
						
						
						
						
					 
					
						2023-04-18 12:22:23 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a95e174356 
					 
					
						
						
							
							Included some changes of Thomas.  
						
						 
						
						
						
						
					 
					
						2023-04-18 12:21:30 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c724b5b9fb 
					 
					
						
						
							
							Shift several device controller related variables to shared memory.  
						
						 
						
						
						
						
					 
					
						2023-04-18 12:20:23 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ef7932102f 
					 
					
						
						
							
							Massive change: using shared memory containing most device controller  
						
						 
						
						... 
						
						
						
						realted variables. 
						
						
					 
					
						2023-04-18 12:19:08 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a7aa75ae5f 
					 
					
						
						
							
							Massive change: using shared memory containing devcie controller variables.  
						
						 
						
						
						
						
					 
					
						2023-04-18 12:18:12 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						dc00c69b82 
					 
					
						
						
							
							Added check4freeFDlongCmd.  
						
						 
						
						
						
						
					 
					
						2023-04-18 12:17:11 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						eeb35190e1 
					 
					
						
						
							
							Adding shared memory containing all variables necessary to  
						
						 
						
						... 
						
						
						
						check device controller related variables. 
						
						
					 
					
						2023-04-18 12:15:27 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						30338e24cc 
					 
					
						
						
							
							Changed struct T_moduleCondition.  
						
						 
						
						... 
						
						
						
						Changed struct T_dynamicCondition.
Added struct T_extTime.
Added log_chkIfVaultRecordAvailable().
Added sys_getDeviceConditions().
set version to 3.4. 
						
						
					 
					
						2023-04-18 12:12:22 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						58fdea45f0 
					 
					
						
						
							
							Added m_sharedMem.  
						
						 
						
						... 
						
						
						
						Added cash_getAmountInVault.
Added cash_getNrCoinsInVault.
Added sys_getDynMachineConditions() with new interface.
Added sys_getDeviceConditions() with new interface.
Added log_chkIfVaultRecordAvailable(). 
						
						
					 
					
						2023-04-18 12:08:52 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						df760f1a52 
					 
					
						
						
							
							Added shared_mem_buffer.h/.cpp.  
						
						 
						
						
						
						
					 
					
						2023-04-18 12:07:28 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						3e3e1efe7d 
					 
					
						
						
							
							Make sure the printer functions can be called without explicitly openeing the  
						
						 
						
						... 
						
						
						
						serial device. 
						
						
					 
					
						2023-04-14 09:04:35 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e5a8cfd1cd 
					 
					
						
						
							
							copy of include/interfaces.h  
						
						 
						
						
						
						
					 
					
						2023-04-13 16:23:56 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5e6e6017b3 
					 
					
						
						
							
							Minor change  
						
						 
						
						
						
						
					 
					
						2023-04-13 16:22:01 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f3d9c690b7 
					 
					
						
						
							
							Added dc_printTemplate. Fixed implementation of dc_updatePrinterTemplate  
						
						 
						
						
						
						
					 
					
						2023-04-13 16:18:47 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						3f10469b8f 
					 
					
						
						
							
							Added dc_printTemplate. Changed interface for updating printer templates.  
						
						 
						
						
						
						
					 
					
						2023-04-13 16:17:28 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d92bdbfb3e 
					 
					
						
						
							
							Added dc_printTemplate. Changed interface for updating printer templates.  
						
						 
						
						
						
						
					 
					
						2023-04-13 16:16:57 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						60c48588b0 
					 
					
						
						
							
							Fixed template number: cannot be 0  
						
						 
						
						
						
						
					 
					
						2023-04-13 13:54:15 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ef48301dad 
					 
					
						
						
							
							Added dc_updatePrinterTemplate  
						
						 
						
						
						
						
					 
					
						2023-04-13 13:37:32 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5f7d34ef12 
					 
					
						
						
							
							implemented dc_updatePrinterTemplate  
						
						 
						
						
						
						
					 
					
						2023-04-13 13:37:00 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						863e4b23a9 
					 
					
						
						
							
							Added dc_updatePrinterTemplate  
						
						 
						
						
						
						
					 
					
						2023-04-13 13:31:39 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						37f0012ce9 
					 
					
						
						
							
							converted to utf-8  
						
						 
						
						
						
						
					 
					
						2023-04-13 11:35:08 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						82accc4b1a 
					 
					
						
						
							
							Added file types for JSON as enum  
						
						 
						
						
						
						
					 
					
						2023-04-13 11:15:22 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c1b945225b 
					 
					
						
						
							
							Added/merged from sources of Thomas (version CashAgentLib 3.3, 12.04.2023)  
						
						 
						
						
						
						
					 
					
						2023-04-13 10:55:37 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						debade9942 
					 
					
						
						
							
							using memset() to shorten some code.  
						
						 
						
						
						
						
					 
					
						2023-04-11 13:58:11 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ffbe0dfc2e 
					 
					
						
						
							
							don't use compiler cache (at least for development)  
						
						 
						
						
						
						
					 
					
						2023-04-11 13:54:00 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8f7d4a203d 
					 
					
						
						
							
							Fixed sending to less blocks  
						
						 
						
						
						
						
					 
					
						2023-04-06 17:43:06 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						defe492ec6 
					 
					
						
						
							
							Add DCPlugin.pri to DesktopLinux  
						
						 
						
						
						
						
					 
					
						2023-04-06 08:55:43 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						002d58ba7b 
					 
					
						
						
							
							Added dc_updateDC plus associated helper functions.  
						
						 
						
						... 
						
						
						
						dc_open_Serial:
    check if serial line is really open
dc_close_Serial:
    check if serial line is really closed
dc_isPortOpen:
    check if port is open directly on serial-object
bl_checkBL:
    try to check if bootloader is running 
						
						
					 
					
						2023-04-05 14:18:29 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						76f54cdc0c 
					 
					
						
						
							
							Added qDebug(), which are commented out.  
						
						 
						
						
						
						
					 
					
						2023-04-05 14:16:34 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						591fd89cb5 
					 
					
						
						
							
							Added qDebug() which are commented out:  
						
						 
						
						... 
						
						
						
						ser_ISR100ms()
    open_serial_port
    close_serial_port 
						
						
					 
					
						2023-04-05 14:13:17 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e7723f669f 
					 
					
						
						
							
							Added internal helpers for supporting dcUpdate:  
						
						 
						
						... 
						
						
						
						DownloadResult sendNextAddress(int bNum) const;
    DownloadResult sendNextDataBlock(QByteArray const &b, int bNum) const;
    DownloadResult sendStatus(int ret) const;
    DownloadResult dc_downloadBinary(QByteArray const &binary) const;
    bool startBootloader() const;
    bool stopBootloader() const;
    bool openSerial(int br, QString baudrate, QString comPort) const;
    bool closeSerial(QString comport) const;
    bool resetDeviceController() const;
    QByteArray loadBinaryDCFile(QString filename) const;
    bool downloadBinaryToDC(QString const &bFile) const;
Redeclared returning "bool":
    dc_openSerial
    dc_closeSerial
    bl_checkDL.
    Added dc_updateDC(...). 
						
						
					 
					
						2023-04-05 14:08:16 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d0e1be11b6 
					 
					
						
						
							
							Added helper getSerialPort()  
						
						 
						
						
						
						
					 
					
						2023-04-05 14:07:18 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f63798727f 
					 
					
						
						
							
							Added helper getProt()  
						
						 
						
						
						
						
					 
					
						2023-04-05 14:06:38 +02:00