a5dd9af29a 
					 
					
						
						
							
							Add System::allowedJsonFiles to name default JSON file names.  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-14 12:45:43 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5124e1cca6 
					 
					
						
						
							
							Use return value of type std::optional<QString> for  
						
						 
						
						... 
						
						
						
						checkForUSBStick() and getUSBMountPath().
Add getJsonFilesOnUsbStick(). 
						
						
							
						
					 
					
						2024-05-14 12:43:46 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						fc75585de3 
					 
					
						
						
							
							Parse psa-config-directory and psa-tariff-directory.  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-14 12:40:32 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1964b08349 
					 
					
						
						
							
							doUpdate(): use parameter 'usbStickDetected' to use the correct JSON  
						
						 
						
						... 
						
						
						
						filenames. 
						
						
							
						
					 
					
						2024-05-14 12:38:31 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c0d014644c 
					 
					
						
						
							
							Update (conf) JSON-Files using USB stick. When plugged in, look for  
						
						 
						
						... 
						
						
						
						JSON-files in directory psa-config-directory and load them to the PSA.
Note: these files are overwritten during a usual ISMAS-update if not
checked in into the customer repository. 
						
						
							
						
					 
					
						2024-05-14 12:35:18 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b24c50c572 
					 
					
						
						
							
							Parse psa-config-directory and psa-tariff-directory settings.  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-14 12:33:40 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bbdadc9063 
					 
					
						
						
							
							Include psa_config_directory and psa_tariff_directory settings.  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-14 12:32:26 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						dc7f839d3f 
					 
					
						
						
							
							Include ATBUpdateTool.ini  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-14 12:31:19 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0a33d078be 
					 
					
						
						
							
							Set version to 1.4.8  
						
						 
						
						
						
						
							
  1.4.8
 
						
					 
					
						2024-05-08 16:20:54 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1d64769094 
					 
					
						
						
							
							Fix: shift jsonNr by 1 in checkDownloadedJsonVersions(); print-templates start now with 6 instead of 5.  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-08 16:17:28 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2e3af64c02 
					 
					
						
						
							
							getFileVersion(): use only 16 byte of buffer filled by DC with version-info  
						
						 
						
						... 
						
						
						
						of JSON-file. 
						
						
							
						
					 
					
						2024-05-08 16:16:13 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f8472a3b87 
					 
					
						
						
							
							call update.checkJsonVersions(filesToUpdate) after doUpdate().  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-08 16:10:20 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						24addad11e 
					 
					
						
						
							
							Implement getFileversion().  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-08 16:09:18 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5a8298a078 
					 
					
						
						
							
							Implemented checkJsonVersions().  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-08 16:08:53 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						52af7894db 
					 
					
						
						
							
							Minor: remove useless assignments.  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-08 16:08:01 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a6592ffd3e 
					 
					
						
						
							
							Check m_hw for nullprt.  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-08 16:07:27 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						696db7de39 
					 
					
						
						
							
							Don't call exit(), but return nullptr.  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-08 16:06:14 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b31588bfab 
					 
					
						
						
							
							checkJsonVersions(): provide default parameters  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-08 16:04:53 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6651920f4a 
					 
					
						
						
							
							Merge branch 'release_1.4.6'  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-06 11:29:29 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ef800366e1
	 
				 
					 
					
						
						
							
							Make compile with yocto/bitbake  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-06 10:59:31 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1acec4d876 
					 
					
						
						
							
							revert to original version of the file (tag: 1.4.7)  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-06 10:28:43 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						46c481b862 
					 
					
						
						
							
							Add worker_thread.h/.cpp  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-06 06:25:03 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8945ead5d6 
					 
					
						
						
							
							set setting for opening serial device  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-06 06:24:25 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bc064c38c6 
					 
					
						
						
							
							use only one thread  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-06 06:23:52 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f741fb96f9 
					 
					
						
						
							
							start main sources  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-05 17:26:34 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8d1c719626 
					 
					
						
						
							
							form fir mainwindow  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-05 17:25:07 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b5389a599e 
					 
					
						
						
							
							add main window  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-05 17:24:28 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ea2f42beed 
					 
					
						
						
							
							Add gui-form and sneder/receiver-thread source.  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-05 17:23:08 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						22e751e197 
					 
					
						
						
							
							Minor: add comment  
						
						 
						
						
						
						
							
  1.4.7
 
						
					 
					
						2024-05-03 13:35:33 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						05c7d11ef8 
					 
					
						
						
							
							Only create m_update-object if it is configured to update hardware (JSONs and DC).  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-03 13:32:39 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						63dc70dda9 
					 
					
						
						
							
							Check if it has to be possible to update hardware (JSONs, DC). If yes, then exit().  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-03 13:31:04 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e5ab9b98cd 
					 
					
						
						
							
							Set Version to 1.4.7  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-03 13:14:57 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4477647acf 
					 
					
						
						
							
							Check m_hw before its use  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-03 13:11:33 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d64b029a2d 
					 
					
						
						
							
							loadDCPlugin(): never call exit() inside a library.  
						
						 
						
						
						
						
							
						
					 
					
						2024-05-03 13:08:25 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e24022a612 
					 
					
						
						
							
							Set version to 1.4.6. Fix: do not send all jsons down to DC unconditionally  
						
						 
						
						
						
						
							
  1.4.6
 
						
					 
					
						2024-04-29 15:05:10 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						60d78790ba 
					 
					
						
						
							
							Minor: remove trailing ")" in msg  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-29 15:03:43 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						543e712c62 
					 
					
						
						
							
							Minor: Replace trailing ","  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-29 15:02:37 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8402fde6b5 
					 
					
						
						
							
							Reformat m_versionInfo in case a version is included in the commit-message.  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-29 15:00:52 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f15cc636c6 
					 
					
						
						
							
							FIX: set m_pulledNewBranch = false in case no new branch has to be fetched from remote repository.  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-29 14:59:10 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						adaa12395e 
					 
					
						
						
							
							Trigger CHECK_ISMAS_TRIGGER_SUCCESS-message to ISMAS.  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-29 14:58:29 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						853c29e448 
					 
					
						
						
							
							Set result code NO_UPDATE_NECESSARY instead of just SUCCESS.  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-29 14:54:27 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						78c214ceb4 
					 
					
						
						
							
							CHECK_ISMAS_TRIGGER_SUCCESS: send message to ISMAS if WAIT-button as been set to "WAIT".  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-29 14:52:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						88bec387c5 
					 
					
						
						
							
							Minor: formatted code for readability.  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-29 14:50:43 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						05b68f21c2 
					 
					
						
						
							
							Add System.h/System.cpp -> to be adapted later  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-26 13:05:19 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9ca394db46 
					 
					
						
						
							
							Begin with fetching versions of downloaded json-files.  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-26 13:03:10 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0d268a1d9d 
					 
					
						
						
							
							set INCLUDEPATH to use System.h/.cpp  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-26 13:02:12 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						da102b5ed0 
					 
					
						
						
							
							Set version to 1.4.6  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-26 12:53:30 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7031c0e349 
					 
					
						
						
							
							Replace INSTALL_ERROR with proper error codes.  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-26 12:49:06 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c528ce377d 
					 
					
						
						
							
							Add some new messages sent to ISMAS.  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-26 12:47:44 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5e7c848fca 
					 
					
						
						
							
							Replaced INSTALL_ERROR by proper error codes.  
						
						 
						
						
						
						
							
						
					 
					
						2024-04-26 12:47:13 +02:00