Merge commit 'a9e69cd0c4ad3477a99becaf87b84e0d9b23538f'
This commit is contained in:
		@@ -145,9 +145,15 @@ public:
 | 
			
		||||
                     QString comPort) const override;
 | 
			
		||||
    
 | 
			
		||||
    bool dc_updatePrinterTemplate(enum FileTypeJson type,
 | 
			
		||||
                                  int templateNr,
 | 
			
		||||
                                  QString const &fname) const override;
 | 
			
		||||
                                  QVector<int> templateIdx,
 | 
			
		||||
                                  QVector<QString> fnames,
 | 
			
		||||
                                  QString br,
 | 
			
		||||
                                  QString serial) const override;
 | 
			
		||||
 | 
			
		||||
    bool dc_printTemplate(enum FileTypeJson type,
 | 
			
		||||
                          QVector<int> templateIdx,
 | 
			
		||||
                          QString br,
 | 
			
		||||
                          QString serial) const override;
 | 
			
		||||
    // ------------------------------------------------------------------------------
 | 
			
		||||
    // Level 1, control device-controller (functions of µC)
 | 
			
		||||
    // check serial connection to deviceController
 | 
			
		||||
 
 | 
			
		||||
@@ -307,9 +307,16 @@ public:
 | 
			
		||||
        // download binary file down into device controller
 | 
			
		||||
 | 
			
		||||
    virtual bool dc_updatePrinterTemplate(enum FileTypeJson type,
 | 
			
		||||
                                          int templateNr,
 | 
			
		||||
                                          QString const &fname) const = 0;
 | 
			
		||||
                       
 | 
			
		||||
                                          QVector<int> templateIdx,
 | 
			
		||||
                                          QVector<QString> fnames,
 | 
			
		||||
                                          QString br,
 | 
			
		||||
                                          QString serial) const = 0;
 | 
			
		||||
 | 
			
		||||
    virtual bool dc_printTemplate(enum FileTypeJson type,
 | 
			
		||||
                                  QVector<int> templateIdx,
 | 
			
		||||
                                  QString br,
 | 
			
		||||
                                  QString serial) const = 0;
 | 
			
		||||
 | 
			
		||||
    virtual void dc_autoRequest(bool on)  const =0;
 | 
			
		||||
        // on = true:  select that all READ-Requests are sent automatically 
 | 
			
		||||
        // on = false: select that all READ-Requests are sent manually one by one
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user