Compare commits
	
		
			404 Commits
		
	
	
		
			v1.3.21
			...
			dc-downloa
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 0fe9ebef66 | |||
| d15593c7aa | |||
| 6f60265c74 | |||
| 1c10d9bc14 | |||
| 0bca22f995 | |||
| 67eeade609 | |||
| 559298331b | |||
| 4f1efcf5cf | |||
| 3047df8130 | |||
| c783b7a967 | |||
| e4be41e670 | |||
| b2ecd1b628 | |||
| fb4da1f208 | |||
| ec4e327899 | |||
| 8621c1dd17 | |||
| 0ddfc1d7e3 | |||
| e95f034538 | |||
| 72fbd9089a | |||
| 3bdc117c01 | |||
| 12eafc2878 | |||
| 9abe718010 | |||
| 3b6f22e93b | |||
| 34cc077937 | |||
| ba1b2263d2 | |||
| 1f99618ba5 | |||
| df4e384d9d | |||
| ede8a9519f | |||
| 903977bdd1 | |||
| 775e9b7b8a | |||
| a8fdd29666 | |||
| 70d0ffb38d | |||
| f623b36421 | |||
| f415406672 | |||
| 2c1afa463f | |||
| 927b488582 | |||
| 7712803ad6 | |||
| bc88a9b0be | |||
| 8b3f0991f7 | |||
| 8123526e11 | |||
| 57a093e9ae | |||
| 10536c81a5 | |||
| 659dc69831 | |||
| a47dd60e9e | |||
| 575a740692 | |||
| e22d78cba8 | |||
| ad8b9f26c0 | |||
| 5b5a4504fa | |||
| 9ed8603dfb | |||
| 7d367f7fa9 | |||
| fc306a45f7 | |||
| df6f33a259 | |||
| 716543ec8c | |||
| 0f355c0c50 | |||
| 36a4d53df6 | |||
| b9e9688269 | |||
| f5611cf826 | |||
| 8d5831286d | |||
| 2ab485454c | |||
| cbb81b7260 | |||
| 487bbb8160 | |||
| d36c7c1f72 | |||
| cf3e1d61dd | |||
| e12181dc5a | |||
| d1b3b81972 | |||
| ac03f4ae91 | |||
| 0c0debb790 | |||
| 6fc62863c1 | |||
| 0dd731ff50 | |||
| 19445ec4f5 | |||
| 739010ba59 | |||
| 7ace073d12 | |||
| e36ff70dd9 | |||
| 57e65e2234 | |||
| 79af890be6 | |||
| 24b83840cd | |||
| 53946457ab | |||
| c3947e49ab | |||
| 7ecd45b547 | |||
| e7d8365c62 | |||
| c304d1a78b | |||
| a8d4ae3aee | |||
| 0fe318b291 | |||
| ec08e04f2c | |||
| b26b65ee76 | |||
| 674b572da5 | |||
| 9a6ac85f99 | |||
| ae582b75d5 | |||
| 3069c3bd65 | |||
| b5067ce044 | |||
| 3573279dfa | |||
| 39b5551e90 | |||
| 05974fd8ee | |||
| 2189684cad | |||
| f4d785ea9d | |||
| 5bae9fcdf1 | |||
| eddf67739a | |||
| cb28bd2a1f | |||
| 618430bcc5 | |||
| 037b91b889 | |||
| 96e3b606ef | |||
| 5d3849dcf3 | |||
| 8c66e03ea3 | |||
| 43f60251ef | |||
| 226dbbd050 | |||
| 6cd14d6559 | |||
| 4c8c3ed3c0 | |||
| 7258976528 | |||
| d7a4d98a29 | |||
| c339941585 | |||
| 744ad52c89 | |||
| 87ce6a7d54 | |||
| b25b66395f | |||
| de9182bdc9 | |||
| af83c11f73 | |||
| 7cdefc9b49 | |||
| dd0d7790e0 | |||
| b23314a1f3 | |||
| 9f1f41e4b6 | |||
| 522f86aaac | |||
| 13259ba86e | |||
| 63a959315b | |||
| c05db3b323 | |||
| bc21ede1a1 | |||
| 8db818f6cd | |||
| ef9cc23093 | |||
| 3a259f8a22 | |||
| b270a9f30e | |||
| 238f2498b7 | |||
| 44585f2c59 | |||
| c98b01d002 | |||
| 31aa7c0584 | |||
| f750f76dbb | |||
| aa88a040ba | |||
| 3358e1a0d4 | |||
| ea1d858f15 | |||
| 7b4bee524f | |||
| b6f0615e9c | |||
| fbedaab3fe | |||
| 8a482e328c | |||
| f67b4bfa6f | |||
| f1aad81a0c | |||
| 8f822c5383 | |||
| 7bfb7f5a3b | |||
| 2ec7b61682 | |||
| 75b0b83174 | |||
| 79e2405738 | |||
| 0ebf8b095a | |||
| 11524b8389 | |||
| 6663866743 | |||
| 12aa9a734a | |||
| 9b6f5db8fe | |||
| 061c57ef51 | |||
| e82417dde7 | |||
| 1e271201c5 | |||
| da66d75a45 | |||
| 7accabfa53 | |||
| 201a1cbab9 | |||
| 9a9cce126a | |||
| da0fa54d28 | |||
| 1433c107b3 | |||
| 8e0732cf95 | |||
| 8f6e1fdae7 | |||
| 0d00faf493 | |||
| 5beb235d92 | |||
| a4bb993217 | |||
| 50357997c2 | |||
| c02f0b08ed | |||
| 5da1eff41a | |||
| af89c9fbc1 | |||
| fa7d1ba879 | |||
| 1dc7578645 | |||
| cd30cc91f0 | |||
| 6683b925aa | |||
| 336d208906 | |||
| 2da3c34d84 | |||
| 8f0a9112d6 | |||
| 25bf905a79 | |||
| 
						
						
							
						
						5d141b7234
	
				 | 
					
					
						|||
| ebb170123e | |||
| 
						
						
							
						
						96bb70cfe9
	
				 | 
					
					
						|||
| 
						
						
							
						
						8c1da92ff4
	
				 | 
					
					
						|||
| 3e1a4ab09c | |||
| ee203e7672 | |||
| 55c82eb509 | |||
| f60cd9e4ef | |||
| a9fb7a3630 | |||
| db82f2af0d | |||
| 8b2e2d2086 | |||
| 5870f61395 | |||
| aaa0f1e76c | |||
| 0d9a224977 | |||
| d191020caa | |||
| 2b68242d04 | |||
| bd785e7df1 | |||
| f2534c7763 | |||
| d2a6ae239d | |||
| 19273daa55 | |||
| ca67d1d159 | |||
| 7c3e4ea497 | |||
| f8897c2950 | |||
| 94a658ce8a | |||
| 9d9865e3c7 | |||
| a7d5a8f5cd | |||
| cafd16a744 | |||
| 5876c50a32 | |||
| 3b2200c0bf | |||
| e8070a9e16 | |||
| da10d6c2f6 | |||
| c52b276722 | |||
| e9cb421ac5 | |||
| a3aef7594e | |||
| afbcccf785 | |||
| 90e4e21391 | |||
| 4536284f34 | |||
| a3a4c09c7f | |||
| a5dd9af29a | |||
| 5124e1cca6 | |||
| fc75585de3 | |||
| 1964b08349 | |||
| c0d014644c | |||
| b24c50c572 | |||
| bbdadc9063 | |||
| dc7f839d3f | |||
| 0a33d078be | |||
| 1d64769094 | |||
| 2e3af64c02 | |||
| f8472a3b87 | |||
| 24addad11e | |||
| 5a8298a078 | |||
| 52af7894db | |||
| a6592ffd3e | |||
| 696db7de39 | |||
| b31588bfab | |||
| 6651920f4a | |||
| 
						
						
							
						
						ef800366e1
	
				 | 
					
					
						|||
| 1acec4d876 | |||
| 46c481b862 | |||
| 8945ead5d6 | |||
| bc064c38c6 | |||
| f741fb96f9 | |||
| 8d1c719626 | |||
| b5389a599e | |||
| ea2f42beed | |||
| 22e751e197 | |||
| 05c7d11ef8 | |||
| 63dc70dda9 | |||
| e5ab9b98cd | |||
| 4477647acf | |||
| d64b029a2d | |||
| e24022a612 | |||
| 60d78790ba | |||
| 543e712c62 | |||
| 8402fde6b5 | |||
| f15cc636c6 | |||
| adaa12395e | |||
| 853c29e448 | |||
| 78c214ceb4 | |||
| 88bec387c5 | |||
| 05b68f21c2 | |||
| 9ca394db46 | |||
| 0d268a1d9d | |||
| da102b5ed0 | |||
| 7031c0e349 | |||
| c528ce377d | |||
| 5e7c848fca | |||
| 3165d77f49 | |||
| f0d2d5f958 | |||
| 1da4c3b224 | |||
| f1cedbf1d5 | |||
| 0933274c82 | |||
| 2aa676f18c | |||
| 6c0d49b90c | |||
| 18d04d15cf | |||
| b81120f8dc | |||
| 8b2fcb25db | |||
| 698cf74516 | |||
| 20681b0d6c | |||
| 763647c145 | |||
| 4aad14b181 | |||
| 0a03228dea | |||
| 23551066c1 | |||
| 24f2ba7c44 | |||
| 2ed6768953 | |||
| a1327388bc | |||
| 8d18ae10fe | |||
| 31bc2d0fa2 | |||
| 175b8fd3a1 | |||
| a57fa6c31e | |||
| c22c924e38 | |||
| bdc64920a2 | |||
| 7bc9fa0c04 | |||
| 334da1fe4a | |||
| e5054582c2 | |||
| bbd287c92b | |||
| 5c152c9dc2 | |||
| 367ffaa3a1 | |||
| 2fd004f249 | |||
| 721a156fce | |||
| b7576d04e1 | |||
| 753954ecd7 | |||
| df7cabe2c1 | |||
| cfca8d2ef4 | |||
| 829932f29d | |||
| 8968667c23 | |||
| a5e0154757 | |||
| f346390631 | |||
| c77fa097c1 | |||
| 074e60d8dc | |||
| 8eff6e5d10 | |||
| 4233ca8637 | |||
| 68fc83ba67 | |||
| 052028afe8 | |||
| a240711946 | |||
| 75fdca95d9 | |||
| 9b087f62f9 | |||
| 7d38cc1269 | |||
| f5baad16d5 | |||
| b35e6812aa | |||
| d7e709d997 | |||
| 4d93aa1392 | |||
| b0f1e0a493 | |||
| 0dffc1d1c2 | |||
| 3581dd4b1d | |||
| 8d2d7bbb15 | |||
| e2e7c0772d | |||
| 807cea1042 | |||
| 80712964ef | |||
| 978e98b2ee | |||
| 44c2820130 | |||
| 123f22cd21 | |||
| b60af1a4fc | |||
| bb3ecc4b76 | |||
| fa30fe045b | |||
| bae014822d | |||
| 6c472b542e | |||
| 7578746d2f | |||
| 0b1ed62df1 | |||
| 76ec41c291 | |||
| 630cd36f13 | |||
| cbe8bb7aeb | |||
| e04636e3f7 | |||
| 728185ddb9 | |||
| aaa485e2fc | |||
| 9a9480035b | |||
| 0a43654f9b | |||
| 4dba36a420 | |||
| f9ce6a6c1b | |||
| c2c6bc3f8a | |||
| 8c02ebcf15 | |||
| 100bfd63ab | |||
| 23ff4977d9 | |||
| 8da6443833 | |||
| 6b3ebde2b5 | |||
| 41392a98e3 | |||
| 1c9bb11f0b | |||
| ec0e687c21 | |||
| e040e784fc | |||
| d2300b87c6 | |||
| 0dff2ece75 | |||
| db24853062 | |||
| 530ea33460 | |||
| 005e4d249f | |||
| 1c0786e28c | |||
| 0aa8d9ba5a | |||
| 1ecb844b64 | |||
| 9a687e6628 | |||
| 979afa37d3 | |||
| 1e1820724d | |||
| d90954c6eb | |||
| cf77d0ff76 | |||
| 73d02d214a | |||
| 6a67d8e9b0 | |||
| 30d8cc3684 | |||
| bc9ebb7d68 | |||
| e6f6d43bf2 | |||
| 854c8b9706 | |||
| d521fd977a | |||
| ebbdc2f864 | |||
| 62496c5d95 | |||
| edd606fe78 | |||
| 1748c35c45 | |||
| 4c46932a3c | |||
| 686e113c3a | |||
| 6ddfbbfd9e | |||
| 7bfbdc0f07 | |||
| dd591fdd23 | |||
| 18c7b656c3 | |||
| 5e9b05e887 | |||
| 37aae73f21 | |||
| 0b4eed9dc0 | |||
| 12f48ad1bb | |||
| 5d7d1a2870 | |||
| 5d7f13a254 | |||
| d332a990d5 | |||
| bfa39eb3df | |||
| d7fcfa3d0f | |||
| f1e449c108 | |||
| 32346c2665 | |||
| 38e7bf4985 | |||
| 6df73e1082 | |||
| 19250a0a2f | |||
| 6f5c8103e4 | |||
| 07dcf0ba30 | |||
| 1e379cf086 | 
							
								
								
									
										4
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,4 @@
 | 
				
			|||||||
 | 
					tags
 | 
				
			||||||
 | 
					*.tags
 | 
				
			||||||
 | 
					*.user
 | 
				
			||||||
 | 
					documentation/
 | 
				
			||||||
@@ -1,9 +1,12 @@
 | 
				
			|||||||
[REPOSITORY_URL]
 | 
					[REPOSITORY_URL]
 | 
				
			||||||
repository-url="https://git.mimbach49.de/GerhardHoffmann"
 | 
					repository-url="gitea@ptu-config.atb-comm.de:ATB"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[DIRECTORIES]
 | 
					[DIRECTORIES]
 | 
				
			||||||
plugin-directory="/usr/lib/"
 | 
					plugin-directory="/usr/lib/"
 | 
				
			||||||
working-directory="/opt/app/tools/atbupdate/"
 | 
					working-directory="/opt/app/tools/atbupdate/"
 | 
				
			||||||
 | 
					psa-config-directory="etc/psa_config/"
 | 
				
			||||||
 | 
					psa-tariff-directory="etc/psa_tariff/"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[PLUGINS]
 | 
					[PLUGINS]
 | 
				
			||||||
plugin-name="libCAslave.so"
 | 
					plugin-name="libCAslave.so"
 | 
				
			||||||
@@ -14,5 +17,23 @@ dry-run=false
 | 
				
			|||||||
extended-version=false
 | 
					extended-version=false
 | 
				
			||||||
yocto-version=false
 | 
					yocto-version=false
 | 
				
			||||||
yocto-install=false
 | 
					yocto-install=false
 | 
				
			||||||
always-download-config=false
 | 
					always-download-config=true
 | 
				
			||||||
always-download-dc=false
 | 
					always-download-dc=false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[ATBUpdateCheck]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[ATBUpdateDC]
 | 
				
			||||||
 | 
					debug=true
 | 
				
			||||||
 | 
					workingDir=/tmp
 | 
				
			||||||
 | 
					libca=/usr/lib/libCAslave.so
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[ATBUpdateGit]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[ATBUpdateJsonFiles]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[ATBUpdateOpkg]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[ATBUpdateShow]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[ATBUpdateSync]
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										3
									
								
								ATBUpdateTool.pro
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								ATBUpdateTool.pro
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					TEMPLATE = subdirs
 | 
				
			||||||
 | 
					CONFIG += ordered
 | 
				
			||||||
 | 
					SUBDIRS = Check Show DownloadDCFirmware DownloadDCJsonFiles Git Opkg Sync UpdatePTUDevCtrl
 | 
				
			||||||
							
								
								
									
										82
									
								
								Check/Check.pro
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										82
									
								
								Check/Check.pro
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,82 @@
 | 
				
			|||||||
 | 
					QT += core
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TARGET = ATBUpdateCheck
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					VERSION="1.0.0"
 | 
				
			||||||
 | 
					win32 {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date /t")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("time /t")
 | 
				
			||||||
 | 
					} else {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date +%d-%m-%y")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("date +%H:%M:%S")
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					INCLUDEPATH += \
 | 
				
			||||||
 | 
					    plugins \
 | 
				
			||||||
 | 
					    $${INCLUDEINTERFACES} \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../common/include
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CONFIG += c++17
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# keep comments, as /* fall through */
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -C
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -g
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					    CONFIG += link_pkgconfig
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
 | 
				
			||||||
 | 
					    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5_YOCTO ) {
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, DesktopLinux ) {
 | 
				
			||||||
 | 
					    # QMAKE_CC = ccache $$QMAKE_CC
 | 
				
			||||||
 | 
					    # QMAKE_CXX = ccache $$QMAKE_CXX
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
 | 
				
			||||||
 | 
					    ARCH = DesktopLinux
 | 
				
			||||||
 | 
					    DEFINES+=DesktopLinux
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					SOURCES += \
 | 
				
			||||||
 | 
					        main.cpp \
 | 
				
			||||||
 | 
					        ismas_client.cpp \
 | 
				
			||||||
 | 
					        message_handler.cpp \
 | 
				
			||||||
 | 
					        ../common/src/utils_internal.cpp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					HEADERS += \
 | 
				
			||||||
 | 
					        ismas_client.h \
 | 
				
			||||||
 | 
					        message_handler.h \
 | 
				
			||||||
 | 
					        ../common/include/utils_internal.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					##########################################################################################
 | 
				
			||||||
 | 
					# for running program on target through QtCreator
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					   qnx: target.path = /tmp/$${TARGET}/bin
 | 
				
			||||||
 | 
					   else: unix:!android: target.path = /opt/app/tools/atbupdate/
 | 
				
			||||||
 | 
					   !isEmpty(target.path): INSTALLS += target
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										378
									
								
								Check/ismas_client.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										378
									
								
								Check/ismas_client.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,378 @@
 | 
				
			|||||||
 | 
					#ifdef __WIN32__
 | 
				
			||||||
 | 
					#error "WIN32 NOT SUPPORTED"
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "ismas_client.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <cstring>
 | 
				
			||||||
 | 
					#include <cstdio>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <errno.h>
 | 
				
			||||||
 | 
					#include <arpa/inet.h> // inet_addr()
 | 
				
			||||||
 | 
					#include <netdb.h>
 | 
				
			||||||
 | 
					#include <stdio.h>
 | 
				
			||||||
 | 
					#include <stdlib.h>
 | 
				
			||||||
 | 
					#include <netinet/in.h>
 | 
				
			||||||
 | 
					#include <netinet/tcp.h>
 | 
				
			||||||
 | 
					#include <string.h>
 | 
				
			||||||
 | 
					#include <strings.h> // bzero()
 | 
				
			||||||
 | 
					#include <sys/socket.h>
 | 
				
			||||||
 | 
					#include <unistd.h> // read(), write(), close()
 | 
				
			||||||
 | 
					#include <fcntl.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QThread>
 | 
				
			||||||
 | 
					#include <QJsonDocument>
 | 
				
			||||||
 | 
					#include <QJsonObject>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					########################
 | 
				
			||||||
 | 
					# Spec vom 27.10.2023:
 | 
				
			||||||
 | 
					# U0010 -> %-Werte
 | 
				
			||||||
 | 
					# U0001 -> 100%
 | 
				
			||||||
 | 
					# U0003 -> "FAIL"
 | 
				
			||||||
 | 
					# U0002 -> "" (OK -> WAIT state reset)
 | 
				
			||||||
 | 
					# ISMAS -> "WAIT"
 | 
				
			||||||
 | 
					########################
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# $1: EVENT: U0001 update finished: 100%
 | 
				
			||||||
 | 
					#            U0002 reset TRG
 | 
				
			||||||
 | 
					#            U0003 error
 | 
				
			||||||
 | 
					#            U0010 for update process
 | 
				
			||||||
 | 
					# $2: PERCENT : "only for ISMAS: 0-100%",
 | 
				
			||||||
 | 
					# $3: RESULTCODE : "only for ISMAS",
 | 
				
			||||||
 | 
					#   0: Success
 | 
				
			||||||
 | 
					#   1: no Update nessesary
 | 
				
			||||||
 | 
					#   2: Backup failed
 | 
				
			||||||
 | 
					#   3: Package error/ Wrong package
 | 
				
			||||||
 | 
					#   4: Install Error
 | 
				
			||||||
 | 
					# $4: STEP : "running step (only for us): update_psa...",
 | 
				
			||||||
 | 
					# $5: STEP_RESULT : "error and result text",
 | 
				
			||||||
 | 
					# $6: VERSION : "opkg and conf info; what will be updated"
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void IsmasClient::printDebugMessage(int port,
 | 
				
			||||||
 | 
					                                    QString const &clientIP,
 | 
				
			||||||
 | 
					                                    int clientPort,
 | 
				
			||||||
 | 
					                                    QString const &message) {
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					    Q_UNUSED(port);
 | 
				
			||||||
 | 
					    Q_UNUSED(clientIP);
 | 
				
			||||||
 | 
					    Q_UNUSED(clientPort);
 | 
				
			||||||
 | 
					    Q_UNUSED(message);
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					    qDebug().noquote()
 | 
				
			||||||
 | 
					        << "\n"
 | 
				
			||||||
 | 
					        << "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
 | 
				
			||||||
 | 
					        << "hostname ........" << "127.0.0.1"  << "\n"
 | 
				
			||||||
 | 
					        << "port ............" << port << "\n"
 | 
				
			||||||
 | 
					        << "local address ..." << clientIP << "\n"
 | 
				
			||||||
 | 
					        << "local port ......" << clientPort << "\n"
 | 
				
			||||||
 | 
					        << message;
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void IsmasClient::printInfoMessage(int port,
 | 
				
			||||||
 | 
					                                   QString const &clientIP,
 | 
				
			||||||
 | 
					                                   int clientPort,
 | 
				
			||||||
 | 
					                                   QString const &message) {
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					    Q_UNUSED(port);
 | 
				
			||||||
 | 
					    Q_UNUSED(clientIP);
 | 
				
			||||||
 | 
					    Q_UNUSED(clientPort);
 | 
				
			||||||
 | 
					    Q_UNUSED(message);
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					    qInfo().noquote()
 | 
				
			||||||
 | 
					        << "\n"
 | 
				
			||||||
 | 
					        << "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
 | 
				
			||||||
 | 
					        << "hostname ........" << "127.0.0.1"  << "\n"
 | 
				
			||||||
 | 
					        << "port ............" << port << "\n"
 | 
				
			||||||
 | 
					        << "local address ..." << clientIP << "\n"
 | 
				
			||||||
 | 
					        << "local port ......" << clientPort << "\n"
 | 
				
			||||||
 | 
					        << message;
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void IsmasClient::printErrorMessage(int port,
 | 
				
			||||||
 | 
					                                    QString const &clientIP,
 | 
				
			||||||
 | 
					                                    int clientPort,
 | 
				
			||||||
 | 
					                                    QString const &message) {
 | 
				
			||||||
 | 
					    qCritical().noquote()
 | 
				
			||||||
 | 
					        << "\n"
 | 
				
			||||||
 | 
					        << "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
 | 
				
			||||||
 | 
					        << "hostname ........" << "127.0.0.1"  << "\n"
 | 
				
			||||||
 | 
					        << "port ............" << port << "\n"
 | 
				
			||||||
 | 
					        << "local address ..." << clientIP << "\n"
 | 
				
			||||||
 | 
					        << "local port ......" << clientPort << "\n"
 | 
				
			||||||
 | 
					        << message;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					std::optional<QString>
 | 
				
			||||||
 | 
					IsmasClient::sendRequestReceiveResponse(int port, QString const &request, bool verbose) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (verbose) {
 | 
				
			||||||
 | 
					        qInfo() << "REQUEST" << request;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int sockfd;
 | 
				
			||||||
 | 
					    int r;
 | 
				
			||||||
 | 
					    errno = 0;
 | 
				
			||||||
 | 
					    // socket create and verification
 | 
				
			||||||
 | 
					    if ((sockfd = ::socket(AF_INET, SOCK_STREAM, 0)) == -1) {
 | 
				
			||||||
 | 
					        if (verbose) {
 | 
				
			||||||
 | 
					            qCritical().noquote()
 | 
				
			||||||
 | 
					                << "\n"
 | 
				
			||||||
 | 
					                << "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
 | 
				
			||||||
 | 
					                << "SOCKET CREATION FAILED (" << strerror(errno) << ")";
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return std::nullopt;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    struct sockaddr_in servAddr;
 | 
				
			||||||
 | 
					    bzero(&servAddr, sizeof(servAddr));
 | 
				
			||||||
 | 
					    // assign IP, PORT
 | 
				
			||||||
 | 
					    servAddr.sin_family = AF_INET;
 | 
				
			||||||
 | 
					    servAddr.sin_addr.s_addr = inet_addr("127.0.0.1");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    servAddr.sin_port = htons(port);
 | 
				
			||||||
 | 
					    // connect the client socket to server socket
 | 
				
			||||||
 | 
					    if ((r = ::connect(sockfd, (struct sockaddr *)(&servAddr), sizeof(servAddr))) != 0) {
 | 
				
			||||||
 | 
					        if (verbose) {
 | 
				
			||||||
 | 
					            qCritical().noquote()
 | 
				
			||||||
 | 
					                << "\n"
 | 
				
			||||||
 | 
					                << "SEND-REQUEST-RECEIVE-RESPONSE ..." << "\n"
 | 
				
			||||||
 | 
					                << "CONNECTION WITH SERVER FAILED (" << strerror(r) << ")";
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        ::close(sockfd);
 | 
				
			||||||
 | 
					        return std::nullopt;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    struct sockaddr_in clientAddr;
 | 
				
			||||||
 | 
					    bzero(&clientAddr, sizeof(clientAddr));
 | 
				
			||||||
 | 
					    socklen_t sockLen = sizeof(clientAddr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    char clientIP[16];
 | 
				
			||||||
 | 
					    bzero(&clientIP, sizeof(clientIP));
 | 
				
			||||||
 | 
					    getsockname(sockfd, (struct sockaddr *)(&clientAddr), &sockLen);
 | 
				
			||||||
 | 
					    inet_ntop(AF_INET, &clientAddr.sin_addr, clientIP, sizeof(clientIP));
 | 
				
			||||||
 | 
					    unsigned int clientPort = ntohs(clientAddr.sin_port);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (verbose) {
 | 
				
			||||||
 | 
					        printDebugMessage(port, clientIP, clientPort, QString("CONNECTED TO SERVER"));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    struct timeval tv;
 | 
				
			||||||
 | 
					    tv.tv_sec = 10;  /* 10 secs timeout for read and write */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    struct linger so_linger;
 | 
				
			||||||
 | 
					    so_linger.l_onoff = 1;
 | 
				
			||||||
 | 
					    so_linger.l_linger = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int maxfdp1;
 | 
				
			||||||
 | 
					    fd_set rset;
 | 
				
			||||||
 | 
					    fd_set wset;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &so_linger, sizeof(so_linger));
 | 
				
			||||||
 | 
					    // no reliable, but does not harm, as we use select() as well
 | 
				
			||||||
 | 
					    setsockopt(sockfd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
 | 
				
			||||||
 | 
					    setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
 | 
				
			||||||
 | 
					    int flag = 1;
 | 
				
			||||||
 | 
					    setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    static char buf[1024*8];
 | 
				
			||||||
 | 
					    bzero(buf, sizeof(buf));
 | 
				
			||||||
 | 
					    int const bytesToWrite = strlen(request.toStdString().c_str());
 | 
				
			||||||
 | 
					    strncpy(buf, request.toStdString().c_str(), sizeof(buf)-1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int loop = 0;
 | 
				
			||||||
 | 
					    int bytesWritten = 0;
 | 
				
			||||||
 | 
					    while (bytesWritten < bytesToWrite) {
 | 
				
			||||||
 | 
					        errno = 0;
 | 
				
			||||||
 | 
					        FD_ZERO(&wset);
 | 
				
			||||||
 | 
					        FD_SET(sockfd, &wset);
 | 
				
			||||||
 | 
					        maxfdp1 = sockfd + 1;
 | 
				
			||||||
 | 
					        tv.tv_sec = 60;  /* 60 secs timeout for read and write -> APISM cuts the connection after 30s */
 | 
				
			||||||
 | 
					        tv.tv_usec = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        int const w = select(maxfdp1, NULL, &wset, NULL, &tv);
 | 
				
			||||||
 | 
					        if (w < 0) { // error
 | 
				
			||||||
 | 
					            if (errno == EINTR) {
 | 
				
			||||||
 | 
					                printErrorMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                    QString("INTERRUPTED BY SIGNAL (1) (") + strerror(errno) + ")");
 | 
				
			||||||
 | 
					                continue;
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                printErrorMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                        QString("SELECT-ERROR (WRITE) %1(").arg(loop) + strerror(errno) + ")");
 | 
				
			||||||
 | 
					                ::close(sockfd);
 | 
				
			||||||
 | 
					                return std::nullopt;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else
 | 
				
			||||||
 | 
					        if (w == 0) { // timeout
 | 
				
			||||||
 | 
					            printErrorMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                    QString("SELECT-TIMEOUT (WRITE) %1(").arg(loop) + strerror(errno) + ")");
 | 
				
			||||||
 | 
					            if (++loop < 10) {
 | 
				
			||||||
 | 
					                QThread::msleep(500);
 | 
				
			||||||
 | 
					                continue;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            ::close(sockfd);
 | 
				
			||||||
 | 
					            return std::nullopt;
 | 
				
			||||||
 | 
					        } else
 | 
				
			||||||
 | 
					        if (w > 0) {
 | 
				
			||||||
 | 
					            int n = ::sendto(sockfd, buf+bytesWritten, bytesToWrite-bytesWritten, 0, NULL, 0);
 | 
				
			||||||
 | 
					            if (n >= 0) {
 | 
				
			||||||
 | 
					                bytesWritten += n;
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                if (errno == EWOULDBLOCK) {
 | 
				
			||||||
 | 
					                    if (++loop < 10) {
 | 
				
			||||||
 | 
					                        QThread::msleep(500);
 | 
				
			||||||
 | 
					                        continue;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                    printErrorMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                        QString("WRITE TIMEOUT %1(").arg(loop) + strerror(errno) + ")");
 | 
				
			||||||
 | 
					                    ::close(sockfd);
 | 
				
			||||||
 | 
					                    return std::nullopt;
 | 
				
			||||||
 | 
					                } else
 | 
				
			||||||
 | 
					                if (errno == EINTR) {
 | 
				
			||||||
 | 
					                    printErrorMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                        QString("WRITE INTERRUPTED BY SIGNAL (1) (") + strerror(errno) + ")");
 | 
				
			||||||
 | 
					                    continue;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // DO NOT USE SHUTDOWN! APISM CAN NOT COPE WITH IT
 | 
				
			||||||
 | 
					    // errno = 0;
 | 
				
			||||||
 | 
					    // if (shutdown(sockfd, SHUT_WR) < 0) {
 | 
				
			||||||
 | 
					    //     printErrorMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					    //        QString("CANNOT CLOSE WRITING END (") + strerror(errno) + ")");
 | 
				
			||||||
 | 
					    // }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (verbose) {
 | 
				
			||||||
 | 
					        printInfoMessage(port, clientIP, clientPort, QString("MESSAGE SENT <<<") + buf + ">>>");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    loop = 0;
 | 
				
			||||||
 | 
					    bzero(buf, sizeof(buf));
 | 
				
			||||||
 | 
					    int bytesToRead = sizeof(buf)-1;
 | 
				
			||||||
 | 
					    int bytesRead = 0;
 | 
				
			||||||
 | 
					    while (bytesRead < bytesToRead) {
 | 
				
			||||||
 | 
					        errno = 0;
 | 
				
			||||||
 | 
					        FD_ZERO(&rset);
 | 
				
			||||||
 | 
					        FD_SET(sockfd, &rset);
 | 
				
			||||||
 | 
					        maxfdp1 = sockfd + 1;
 | 
				
			||||||
 | 
					        tv.tv_sec = 60;  /* 60 secs timeout for read and write */
 | 
				
			||||||
 | 
					        tv.tv_usec = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        QString const selectStart = QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        int const r = select(maxfdp1, &rset, NULL, NULL, &tv);
 | 
				
			||||||
 | 
					        if (r < 0) { // error
 | 
				
			||||||
 | 
					            if (errno == EINTR) {
 | 
				
			||||||
 | 
					                printErrorMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                    QString("INTERRUPTED BY SIGNAL (2) (") + strerror(errno) + ")");
 | 
				
			||||||
 | 
					                continue;
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                printErrorMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                        QString("SELECT-ERROR (READ) %1(").arg(loop) + strerror(errno) + ")");
 | 
				
			||||||
 | 
					                ::close(sockfd);
 | 
				
			||||||
 | 
					                return std::nullopt;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else
 | 
				
			||||||
 | 
					        if (r == 0) { // timeout
 | 
				
			||||||
 | 
					            printErrorMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                    QString("SELECT-TIMEOUT (READ) %1(").arg(loop) + strerror(errno) + ")");
 | 
				
			||||||
 | 
					            if (++loop < 10) {
 | 
				
			||||||
 | 
					                QThread::msleep(500);
 | 
				
			||||||
 | 
					                continue;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            ::close(sockfd);
 | 
				
			||||||
 | 
					            return std::nullopt;
 | 
				
			||||||
 | 
					        } else
 | 
				
			||||||
 | 
					        if (r > 0) {
 | 
				
			||||||
 | 
					            if (FD_ISSET(sockfd, &rset)) {
 | 
				
			||||||
 | 
					                int n = ::recvfrom(sockfd, buf+bytesRead, bytesToRead-bytesRead,
 | 
				
			||||||
 | 
					                                   0, NULL, NULL);
 | 
				
			||||||
 | 
					                if (n > 0) { //
 | 
				
			||||||
 | 
					                    bytesRead += n;
 | 
				
			||||||
 | 
					                } else
 | 
				
			||||||
 | 
					                if (n == 0) {
 | 
				
			||||||
 | 
					                    // The return value will be 0 when the peer has performed an orderly shutdown.
 | 
				
			||||||
 | 
					                    printErrorMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                        QString("PEER CLOSED CONNECTION (") + strerror(errno) + ") START AT" +
 | 
				
			||||||
 | 
					                                selectStart + " NOW " + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
 | 
				
			||||||
 | 
					                    ::close(sockfd);
 | 
				
			||||||
 | 
					                    return std::nullopt;
 | 
				
			||||||
 | 
					                } else
 | 
				
			||||||
 | 
					                if (n < 0) {
 | 
				
			||||||
 | 
					                    if (errno == EWOULDBLOCK) { // check just in case
 | 
				
			||||||
 | 
					                        if (++loop < 10) {
 | 
				
			||||||
 | 
					                            QThread::msleep(500);
 | 
				
			||||||
 | 
					                            continue;
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                        printErrorMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                                QString("READ TIMEOUT %1(").arg(loop) + strerror(errno) + ")");
 | 
				
			||||||
 | 
					                        ::close(sockfd);
 | 
				
			||||||
 | 
					                        return std::nullopt;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                    if (errno == EINTR) {
 | 
				
			||||||
 | 
					                        printErrorMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                            QString("INTERRUPTED BY SIGNAL (2) (") + strerror(errno) + ")");
 | 
				
			||||||
 | 
					                        continue;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // printInfoMessage(port, clientIP, clientPort, QString("MESSAGE RECEIVED ") + buf);
 | 
				
			||||||
 | 
					        QString response(buf);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (int idx = response.indexOf("{\"error\":\"ISMAS is offline\"}")) {
 | 
				
			||||||
 | 
					            response = response.mid(0, idx);
 | 
				
			||||||
 | 
					        } else
 | 
				
			||||||
 | 
					        if (response.contains("RECORD")) { // RECORD SAVED or RECORD WRITE ABORTED
 | 
				
			||||||
 | 
					            if (verbose) {
 | 
				
			||||||
 | 
					                printInfoMessage(port, clientIP, clientPort, QString("IGNORED '") + response + "' RESPONSE");
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            ::close(sockfd);
 | 
				
			||||||
 | 
					            return std::nullopt;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        QJsonParseError parseError;
 | 
				
			||||||
 | 
					        QJsonDocument document(QJsonDocument::fromJson(response.toUtf8(), &parseError));
 | 
				
			||||||
 | 
					        if (parseError.error == QJsonParseError::NoError) {
 | 
				
			||||||
 | 
					            if (document.isObject()) { // done: received valid APISM response
 | 
				
			||||||
 | 
					                if (verbose) {
 | 
				
			||||||
 | 
					                    printInfoMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                       QString("VALID APISM RESPONSE .. \n") + response);
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                ::close(sockfd);
 | 
				
			||||||
 | 
					                return response;
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                printInfoMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                   QString("CORRUPTED RESPONSE ") + response);
 | 
				
			||||||
 | 
					                ::close(sockfd);
 | 
				
			||||||
 | 
					                return std::nullopt;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            if (!response.contains("RECORD")) {
 | 
				
			||||||
 | 
					                // maybe APISM does not send valid JSON: "RECORD SAVED" etc.
 | 
				
			||||||
 | 
					                printDebugMessage(port, clientIP, clientPort,
 | 
				
			||||||
 | 
					                    QString("PARSE ERROR ") + response + " " + parseError.errorString());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            ::close(sockfd);
 | 
				
			||||||
 | 
					            return std::nullopt;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return std::nullopt;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					char const *IsmasClient::reason[REASON::ENTRIES] = {
 | 
				
			||||||
 | 
					    "TIME-TRIGGERED", "SERVICE", "DEV-TEST"
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // __WIN32__
 | 
				
			||||||
							
								
								
									
										51
									
								
								Check/ismas_client.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								Check/ismas_client.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,51 @@
 | 
				
			|||||||
 | 
					#ifndef ISMAS_CLIENT_H_INCLUDED
 | 
				
			||||||
 | 
					#define ISMAS_CLIENT_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QObject>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <optional>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class IsmasClient : public QObject {
 | 
				
			||||||
 | 
					    Q_OBJECT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    explicit IsmasClient()  = default;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    enum APISM {
 | 
				
			||||||
 | 
					        DB_PORT = 7777,
 | 
				
			||||||
 | 
					        DIRECT_PORT = 7778
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    enum RESULT_CODE {
 | 
				
			||||||
 | 
					        SUCCESS=0,
 | 
				
			||||||
 | 
					        // if between 00:00 - 04:00 Wait-button state not WAIT, then we assume
 | 
				
			||||||
 | 
					        // that's an automatic nightly (not-necessary) update
 | 
				
			||||||
 | 
					        NO_UPDATE_NECESSARY=1,
 | 
				
			||||||
 | 
					        // if APISM reports the ISMAS is not available (15x, 6s delay each)
 | 
				
			||||||
 | 
					        ISMAS_NO_CONNECTION_ERROR=2,
 | 
				
			||||||
 | 
					        // if not within 00:00-04:00 and WAIT-button was not in state WAIT
 | 
				
			||||||
 | 
					        ISMAS_TRIGGER_ERROR=3,
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    enum REASON {
 | 
				
			||||||
 | 
					        TIME_TRIGGERED = 0,
 | 
				
			||||||
 | 
					        SERVICE,
 | 
				
			||||||
 | 
					        DEV_TEST,
 | 
				
			||||||
 | 
					        ENTRIES
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    static char const *reason[REASON::ENTRIES];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    static std::optional<QString>
 | 
				
			||||||
 | 
					        sendRequestReceiveResponse(int port, QString const &request, bool verbose=false);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  private:
 | 
				
			||||||
 | 
					    static void printDebugMessage(int port, QString const &clientIP, int clientPort,
 | 
				
			||||||
 | 
					                                  QString const &message);
 | 
				
			||||||
 | 
					    static void printInfoMessage(int port, QString const &clientIP, int clientPort,
 | 
				
			||||||
 | 
					                                 QString const &message);
 | 
				
			||||||
 | 
					    static void printErrorMessage(int port, QString const &clientIP, int clientPort,
 | 
				
			||||||
 | 
					                                  QString const &message);
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // ISMAS_CLIENT_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										180
									
								
								Check/main.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										180
									
								
								Check/main.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,180 @@
 | 
				
			|||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#include <QCoreApplication>
 | 
				
			||||||
 | 
					#include <QByteArray>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					#include <QCommandLineParser>
 | 
				
			||||||
 | 
					#include <QStandardPaths>
 | 
				
			||||||
 | 
					#include <QSettings>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QJsonDocument>
 | 
				
			||||||
 | 
					#include <QJsonObject>
 | 
				
			||||||
 | 
					#include <QJsonValue>
 | 
				
			||||||
 | 
					#include <QRegularExpression>
 | 
				
			||||||
 | 
					#include <QFile>
 | 
				
			||||||
 | 
					#include <QTextStream>
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <QThread>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <optional>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "message_handler.h"
 | 
				
			||||||
 | 
					#include "utils_internal.h"
 | 
				
			||||||
 | 
					#include "ismas_client.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					    QByteArray const value = qgetenv("LC_ALL");
 | 
				
			||||||
 | 
					    if (value.isEmpty() || value != "C") {
 | 
				
			||||||
 | 
					        qputenv("LC_ALL", "C");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    openlog("ATB-UPDATE_CHECK", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QCoreApplication a(argc, argv);
 | 
				
			||||||
 | 
					    QCoreApplication::setApplicationName("ATBUpdateCheck");
 | 
				
			||||||
 | 
					    QCoreApplication::setApplicationVersion(APP_VERSION);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
 | 
				
			||||||
 | 
					        atbInstallMessageHandler(nullptr);
 | 
				
			||||||
 | 
					        //atbInstallMessageHandler(atbDebugOutput);
 | 
				
			||||||
 | 
					        setDebugLevel(LOG_NOTICE);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int exitCode = 0;
 | 
				
			||||||
 | 
					    QCommandLineParser parser;
 | 
				
			||||||
 | 
					    QCommandLineOption ismasConnectOption("ismas-connected");
 | 
				
			||||||
 | 
					    QCommandLineOption updateRequestedOption("update-requested");
 | 
				
			||||||
 | 
					    QCommandLineOption verboseOption("verbose");
 | 
				
			||||||
 | 
					    parser.addOption(ismasConnectOption);
 | 
				
			||||||
 | 
					    parser.addOption(updateRequestedOption);
 | 
				
			||||||
 | 
					    parser.addOption(verboseOption);
 | 
				
			||||||
 | 
					    parser.process(a);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString connectionStatus{internal::ISMAS_NOT_CONNECTED};
 | 
				
			||||||
 | 
					    QString updateRequestStatus{internal::UPDATE_NOT_REQUESTED};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        QDebug debug = qCritical();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        int tries = 10;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        while (--tries > 0) {
 | 
				
			||||||
 | 
					            if (std::optional<QString> result
 | 
				
			||||||
 | 
					                    = IsmasClient::sendRequestReceiveResponse(
 | 
				
			||||||
 | 
					                        IsmasClient::APISM::DIRECT_PORT,
 | 
				
			||||||
 | 
					                        "#M=APISM#C=REQ_SELF#J={}")) {
 | 
				
			||||||
 | 
					                QJsonDocument d = QJsonDocument::fromJson(result.value().toUtf8());
 | 
				
			||||||
 | 
					                for (QString const &k : d.object().keys()) {
 | 
				
			||||||
 | 
					                    if (k.contains("CMD_GET_APISMSTATUS_RESPONSE")) {
 | 
				
			||||||
 | 
					                        QJsonObject o = d.object()[k].toObject();
 | 
				
			||||||
 | 
					                        QJsonObject::const_iterator bit = o.find("Broker");
 | 
				
			||||||
 | 
					                        QJsonObject::const_iterator ismit = o.find("ISMAS");
 | 
				
			||||||
 | 
					                        if (bit != o.constEnd() && ismit != o.constEnd()) {
 | 
				
			||||||
 | 
					                            // value for "Broker"
 | 
				
			||||||
 | 
					                            QString const &v = bit->toString();
 | 
				
			||||||
 | 
					                            bool ismas = ismit->toBool();
 | 
				
			||||||
 | 
					                            if (ismas && v.contains(internal::BROKER_CONNECTED, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					                                connectionStatus = internal::ISMAS_CONNECTED;
 | 
				
			||||||
 | 
					                                break;
 | 
				
			||||||
 | 
					                            } else
 | 
				
			||||||
 | 
					                            if (v.contains(internal::BROKER_NOT_CONNECTED, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					                                connectionStatus = internal::ISMAS_NOT_CONNECTED;
 | 
				
			||||||
 | 
					                            } else
 | 
				
			||||||
 | 
					                            if (v.contains(internal::BROKER_DISCONNECTED, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					                                connectionStatus = internal::ISMAS_NOT_CONNECTED;
 | 
				
			||||||
 | 
					                            } else
 | 
				
			||||||
 | 
					                            if (v.contains(internal::BROKER_CONNECTION_IN_PROGRESS, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					                                connectionStatus = internal::ISMAS_NOT_CONNECTED;
 | 
				
			||||||
 | 
					                            } else
 | 
				
			||||||
 | 
					                            if (v.contains(internal::BROKER_DISCONNECTING, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					                                connectionStatus = internal::ISMAS_NOT_CONNECTED;
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                            break;
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (connectionStatus == internal::ISMAS_CONNECTED) {
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            QThread::sleep(5);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (connectionStatus != internal::ISMAS_CONNECTED) {
 | 
				
			||||||
 | 
					            if (internal::customerRepoExists() == false) {
 | 
				
			||||||
 | 
					                debug.noquote() << internal::NO_CUSTOMER_REPOSITORY;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (parser.isSet(updateRequestedOption)) {
 | 
				
			||||||
 | 
					            if (internal::customerRepoExists() == false) {
 | 
				
			||||||
 | 
					                // if the customer repository does not exists, it does not matter is
 | 
				
			||||||
 | 
					                // ISMAS is connected or how the setting for the WAIT-button is.
 | 
				
			||||||
 | 
					                updateRequestStatus = internal::UPDATE_INITIAL;
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                if (connectionStatus == internal::ISMAS_CONNECTED) {
 | 
				
			||||||
 | 
					                    if (std::optional<QString> result
 | 
				
			||||||
 | 
					                            = IsmasClient::sendRequestReceiveResponse(
 | 
				
			||||||
 | 
					                                IsmasClient::APISM::DIRECT_PORT,
 | 
				
			||||||
 | 
					                                "#M=APISM#C=REQ_ISMASPARAMETER#J={}")) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                        QJsonDocument d = QJsonDocument::fromJson(result.value().toUtf8());
 | 
				
			||||||
 | 
					                        for (QString const &k : d.object().keys()) {
 | 
				
			||||||
 | 
					                            if (k.contains("REQ_ISMASPARAMETER")) {
 | 
				
			||||||
 | 
					                                QJsonObject o = d.object()[k].toObject();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                                QJsonObject::const_iterator it = o.find("Aknoledge");
 | 
				
			||||||
 | 
					                                if (it == o.constEnd()) continue;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                                QString const &v = it->toString();
 | 
				
			||||||
 | 
					                                if (v != "OK") break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                                for (QString const &m : d.object().keys()) { // request ack
 | 
				
			||||||
 | 
					                                    if (!m.contains("FileUpload", Qt::CaseInsensitive)) continue;
 | 
				
			||||||
 | 
					                                    QJsonObject o2 = d.object()[m].toObject();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                                    QJsonObject::const_iterator it2 = o2.find("TRG");
 | 
				
			||||||
 | 
					                                    if (it2 == o2.constEnd()) break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                                    QString const &v2 = it2->toString();
 | 
				
			||||||
 | 
					                                    if (v2 == "WAIT") {
 | 
				
			||||||
 | 
					                                        updateRequestStatus = internal::UPDATE_REQUESTED;
 | 
				
			||||||
 | 
					                                    } else {
 | 
				
			||||||
 | 
					                                        // the customer-repository does exist, and the ISMAS-trigger is
 | 
				
			||||||
 | 
					                                        // *NOT* "WAIT", but from 00:00:00 - 00:03:59 this counts as an
 | 
				
			||||||
 | 
					                                        // automatic update
 | 
				
			||||||
 | 
					                                        QDateTime const ¤t = QDateTime::currentDateTime();
 | 
				
			||||||
 | 
					                                        if (current.time().hour() < 4) {
 | 
				
			||||||
 | 
					                                            updateRequestStatus = internal::UPDATE_NOT_NECESSARY;
 | 
				
			||||||
 | 
					                                        } else {
 | 
				
			||||||
 | 
					                                            updateRequestStatus = internal::UPDATE_NOT_REQUESTED;
 | 
				
			||||||
 | 
					                                            exitCode = -2;
 | 
				
			||||||
 | 
					                                        }
 | 
				
			||||||
 | 
					                                    }
 | 
				
			||||||
 | 
					                                    break;
 | 
				
			||||||
 | 
					                                }
 | 
				
			||||||
 | 
					                                break;
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                } else {
 | 
				
			||||||
 | 
					                    // not connected (so its unknown if update has been requested),
 | 
				
			||||||
 | 
					                    // and customer repository exists. Assume 'not requested'.
 | 
				
			||||||
 | 
					                    updateRequestStatus = internal::UPDATE_NOT_REQUESTED;
 | 
				
			||||||
 | 
					                    exitCode = -1;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            debug.noquote() << updateRequestStatus;
 | 
				
			||||||
 | 
					        } else
 | 
				
			||||||
 | 
					        if (parser.isSet(ismasConnectOption)) {
 | 
				
			||||||
 | 
					            debug.noquote() << connectionStatus;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return exitCode;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										0
									
								
								DownloadDCFirmware/ATBDownloadDCFirmware.ini
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								DownloadDCFirmware/ATBDownloadDCFirmware.ini
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										110
									
								
								DownloadDCFirmware/DownloadDCFirmware.pro
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										110
									
								
								DownloadDCFirmware/DownloadDCFirmware.pro
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,110 @@
 | 
				
			|||||||
 | 
					QT += core serialport
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TARGET = ATBUpdateDC
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					VERSION="0.1.0"
 | 
				
			||||||
 | 
					win32 {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date /t")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("time /t")
 | 
				
			||||||
 | 
					} else {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date +%d-%m-%y")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("date +%H:%M:%S")
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					!contains(CONFIG, INCLUDEINTERFACES) {
 | 
				
			||||||
 | 
					    INCLUDEINTERFACES=/opt/ptu5/opt/DCLibraries/include
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					INCLUDEPATH += \
 | 
				
			||||||
 | 
					    plugins \
 | 
				
			||||||
 | 
					    $${INCLUDEINTERFACES} \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../UpdatePTUDevCtrl \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../common/include
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CONFIG += c++17
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# keep comments, as /* fall through */
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -C
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -g
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
 | 
				
			||||||
 | 
					    CONFIG += link_pkgconfig
 | 
				
			||||||
 | 
					    lessThan(QT_MAJOR_VERSION, 5):   PKGCONFIG += qextserialport
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
 | 
				
			||||||
 | 
					    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5_YOCTO ) {
 | 
				
			||||||
 | 
					    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # add qmqtt lib
 | 
				
			||||||
 | 
					    #LIBS += -lQt5Qmqtt
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, DesktopLinux ) {
 | 
				
			||||||
 | 
					    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
 | 
				
			||||||
 | 
					    lessThan(QT_MAJOR_VERSION, 5):    CONFIG += extserialport
 | 
				
			||||||
 | 
					    # QMAKE_CC = ccache $$QMAKE_CC
 | 
				
			||||||
 | 
					    # QMAKE_CXX = ccache $$QMAKE_CXX
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
 | 
				
			||||||
 | 
					    ARCH = DesktopLinux
 | 
				
			||||||
 | 
					    DEFINES+=DesktopLinux
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					SOURCES += \
 | 
				
			||||||
 | 
					        main.cpp \
 | 
				
			||||||
 | 
					        ../common/src/message_handler.cpp \
 | 
				
			||||||
 | 
					        ../common/src/commandline_parser.cpp \
 | 
				
			||||||
 | 
					        update.cpp \
 | 
				
			||||||
 | 
					        ../common/src/System.cpp \
 | 
				
			||||||
 | 
					        ../common/src/utils_internal.cpp \
 | 
				
			||||||
 | 
					        ../common/src/command.cpp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					HEADERS += \
 | 
				
			||||||
 | 
					        ../common/include/message_handler.h \
 | 
				
			||||||
 | 
					        ../common/include/commandline_parser.h \
 | 
				
			||||||
 | 
					        update.h \
 | 
				
			||||||
 | 
					        ../common/include/System.h \
 | 
				
			||||||
 | 
					        ../common/include/utils_internal.h \
 | 
				
			||||||
 | 
					        ../common/include/command.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					OTHER_FILES += \
 | 
				
			||||||
 | 
					    ATBDownloadDCFirmware.ini \
 | 
				
			||||||
 | 
					    ../ATBUpdateTool.ini
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					FORMS += \
 | 
				
			||||||
 | 
					    mainwindow.ui
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					##########################################################################################
 | 
				
			||||||
 | 
					# for running program on target through QtCreator
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					   qnx: target.path = /tmp/$${TARGET}/bin
 | 
				
			||||||
 | 
					   else: unix:!android: target.path = /opt/app/tools/atbupdate/
 | 
				
			||||||
 | 
					   !isEmpty(target.path): INSTALLS += target
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										0
									
								
								DownloadDCFirmware/README.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								DownloadDCFirmware/README.md
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										444
									
								
								DownloadDCFirmware/dc_download.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										444
									
								
								DownloadDCFirmware/dc_download.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,444 @@
 | 
				
			|||||||
 | 
					#include "dc_download.h"
 | 
				
			||||||
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QFile>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <QThread>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DcDownload::DcDownload(hwinf *hw)
 | 
				
			||||||
 | 
					  : m_hw(hw)
 | 
				
			||||||
 | 
					  , m_fileToDownload(m_hw->dcDownloadFileName()) {
 | 
				
			||||||
 | 
					    // connect(this, &QThread::finished,
 | 
				
			||||||
 | 
					    //        dynamic_cast<QObject const *>(m_hw), &QThread::deleteLater);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DcDownload::~DcDownload() {
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 ///////////////////////////////////////////////////////////////////////////////
 | 
				
			||||||
 | 
					 //
 | 
				
			||||||
 | 
					 //                        USING THE DC BOOTLOADER
 | 
				
			||||||
 | 
					 //
 | 
				
			||||||
 | 
					 ///////////////////////////////////////////////////////////////////////////////
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 1  :   bl_reboot()     // send to application, want DC2 to reset (in order to
 | 
				
			||||||
 | 
					                        // start the bootloader)
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: this function is NOT reliable !!! Sometimes it
 | 
				
			||||||
 | 
					                        // simply does not work, in which case bl_startBL,
 | 
				
			||||||
 | 
					                        // bl_checkBL and bl_isUp do not work as well.
 | 
				
			||||||
 | 
					                        // Alas, there is no feedback if bl_reboot worked!
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: this function can be called only once per
 | 
				
			||||||
 | 
					                        // minute, because once called again, the controller
 | 
				
			||||||
 | 
					                        // performs some self-checks consuming some time.
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: after a successful bl_reboot(), the device is
 | 
				
			||||||
 | 
					                        // waiting about 4 seconds in the bootloader. To stay in
 | 
				
			||||||
 | 
					                        // the bootloader, we have to send the command
 | 
				
			||||||
 | 
					                        // bl_startBL(), which is kind of a misnomer, as it
 | 
				
			||||||
 | 
					                        // should be bl_doNotLeaveBL().
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					 2  :   bl_startBL():   // send within 4s after DC power-on, otherwise
 | 
				
			||||||
 | 
					                        // bootloader is left.
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: a running bootloader is a MUST for the download
 | 
				
			||||||
 | 
					                        // process of a device controller firmware as it does
 | 
				
			||||||
 | 
					                        // the actual writing of the memory (the bl_reboot()
 | 
				
			||||||
 | 
					                        // from above erases the available memory).
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					 3  :   bl_check():     // send command to verify if bl is up
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: this command is kind of a request that we want
 | 
				
			||||||
 | 
					                        // to check if the bootloader is up. The device
 | 
				
			||||||
 | 
					                        // (actually the bootloader) responds with its version.
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					 4  :   bl_isUp():      // returns true if bl is up and running
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: we know what the bootloader version actually is
 | 
				
			||||||
 | 
					                        // as the bootloader does not change. By comparing the
 | 
				
			||||||
 | 
					                        // string received in the previous step with this known
 | 
				
			||||||
 | 
					                        // version string we know if the bootloader is up.
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE FOR ALL PREVIOUS STEPS: execute them in their
 | 
				
			||||||
 | 
					                        // own slots each to be sure to receive any possible
 | 
				
			||||||
 | 
					                        // responds from the device.
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					 5  :   bl_sendAddress(blockNumber)
 | 
				
			||||||
 | 
					                        // send start address, nr of 64-byte block, start with 0
 | 
				
			||||||
 | 
					                        // will be sent only for following block-numbers:
 | 
				
			||||||
 | 
					                        // 0, 1024, 2048, 3072 and 4096, so basically every
 | 
				
			||||||
 | 
					                        // 64kByte.
 | 
				
			||||||
 | 
					                        // for other addresses nothing happens
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 6  :   bl_wasSendingAddOK()
 | 
				
			||||||
 | 
					                        // return val:  0: no response by now
 | 
				
			||||||
 | 
					                        //              1: error
 | 
				
			||||||
 | 
					                        //             10: OK
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 7  :   bl_sendDataBlock()
 | 
				
			||||||
 | 
					                        // send 64 byte from bin file
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 8  :   bl_sendLastBlock()
 | 
				
			||||||
 | 
					                        // send this command after all data are transferred
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 9  :   bl_wasSendingDataOK()
 | 
				
			||||||
 | 
					                        // return val:  0: no response by now
 | 
				
			||||||
 | 
					                        //              1: error
 | 
				
			||||||
 | 
					                        //             10: OK
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 10 :   bl_stopBL()     // leave bl and start (the new) application
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: this function MUST work under all conditions.
 | 
				
			||||||
 | 
					                        // Alas, there is no direct result for this command, so
 | 
				
			||||||
 | 
					                        // the only way of knowing it was successful is to ask
 | 
				
			||||||
 | 
					                        // the device if the bootloader is still running.
 | 
				
			||||||
 | 
					                        // There is no problem to repeat this command until the
 | 
				
			||||||
 | 
					                        // bootloader is really not running anymore.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					void DcDownload::doDownload() {
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					void DcDownload::run() {
 | 
				
			||||||
 | 
					    // download thread running in ca-master sends the dc-file down to firmware
 | 
				
			||||||
 | 
					    // TODO: send the json files as well
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_hw->dcDownloadRequestAck();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                << "DcDownload::run(): DOWNLOAD THREAD STARTED:";
 | 
				
			||||||
 | 
					    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                << "               DcDownload::run(): Filename:" << m_hw->dcDownloadFileName();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QDateTime const start = QDateTime::currentDateTime();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 1
 | 
				
			||||||
 | 
					    QFile fn(m_hw->dcDownloadFileName());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!fn.exists()) {
 | 
				
			||||||
 | 
					        // output via CONSOLE() etc
 | 
				
			||||||
 | 
					        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                    << "               DcDownload::run(): Filename:" << m_hw->dcDownloadFileName() << "DOES NOT EXIST";;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                    << "DcDownload::run(): DC-CONTROLLER SW-VERSION BEFORE"
 | 
				
			||||||
 | 
					                    << m_hw->dc_getSWversion();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // load binary device controller file into memory
 | 
				
			||||||
 | 
					        QByteArray ba = loadBinaryDCFile(m_hw->dcDownloadFileName());
 | 
				
			||||||
 | 
					        if (ba.size() > 0) {
 | 
				
			||||||
 | 
					            uint16_t const totalBlocks = (((ba.size())%64)==0) ? (ba.size()/64) : (ba.size()/64)+1;
 | 
				
			||||||
 | 
					            m_hw->dcDownloadSetTotalBlockNumber(totalBlocks);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            // fill last block of data to be sent with 0xFF
 | 
				
			||||||
 | 
					            ba = ba.leftJustified(totalBlocks*64, (char)(0xFF));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                        << "DcDownload::run(): TOTAL NUMBER OF BYTES TO SEND TO DC" << ba.size();
 | 
				
			||||||
 | 
					            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                        << "DcDownload::run(): TOTAL NUMBER OF BLOCKS" << totalBlocks;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            m_hw->dc_autoRequest(true); // turn auto-request setting on
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            m_hw->request_DC2_HWversion();
 | 
				
			||||||
 | 
					            m_hw->request_DC2_SWversion();
 | 
				
			||||||
 | 
					            QThread::sleep(1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            // m_hw->dc_autoRequest(false); // turn auto-request setting on
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            resetDeviceController();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                        << "DcDownload::run(): RESET DEVICE-CONTROLLER";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (startBootloader()) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                            << "DcDownload::run(): STARTED BOOT-LOADER";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                m_hw->dc_autoRequest(false);// turn auto-request setting off for
 | 
				
			||||||
 | 
					                                            // download of binary dc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                            << "DcDownload::run(): TOTAL NUMBER OF FIRMWARE BLOCKS" << totalBlocks;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                int currentBlock = 0; // download of binary dc
 | 
				
			||||||
 | 
					                DownloadResult res = DownloadResult::OK;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                while (res != DownloadResult::ERROR &&  currentBlock < totalBlocks) {
 | 
				
			||||||
 | 
					                    if ((res = sendNextAddress(currentBlock)) != DownloadResult::ERROR) {
 | 
				
			||||||
 | 
					                        if ((res = sendNextDataBlock(ba, currentBlock)) != DownloadResult::ERROR) {
 | 
				
			||||||
 | 
					                            m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                                        << "DcDownload::run(): currentBlockNumber ..." << currentBlock;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                            currentBlock += 1;
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                            << QString("DcDownload::run(): last 64-byte block %1").arg(currentBlock);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                int const rest = ba.size() % 64;
 | 
				
			||||||
 | 
					                int const offset = ba.size() - rest;
 | 
				
			||||||
 | 
					                char const *startAddress = ba.constData() + offset;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                if (rest > 0) {
 | 
				
			||||||
 | 
					                    // SHOULD NEVER HAPPEN !!!
 | 
				
			||||||
 | 
					                    uint8_t local[66];
 | 
				
			||||||
 | 
					                    memset(local, 0xFF, sizeof(local));
 | 
				
			||||||
 | 
					                    memcpy(local, startAddress, rest);
 | 
				
			||||||
 | 
					                    qCritical() << "DcDownload::run(): ERROR SEND REMAINING" << rest << "BYTES";
 | 
				
			||||||
 | 
					                    m_hw->bl_sendDataBlock(64, local);
 | 
				
			||||||
 | 
					                } else {
 | 
				
			||||||
 | 
					                    m_hw->bl_sendLastBlock();
 | 
				
			||||||
 | 
					                    m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                    qCritical() << "DcDownload::run(): currentBlockNumber" << currentBlock;
 | 
				
			||||||
 | 
					                    // QThread::msleep(250);
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                qCritical() << "DcDownload::run(): last result" << (int)sendStatus(m_hw->bl_wasSendingDataOK());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                stopBootloader();   // stop bootloader several times: if it
 | 
				
			||||||
 | 
					                QThread::sleep(1);  // is not stopped, then the PSA has to be
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            // restarted manually (!!!)
 | 
				
			||||||
 | 
					            stopBootloader();
 | 
				
			||||||
 | 
					            QThread::sleep(1);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                    << "DcDownload::run(): STOPPED BOOT-LOADER";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        stopBootloader();   // there is no harm in stopping the bootloader even
 | 
				
			||||||
 | 
					                            // if it was not started at all
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        m_hw->dc_autoRequest(true);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#else // test
 | 
				
			||||||
 | 
					    // load binary device controller file into memory
 | 
				
			||||||
 | 
					    QByteArray ba = loadBinaryDCFile(m_hw->dcDownloadFileName());
 | 
				
			||||||
 | 
					    if (ba.size() > 0) {
 | 
				
			||||||
 | 
					        uint16_t const totalBlocks = (((ba.size())%64)==0) ? (ba.size()/64) : (ba.size()/64)+1;
 | 
				
			||||||
 | 
					        m_hw->dcDownloadSetTotalBlockNumber(totalBlocks);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // fill last block of data to be sent with 0xFF
 | 
				
			||||||
 | 
					        ba = ba.leftJustified(totalBlocks*64, (char)(0xFF));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                    << "DcDownload::run(): TOTAL NUMBER OF BYTES TO SEND TO DC" << ba.size();
 | 
				
			||||||
 | 
					        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                    << "DcDownload::run(): TOTAL NUMBER OF BLOCKS" << totalBlocks;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        m_hw->dc_autoRequest(true); // turn auto-request setting on
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        m_hw->request_DC2_HWversion();
 | 
				
			||||||
 | 
					        m_hw->request_DC2_SWversion();
 | 
				
			||||||
 | 
					        QThread::sleep(1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        resetDeviceController();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                    << "DcDownload::run(): RESET DEVICE-CONTROLLER";
 | 
				
			||||||
 | 
					        QThread::sleep(1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (startBootloader()) {
 | 
				
			||||||
 | 
					            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                        << "DcDownload::run(): STARTED BOOT-LOADER";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            m_hw->dc_autoRequest(false);// turn auto-request setting off for
 | 
				
			||||||
 | 
					                                        // download of binary dc
 | 
				
			||||||
 | 
					            for (uint16_t currentBlock = 0; currentBlock <= totalBlocks; ++currentBlock) {
 | 
				
			||||||
 | 
					                m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
 | 
				
			||||||
 | 
					                qCritical() << "DcDownload::run(): currentBlockNumber" << currentBlock;
 | 
				
			||||||
 | 
					                QThread::msleep(250);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            m_hw->dc_autoRequest(true); // turn auto-request setting on again
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        stopBootloader();   // there is no harm in stopping the bootloader even
 | 
				
			||||||
 | 
					                            // if it was not started at all
 | 
				
			||||||
 | 
					        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                    << "DcDownload::run(): STOPPED BOOT-LOADER";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_hw->dcDownloadSetRunning(false);
 | 
				
			||||||
 | 
					    m_hw->dcDownloadSetFinished(true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QDateTime const end = QDateTime::currentDateTime();
 | 
				
			||||||
 | 
					    quint64 secs = start.secsTo(end);
 | 
				
			||||||
 | 
					    QString runtime;
 | 
				
			||||||
 | 
					    if (secs % 60) {
 | 
				
			||||||
 | 
					        runtime = QString("%1min %2s").arg(secs / 60).arg(secs % 60);
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        runtime = QString("%1min").arg((secs / 60) + 1);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qCritical() << end.time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                << QString("DOWNLOAD THREAD FINISHED (RUNTIME %1)")
 | 
				
			||||||
 | 
					                   .arg(runtime);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // the object deletes itself ! This is the last line in run().
 | 
				
			||||||
 | 
					    // Never touch the object after this statement
 | 
				
			||||||
 | 
					    // m_hw->dcDcDownloadFinalize(this);
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DcDownload::DownloadResult DcDownload::sendStatus(int ret) const {
 | 
				
			||||||
 | 
					    switch (ret) {                  // return values of dc are:
 | 
				
			||||||
 | 
					    case 0:                         // 0: no answer by now
 | 
				
			||||||
 | 
					        return DownloadResult::NOP; // 1: error
 | 
				
			||||||
 | 
					    case 10:                        // 10: success
 | 
				
			||||||
 | 
					        return DownloadResult::OK;
 | 
				
			||||||
 | 
					    default:;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return DownloadResult::ERROR;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DcDownload::DownloadResult
 | 
				
			||||||
 | 
					DcDownload::sendNextAddress(int bNum) const {
 | 
				
			||||||
 | 
					    // sends address only if blockNumber is one of 0, 1024, 2048, 3072, 4096
 | 
				
			||||||
 | 
					    int noAnswerCount = 0;
 | 
				
			||||||
 | 
					    int errorCount = 0;
 | 
				
			||||||
 | 
					    if ( bNum==0 || bNum==1024 || bNum==2048 || bNum==3072 || bNum==4096 ) {
 | 
				
			||||||
 | 
					        while (noAnswerCount <= 250) {
 | 
				
			||||||
 | 
					            m_hw->bl_sendAddress(bNum);
 | 
				
			||||||
 | 
					            QThread::msleep(100);
 | 
				
			||||||
 | 
					            DownloadResult const res = sendStatus(m_hw->bl_wasSendingAddOK());
 | 
				
			||||||
 | 
					            if (res != DownloadResult::NOP) {
 | 
				
			||||||
 | 
					                if (res == DownloadResult::ERROR) {
 | 
				
			||||||
 | 
					                    if (++errorCount >= 10) {
 | 
				
			||||||
 | 
					                        qCritical() << "addr-block" << bNum << "...FAILED";
 | 
				
			||||||
 | 
					                        return res;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                } else { // res == DownloadResult::OK
 | 
				
			||||||
 | 
					                    // qInfo() << "addr-block" << bNum << "...OK";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                        // TODO: hier ins shared-mem schreiben
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                    return res;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                noAnswerCount += 1; // no answer by now
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        // wait max. about 3 seconds
 | 
				
			||||||
 | 
					        return DownloadResult::TIMEOUT;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    // blockNumber is not one of 0, 1024, 2048, 3072, 4096 -> do nothing
 | 
				
			||||||
 | 
					    return DownloadResult::NOP;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DcDownload::DownloadResult
 | 
				
			||||||
 | 
					DcDownload::sendNextDataBlock(QByteArray const &binary, int bNum) const {
 | 
				
			||||||
 | 
					    uint8_t local[66];
 | 
				
			||||||
 | 
					    int const bAddr = bNum * 64;
 | 
				
			||||||
 | 
					    int noAnswerCount = 0;
 | 
				
			||||||
 | 
					    int errorCount = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    memcpy(local, binary.constData() + bAddr, 64);
 | 
				
			||||||
 | 
					    local[64] = local[65] = 0x00;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    while (noAnswerCount <= 250) {
 | 
				
			||||||
 | 
					        m_hw->bl_sendDataBlock(64, local);
 | 
				
			||||||
 | 
					        QThread::msleep(10);
 | 
				
			||||||
 | 
					        DownloadResult const res = sendStatus(m_hw->bl_wasSendingDataOK());
 | 
				
			||||||
 | 
					        if (res != DownloadResult::NOP) {
 | 
				
			||||||
 | 
					            if (res == DownloadResult::ERROR) {
 | 
				
			||||||
 | 
					                if (++errorCount >= 10) {
 | 
				
			||||||
 | 
					                    qCritical() << "data for block" << bNum << "...FAILED";
 | 
				
			||||||
 | 
					                    return res;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                // qInfo() << "data for block" << bNum << "OK";
 | 
				
			||||||
 | 
					                // TODO: hier ins shared mem schreiben
 | 
				
			||||||
 | 
					                return res;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            noAnswerCount += 1; // no answer by now
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    // wait max. about 3 seconds
 | 
				
			||||||
 | 
					    return DownloadResult::TIMEOUT;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool DcDownload::startBootloader() const {
 | 
				
			||||||
 | 
					    qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					             << "starting bootloader...";
 | 
				
			||||||
 | 
					    int nTry = 5;
 | 
				
			||||||
 | 
					    while (--nTry >= 0) {
 | 
				
			||||||
 | 
					        m_hw->bl_startBL();
 | 
				
			||||||
 | 
					        qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << "bl_startBL() ..." << nTry;
 | 
				
			||||||
 | 
					        QThread::msleep(500);
 | 
				
			||||||
 | 
					        m_hw->bl_checkBL();
 | 
				
			||||||
 | 
					        qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << "bl_checkBL() ..." << nTry;
 | 
				
			||||||
 | 
					        QThread::msleep(500);
 | 
				
			||||||
 | 
					        if (m_hw->bl_isUp()) {
 | 
				
			||||||
 | 
					            qInfo() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << "bootloader... isUP" << nTry;
 | 
				
			||||||
 | 
					            return true;
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                        << "bootloader not up (" << nTry << ")";
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                << "starting bootloader FAILED";
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool DcDownload::stopBootloader() const {
 | 
				
			||||||
 | 
					    qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					             << "stopping bootloader...";
 | 
				
			||||||
 | 
					    int nTry = 5;
 | 
				
			||||||
 | 
					    while (--nTry >= 0) {
 | 
				
			||||||
 | 
					        m_hw->bl_stopBL();
 | 
				
			||||||
 | 
					        qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                 << "bl_stopBL() ...";
 | 
				
			||||||
 | 
					        QThread::msleep(500);
 | 
				
			||||||
 | 
					        m_hw->bl_checkBL();
 | 
				
			||||||
 | 
					        qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << "bl_checkBL() ..." << nTry;
 | 
				
			||||||
 | 
					        if (!m_hw->bl_isUp()) {
 | 
				
			||||||
 | 
					            qInfo() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                    << "stopping bootloader OK";
 | 
				
			||||||
 | 
					            return true;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					                << "stopping bootloader FAILED";
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool DcDownload::resetDeviceController() const {
 | 
				
			||||||
 | 
					    qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					             << "resetting device controller...";
 | 
				
			||||||
 | 
					    m_hw->bl_rebootDC();
 | 
				
			||||||
 | 
					    // wait maximally 3 seconds, before starting bootloader
 | 
				
			||||||
 | 
					    QThread::sleep(1);
 | 
				
			||||||
 | 
					    qInfo() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					            << "resetting device controller...OK";
 | 
				
			||||||
 | 
					    return true;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QByteArray DcDownload::loadBinaryDCFile(QString filename) const {
 | 
				
			||||||
 | 
					    qInfo() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
 | 
				
			||||||
 | 
					            << "loading dc binary" << filename << "...";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QFile file(filename); // closed in destructor call
 | 
				
			||||||
 | 
					    if (!file.exists()) {
 | 
				
			||||||
 | 
					        qCritical() << file.fileName() << "does not exist";
 | 
				
			||||||
 | 
					        return QByteArray();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (!file.open(QIODevice::ReadOnly)) {
 | 
				
			||||||
 | 
					        qCritical() << "cannot open file" << file.fileName();
 | 
				
			||||||
 | 
					        return QByteArray();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    qInfo() << "loading dc binary" << filename << "...OK";
 | 
				
			||||||
 | 
					    return file.readAll();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										32
									
								
								DownloadDCFirmware/dc_download.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								DownloadDCFirmware/dc_download.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,32 @@
 | 
				
			|||||||
 | 
					#ifndef DC_DOWNLOAD_H_INCLUDED
 | 
				
			||||||
 | 
					#define DC_DOWNLOAD_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QByteArray>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class hwinf;
 | 
				
			||||||
 | 
					class DcDownload {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    DcDownload(hwinf *hw);
 | 
				
			||||||
 | 
					    ~DcDownload();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    void doDownload();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private:
 | 
				
			||||||
 | 
					    DownloadResult sendStatus(int ret) const;
 | 
				
			||||||
 | 
					    DownloadResult sendNextAddress(int bNum) const;
 | 
				
			||||||
 | 
					    DownloadResult sendNextDataBlock(QByteArray const &binary, int bNum) const;
 | 
				
			||||||
 | 
					    bool startBootloader() const;
 | 
				
			||||||
 | 
					    bool stopBootloader() const;
 | 
				
			||||||
 | 
					    QByteArray loadBinaryDCFile(QString dcFileName) const;
 | 
				
			||||||
 | 
					    bool resetDeviceController() const;
 | 
				
			||||||
 | 
					    DownloadResult dcDownloadBinary(QByteArray const &b) const;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    hwinf *m_hw;
 | 
				
			||||||
 | 
					    QString m_fileToDownload;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // DOWNLOAD_THREAD_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										230
									
								
								DownloadDCFirmware/main.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										230
									
								
								DownloadDCFirmware/main.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,230 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#include <QCoreApplication>
 | 
				
			||||||
 | 
					#include <QByteArray>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					#include <QCommandLineParser>
 | 
				
			||||||
 | 
					#include <QStandardPaths>
 | 
				
			||||||
 | 
					#include <QSettings>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					#include <QThread>
 | 
				
			||||||
 | 
					#include <QRegularExpression>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "message_handler.h"
 | 
				
			||||||
 | 
					#include "commandline_parser.h"
 | 
				
			||||||
 | 
					#include "utils.h"
 | 
				
			||||||
 | 
					#include "utils_internal.h"
 | 
				
			||||||
 | 
					#include "update.h"
 | 
				
			||||||
 | 
					#include "System.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifdef __linux__
 | 
				
			||||||
 | 
					#include <sys/sysinfo.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifdef PTU5
 | 
				
			||||||
 | 
					#define SERIAL_PORT "ttymxc2"
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					#define SERIAL_PORT "ttyUSB0"
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int read1stLineOfFile(QString fileName) {
 | 
				
			||||||
 | 
					    QFile f(fileName);
 | 
				
			||||||
 | 
					    if (f.exists()) {
 | 
				
			||||||
 | 
					        if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
 | 
				
			||||||
 | 
					            QTextStream in(&f);
 | 
				
			||||||
 | 
					            in.setCodec("UTF-8");
 | 
				
			||||||
 | 
					            while(!in.atEnd()) {
 | 
				
			||||||
 | 
					                return in.readLine().toInt();
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return -1;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					    QByteArray const value = qgetenv("LC_ALL");
 | 
				
			||||||
 | 
					    if (value != "C") {
 | 
				
			||||||
 | 
					        qputenv("LC_ALL", "C");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    // qputenv("XDG_RUNTIME_DIR", "/var/run/user/0");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    openlog("DC", LOG_PERROR | LOG_CONS, LOG_USER);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QCoreApplication a(argc, argv);
 | 
				
			||||||
 | 
					    QCoreApplication::setOrganizationName("ATB Automatentechnik Baumann GmBH");
 | 
				
			||||||
 | 
					    QCoreApplication::setApplicationName("ATBUpdateDC");
 | 
				
			||||||
 | 
					    QCoreApplication::setApplicationVersion(APP_VERSION);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
 | 
				
			||||||
 | 
					        atbInstallMessageHandler(atbDebugOutput);
 | 
				
			||||||
 | 
					        setDebugLevel(LOG_NOTICE);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    //return 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    CommandLineParser parser;
 | 
				
			||||||
 | 
					    parser.process(a);
 | 
				
			||||||
 | 
					    parser.readSettings();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					    QString repositoryUrl = parser.repositoryUrl();
 | 
				
			||||||
 | 
					    QString plugInDir = parser.plugInDir();
 | 
				
			||||||
 | 
					    QString plugInName = parser.plugInName();
 | 
				
			||||||
 | 
					    QString workingDir = parser.workingDir();
 | 
				
			||||||
 | 
					    QString psaConfigDir = parser.psaConfigDir();
 | 
				
			||||||
 | 
					    QString psaTariffDir = parser.psaTariffDir();
 | 
				
			||||||
 | 
					    QString psaDcDir = parser.dcDir();
 | 
				
			||||||
 | 
					    QString iniFileName = parser.iniFileName();
 | 
				
			||||||
 | 
					    bool debug = parser.debug();
 | 
				
			||||||
 | 
					    bool const dryRun = parser.dryRun();
 | 
				
			||||||
 | 
					    bool const noUpdatePsaHardware = parser.noUpdatePsaHardware();
 | 
				
			||||||
 | 
					    bool const showYoctoVersion = parser.yoctoVersion();
 | 
				
			||||||
 | 
					    bool const showYoctoInstallStatus = parser.yoctoInstallStatus();
 | 
				
			||||||
 | 
					    bool const showExtendedVersion = parser.extendedVersion();
 | 
				
			||||||
 | 
					    bool const alwaysDownloadConfig = parser.alwaysDownloadConfig();
 | 
				
			||||||
 | 
					    bool const alwaysDownloadDC = parser.alwaysDownloadDC();
 | 
				
			||||||
 | 
					    bool const readDCVersion = parser.readDCVersion();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString const rtPath = QCoreApplication::applicationDirPath();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int const machineNr = read1stLineOfFile("/mnt/system_data/machine_nr");
 | 
				
			||||||
 | 
					    int const customerNr = read1stLineOfFile("/mnt/system_data/cust_nr");
 | 
				
			||||||
 | 
					    int const zoneNr = read1stLineOfFile("/mnt/system_data/zone_nr");
 | 
				
			||||||
 | 
					    QString const branchName = (zoneNr != 0)
 | 
				
			||||||
 | 
					            ? QString("zg1/zone%1").arg(zoneNr) : "master";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qInfo() << "pwd ......................" << rtPath;
 | 
				
			||||||
 | 
					    qInfo() << "repositoryUrl ............" << repositoryUrl;
 | 
				
			||||||
 | 
					    qInfo() << "plugInDir ................" << plugInDir;
 | 
				
			||||||
 | 
					    qInfo() << "plugInName ..............." << plugInName;
 | 
				
			||||||
 | 
					    qInfo() << "workingDir ..............." << workingDir;
 | 
				
			||||||
 | 
					    qInfo() << "psaConfigDir ............." << psaConfigDir;
 | 
				
			||||||
 | 
					    qInfo() << "psaTariffDir ............." << psaTariffDir;
 | 
				
			||||||
 | 
					    qInfo() << "dryRun ..................." << dryRun;
 | 
				
			||||||
 | 
					    qInfo() << "noUpdatePsaHardware ......" << noUpdatePsaHardware;
 | 
				
			||||||
 | 
					    qInfo() << "alwaysDownloadConfig ....." << alwaysDownloadConfig;
 | 
				
			||||||
 | 
					    qInfo() << "alwaysDownloadDC ........." << alwaysDownloadDC;
 | 
				
			||||||
 | 
					    qInfo() << "showYoctoVersion ........." << showYoctoVersion;
 | 
				
			||||||
 | 
					    qInfo() << "showYoctoInstallStatus ..." << showYoctoInstallStatus;
 | 
				
			||||||
 | 
					    qInfo() << "showExtendedVersion ......" << showExtendedVersion;
 | 
				
			||||||
 | 
					    qInfo() << "iniFileName .............." << iniFileName;
 | 
				
			||||||
 | 
					    qInfo() << "extended-version ........." << APP_EXTENDED_VERSION;
 | 
				
			||||||
 | 
					    qInfo() << "machineNr ................" << machineNr;
 | 
				
			||||||
 | 
					    qInfo() << "customerNr ..............." << customerNr;
 | 
				
			||||||
 | 
					    qInfo() << "zoneNr ..................." << zoneNr;
 | 
				
			||||||
 | 
					    qInfo() << "readDCVersion ............" << readDCVersion;
 | 
				
			||||||
 | 
					    qInfo() << "dcDir ...................." << psaDcDir;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!QDir(plugInDir).exists()) {
 | 
				
			||||||
 | 
					        qCritical() << plugInDir
 | 
				
			||||||
 | 
					                    << "does not exists, but has to contain dc-library";
 | 
				
			||||||
 | 
					        exit(-1);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (showExtendedVersion) {
 | 
				
			||||||
 | 
					        printf(APP_EXTENDED_VERSION"\n");
 | 
				
			||||||
 | 
					        return 0;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString const &customerRepo
 | 
				
			||||||
 | 
					        = QDir::cleanPath(workingDir + QDir::separator() + QString("customer_%1").arg(customerNr));
 | 
				
			||||||
 | 
					*/
 | 
				
			||||||
 | 
					    QString psaDcDir = internal::customerRepoDcDir();
 | 
				
			||||||
 | 
					    QString psaRepoRootDir = internal::customerRepoRoot();
 | 
				
			||||||
 | 
					    QString psaRepoDir = internal::customerRepoDir();
 | 
				
			||||||
 | 
					    QString branchName = internal::branchName();
 | 
				
			||||||
 | 
					    QString rootDir = "/etc/dc/";
 | 
				
			||||||
 | 
					    // bool usbDetected = false;
 | 
				
			||||||
 | 
					    // bool sdCardDetected = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool debug = false;
 | 
				
			||||||
 | 
					    bool noaction = true;
 | 
				
			||||||
 | 
					    QString workingDir;
 | 
				
			||||||
 | 
					    QString libca;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    std::unique_ptr<QSettings> settings = internal::readSettings();
 | 
				
			||||||
 | 
					    if (settings) {
 | 
				
			||||||
 | 
					        settings->beginGroup("ATBUpdateDC");
 | 
				
			||||||
 | 
					        debug = settings->value("debug", false).toBool();
 | 
				
			||||||
 | 
					        workingDir = settings->value("workingdir", "/tmp").toString();
 | 
				
			||||||
 | 
					        libca = settings->value("libca", "/usr/lib/libCAslave.so").toString();
 | 
				
			||||||
 | 
					        settings->endGroup();
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        qCritical() << "count not read ATBUpdateTool.ini";
 | 
				
			||||||
 | 
					        return -1;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString dcDir = parser.dcDir();
 | 
				
			||||||
 | 
					    if (!dcDir.isEmpty()) {
 | 
				
			||||||
 | 
					        psaDcDir = dcDir;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    debug = parser.debug();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (debug) {
 | 
				
			||||||
 | 
					        qInfo() << "           using dc directory: " << psaDcDir;
 | 
				
			||||||
 | 
					        qInfo() << "using psa repo root directory: " << psaRepoRootDir;
 | 
				
			||||||
 | 
					        qInfo() << "    using customer repository: " << psaRepoDir;
 | 
				
			||||||
 | 
					        qInfo() << "                 using branch: " << branchName;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // etc/dc: located under mount-path
 | 
				
			||||||
 | 
					    std::optional<QString> mountPath = System::checkForUSBStick(psaDcDir);
 | 
				
			||||||
 | 
					    QFileInfo fi;
 | 
				
			||||||
 | 
					    if (mountPath.has_value()) {
 | 
				
			||||||
 | 
					        // usbDetected = true;
 | 
				
			||||||
 | 
					        // mountPath/etc/dc must exists !
 | 
				
			||||||
 | 
					        // cannot override with commandline parameter --dc-directory
 | 
				
			||||||
 | 
					        if (debug) {
 | 
				
			||||||
 | 
					            qInfo() << "using mount path (USB): " << mountPath.value();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if ((mountPath = System::checkForSDCard(psaDcDir)).has_value()) {
 | 
				
			||||||
 | 
					        // sdCardDetected = true;
 | 
				
			||||||
 | 
					        // mountPath/etc/dc must exists !
 | 
				
			||||||
 | 
					        // cannot override with commandline parameter --dc-directory
 | 
				
			||||||
 | 
					        if (debug) {
 | 
				
			||||||
 | 
					            qInfo() << "using mount path (SD): " << mountPath.value();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        rootDir = "";
 | 
				
			||||||
 | 
					        mountPath = QDir::cleanPath(psaRepoRootDir + QDir::separator() + psaDcDir);
 | 
				
			||||||
 | 
					        if (debug) {
 | 
				
			||||||
 | 
					            qInfo() << "using as dc-directory" << mountPath.value();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (debug) {
 | 
				
			||||||
 | 
					        qInfo() << "using as mount path: " << mountPath.value();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    std::unique_ptr<QString> c = internal::dcCandidateToInstall(rootDir, mountPath.value());
 | 
				
			||||||
 | 
					    if (c) {
 | 
				
			||||||
 | 
					        fi.setFile(*c);
 | 
				
			||||||
 | 
					        if (fi.exists() == false) {
 | 
				
			||||||
 | 
					            qCritical() << "dc2c.bin candidate" << *c << "does not exist. STOP.";
 | 
				
			||||||
 | 
					            return -1;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        qInfo() << "dc2c.bin canditate" << fi.absoluteFilePath();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (debug) {
 | 
				
			||||||
 | 
					        qInfo() << "downloading dc-firmware" << fi.absoluteFilePath();
 | 
				
			||||||
 | 
					        qInfo() << "dc-firmware size (bytes)" << fi.size();
 | 
				
			||||||
 | 
					        qInfo() << "dc-version" << Update::dcVersion(fi.absoluteFilePath());
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // only for testing
 | 
				
			||||||
 | 
					    // return 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Update u(fi.absoluteFilePath(), libca, debug, noaction);
 | 
				
			||||||
 | 
					    u.run();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qInfo() << "<DC-UPDATE-FINISH>";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -1,10 +1,5 @@
 | 
				
			|||||||
#include "mainwindow.h"
 | 
					#include "mainwindow.h"
 | 
				
			||||||
#include "ui_mainwindow.h"
 | 
					#include "ui_mainwindow.h"
 | 
				
			||||||
#include "worker.h"
 | 
					 | 
				
			||||||
#include "utils.h"
 | 
					 | 
				
			||||||
#include "progress_event.h"
 | 
					 | 
				
			||||||
#include "update_dc_event.h"
 | 
					 | 
				
			||||||
#include "plugins/interfaces.h"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <QDateTime>
 | 
					#include <QDateTime>
 | 
				
			||||||
#include <QMessageBox>
 | 
					#include <QMessageBox>
 | 
				
			||||||
@@ -12,14 +7,17 @@
 | 
				
			|||||||
#include <QScrollBar>
 | 
					#include <QScrollBar>
 | 
				
			||||||
#include <QEvent>
 | 
					#include <QEvent>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifdef PTU5
 | 
				
			||||||
 | 
					#define SERIAL_PORT "ttymxc2"
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					#define SERIAL_PORT "ttyUSB0"
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MainWindow::MainWindow(Worker *worker, QWidget *parent)
 | 
					MainWindow::MainWindow(QWidget *parent)
 | 
				
			||||||
    : QMainWindow(parent)
 | 
					    : QMainWindow(parent)
 | 
				
			||||||
    , ui(new Ui::MainWindow)
 | 
					    , ui(new Ui::MainWindow)
 | 
				
			||||||
    , m_worker(worker)
 | 
					    , m_serial(new QSerialPort(this))
 | 
				
			||||||
    , m_width(70)
 | 
					    , m_width(70) {
 | 
				
			||||||
    , m_progressRunning(false)
 | 
					 | 
				
			||||||
    , m_updateStep(UpdateDcEvent::UpdateStep::NONE) {
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    this->setStatusBar(new QStatusBar(this));
 | 
					    this->setStatusBar(new QStatusBar(this));
 | 
				
			||||||
    QFont f;
 | 
					    QFont f;
 | 
				
			||||||
@@ -31,9 +29,12 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    ui->setupUi(this);
 | 
					    ui->setupUi(this);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ui->updateProgress->setRange(0, 100);
 | 
					    openSerialPort();
 | 
				
			||||||
    ui->updateProgress->reset();
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    //ui->updateProgress->setRange(0, 100);
 | 
				
			||||||
 | 
					    //ui->updateProgress->reset();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
    QStringList lst;
 | 
					    QStringList lst;
 | 
				
			||||||
    QString start = QDateTime::currentDateTime().toString(Qt::ISODate);
 | 
					    QString start = QDateTime::currentDateTime().toString(Qt::ISODate);
 | 
				
			||||||
    lst << QString("Start: ") + start.leftJustified(m_width-10);
 | 
					    lst << QString("Start: ") + start.leftJustified(m_width-10);
 | 
				
			||||||
@@ -71,14 +72,56 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
 | 
				
			|||||||
    connect(m_worker, SIGNAL(showStatusMessage(QString,QString)),this, SLOT(onShowStatusMessage(QString,QString)));
 | 
					    connect(m_worker, SIGNAL(showStatusMessage(QString,QString)),this, SLOT(onShowStatusMessage(QString,QString)));
 | 
				
			||||||
    connect(m_worker, SIGNAL(replaceLast(QString,QString)),this,SLOT(onReplaceLast(QString,QString)));
 | 
					    connect(m_worker, SIGNAL(replaceLast(QString,QString)),this,SLOT(onReplaceLast(QString,QString)));
 | 
				
			||||||
    connect(m_worker, SIGNAL(replaceLast(QStringList,QString)),this, SLOT(onReplaceLast(QStringList,QString)));
 | 
					    connect(m_worker, SIGNAL(replaceLast(QStringList,QString)),this, SLOT(onReplaceLast(QStringList,QString)));
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MainWindow::~MainWindow() {
 | 
					MainWindow::~MainWindow() {
 | 
				
			||||||
    delete m_startTimer;
 | 
					    //delete m_startTimer;
 | 
				
			||||||
    delete m_exitTimer;
 | 
					    //delete m_exitTimer;
 | 
				
			||||||
 | 
					    closeSerialPort();
 | 
				
			||||||
    delete ui;
 | 
					    delete ui;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool MainWindow::openSerialPort() {
 | 
				
			||||||
 | 
					   // const SettingsDialog::Settings p = m_settings->settings();
 | 
				
			||||||
 | 
					   m_serial->setPortName(SERIAL_PORT);
 | 
				
			||||||
 | 
					   m_serial->setBaudRate(QSerialPort::Baud115200);
 | 
				
			||||||
 | 
					   m_serial->setDataBits(QSerialPort::DataBits::Data8);
 | 
				
			||||||
 | 
					   m_serial->setParity(QSerialPort::Parity::NoParity);
 | 
				
			||||||
 | 
					   m_serial->setStopBits(QSerialPort::StopBits::OneStop);
 | 
				
			||||||
 | 
					   m_serial->setFlowControl(QSerialPort::FlowControl::NoFlowControl);
 | 
				
			||||||
 | 
					   if (m_serial->open(QIODevice::ReadWrite)) {
 | 
				
			||||||
 | 
					       //m_console->setEnabled(true);
 | 
				
			||||||
 | 
					       //m_console->setLocalEchoEnabled(p.localEchoEnabled);
 | 
				
			||||||
 | 
					       //m_ui->actionConnect->setEnabled(false);
 | 
				
			||||||
 | 
					       //m_ui->actionDisconnect->setEnabled(true);
 | 
				
			||||||
 | 
					       //m_ui->actionConfigure->setEnabled(false);
 | 
				
			||||||
 | 
					       //showStatusMessage(tr("Connected to %1 : %2, %3, %4, %5, %6")
 | 
				
			||||||
 | 
					       //                  .arg(p.name, p.stringBaudRate, p.stringDataBits,
 | 
				
			||||||
 | 
					       //                       p.stringParity, p.stringStopBits, p.stringFlowControl));
 | 
				
			||||||
 | 
					       return true;
 | 
				
			||||||
 | 
					   } else {
 | 
				
			||||||
 | 
					       //QMessageBox::critical(this, tr("Error"), m_serial->errorString());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					       //showStatusMessage(tr("Open error"));
 | 
				
			||||||
 | 
					   }
 | 
				
			||||||
 | 
					   return false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool MainWindow::closeSerialPort() {
 | 
				
			||||||
 | 
					    if (m_serial->isOpen()) {
 | 
				
			||||||
 | 
					        m_serial->close();
 | 
				
			||||||
 | 
					        return true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					    //m_console->setEnabled(false);
 | 
				
			||||||
 | 
					    //m_ui->actionConnect->setEnabled(true);
 | 
				
			||||||
 | 
					    //m_ui->actionDisconnect->setEnabled(false);
 | 
				
			||||||
 | 
					    //m_ui->actionConfigure->setEnabled(true);
 | 
				
			||||||
 | 
					    //showStatusMessage(tr("Disconnected"));
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
void MainWindow::customEvent(QEvent *event) {
 | 
					void MainWindow::customEvent(QEvent *event) {
 | 
				
			||||||
    if (event->type() == ProgressEvent::type()) {
 | 
					    if (event->type() == ProgressEvent::type()) {
 | 
				
			||||||
        ProgressEvent *pevent = (ProgressEvent *)event;
 | 
					        ProgressEvent *pevent = (ProgressEvent *)event;
 | 
				
			||||||
@@ -146,7 +189,7 @@ void MainWindow::onEnableExit() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void MainWindow::onRestartExitTimer() {
 | 
					void MainWindow::onRestartExitTimer() {
 | 
				
			||||||
    m_exitTimer->stop();
 | 
					    m_exitTimer->stop();
 | 
				
			||||||
    m_exitTimer->start(60 * 1000);
 | 
					    m_exitTimer->start(5 * 1000);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    scrollDownTextEdit();
 | 
					    scrollDownTextEdit();
 | 
				
			||||||
    ui->updateStatus->setEnabled(false);
 | 
					    ui->updateStatus->setEnabled(false);
 | 
				
			||||||
@@ -306,3 +349,4 @@ void MainWindow::onShowStatusMessage(QStringList lst) {
 | 
				
			|||||||
        onShowMessage(lst.at(0), "");
 | 
					        onShowMessage(lst.at(0), "");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
							
								
								
									
										55
									
								
								DownloadDCFirmware/mainwindow.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										55
									
								
								DownloadDCFirmware/mainwindow.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,55 @@
 | 
				
			|||||||
 | 
					#ifndef MAINWINDOW_H
 | 
				
			||||||
 | 
					#define MAINWINDOW_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QTimer>
 | 
				
			||||||
 | 
					#include <QSerialPort>
 | 
				
			||||||
 | 
					#include <QSerialPortInfo>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QT_BEGIN_NAMESPACE
 | 
				
			||||||
 | 
					namespace Ui { class MainWindow; }
 | 
				
			||||||
 | 
					QT_END_NAMESPACE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class MainWindow : public QMainWindow {
 | 
				
			||||||
 | 
					    Q_OBJECT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    MainWindow(QWidget *parent = nullptr);
 | 
				
			||||||
 | 
					    ~MainWindow();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public slots:
 | 
				
			||||||
 | 
					    //void onAppendText(QString, QString suffix = "");
 | 
				
			||||||
 | 
					    //void onReplaceLast(QStringList, QString suffix = "");
 | 
				
			||||||
 | 
					    //void onReplaceLast(QString, QString suffix = "");
 | 
				
			||||||
 | 
					    //void onShowErrorMessage(QString, QString);
 | 
				
			||||||
 | 
					    //void onShowStatusMessage(QString, QString);
 | 
				
			||||||
 | 
					    //void onShowErrorMessage(QStringList);
 | 
				
			||||||
 | 
					    //void onShowStatusMessage(QStringList);
 | 
				
			||||||
 | 
					    //void onStopStartTimer();
 | 
				
			||||||
 | 
					    //void onRestartExitTimer();
 | 
				
			||||||
 | 
					    //void onEnableExit();
 | 
				
			||||||
 | 
					    //void onDisableExit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					signals:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private slots:
 | 
				
			||||||
 | 
					//    void onQuit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private:
 | 
				
			||||||
 | 
					//    void scrollDownTextEdit();
 | 
				
			||||||
 | 
					//    void onShowMessage(QString, QString);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool openSerialPort();
 | 
				
			||||||
 | 
					    bool closeSerialPort();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Ui::MainWindow *ui;
 | 
				
			||||||
 | 
					    QSerialPort *m_serial;
 | 
				
			||||||
 | 
					//    Worker *m_worker;
 | 
				
			||||||
 | 
					    int const m_width;
 | 
				
			||||||
 | 
					//    QTimer *m_startTimer;
 | 
				
			||||||
 | 
					//    QTimer *m_exitTimer;
 | 
				
			||||||
 | 
					//    bool m_progressRunning;
 | 
				
			||||||
 | 
					    //int m_progressValue;
 | 
				
			||||||
 | 
					//    UpdateDcEvent::UpdateStep m_updateStep;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					#endif // MAINWINDOW_H
 | 
				
			||||||
@@ -29,21 +29,7 @@
 | 
				
			|||||||
     </rect>
 | 
					     </rect>
 | 
				
			||||||
    </property>
 | 
					    </property>
 | 
				
			||||||
    <layout class="QGridLayout" name="gridLayout">
 | 
					    <layout class="QGridLayout" name="gridLayout">
 | 
				
			||||||
     <item row="3" column="2">
 | 
					     <item row="0" column="0" rowspan="3" colspan="2">
 | 
				
			||||||
      <widget class="QPushButton" name="exit">
 | 
					 | 
				
			||||||
       <property name="text">
 | 
					 | 
				
			||||||
        <string>Exit</string>
 | 
					 | 
				
			||||||
       </property>
 | 
					 | 
				
			||||||
      </widget>
 | 
					 | 
				
			||||||
     </item>
 | 
					 | 
				
			||||||
     <item row="3" column="1">
 | 
					 | 
				
			||||||
      <widget class="QProgressBar" name="updateProgress">
 | 
					 | 
				
			||||||
       <property name="value">
 | 
					 | 
				
			||||||
        <number>1</number>
 | 
					 | 
				
			||||||
       </property>
 | 
					 | 
				
			||||||
      </widget>
 | 
					 | 
				
			||||||
     </item>
 | 
					 | 
				
			||||||
     <item row="0" column="0" rowspan="3" colspan="3">
 | 
					 | 
				
			||||||
      <widget class="QTextEdit" name="updateStatus">
 | 
					      <widget class="QTextEdit" name="updateStatus">
 | 
				
			||||||
       <property name="enabled">
 | 
					       <property name="enabled">
 | 
				
			||||||
        <bool>true</bool>
 | 
					        <bool>true</bool>
 | 
				
			||||||
@@ -52,6 +38,7 @@
 | 
				
			|||||||
        <font>
 | 
					        <font>
 | 
				
			||||||
         <family>Misc Fixed</family>
 | 
					         <family>Misc Fixed</family>
 | 
				
			||||||
         <pointsize>11</pointsize>
 | 
					         <pointsize>11</pointsize>
 | 
				
			||||||
 | 
					         <weight>75</weight>
 | 
				
			||||||
         <bold>true</bold>
 | 
					         <bold>true</bold>
 | 
				
			||||||
        </font>
 | 
					        </font>
 | 
				
			||||||
       </property>
 | 
					       </property>
 | 
				
			||||||
							
								
								
									
										97
									
								
								DownloadDCFirmware/message_handler.cpp
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										97
									
								
								DownloadDCFirmware/message_handler.cpp
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,97 @@
 | 
				
			|||||||
 | 
					#include "message_handler.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <cstring>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QFileInfo>
 | 
				
			||||||
 | 
					#include <QMessageLogContext>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static char const *DBG_NAME[] = { "DBG  ", "WARN ", "CRIT ", "FATAL", "INFO " };
 | 
				
			||||||
 | 
					static bool installedMsgHandler = false;
 | 
				
			||||||
 | 
					static int debugLevel = LOG_NOTICE;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int getDebugLevel() { return debugLevel; }
 | 
				
			||||||
 | 
					void setDebugLevel(int newDebugLevel) {
 | 
				
			||||||
 | 
					    debugLevel = newDebugLevel;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool messageHandlerInstalled() {
 | 
				
			||||||
 | 
					    return installedMsgHandler;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
 | 
				
			||||||
 | 
					    installedMsgHandler = (handler != 0);
 | 
				
			||||||
 | 
					    static QtMessageHandler prevHandler = nullptr;
 | 
				
			||||||
 | 
					    if (handler) {
 | 
				
			||||||
 | 
					        prevHandler = qInstallMessageHandler(handler);
 | 
				
			||||||
 | 
					        return prevHandler;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        return qInstallMessageHandler(prevHandler);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					/// \brief Print message according to given debug level.
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					/// \note Install this function using qInstallMsgHandler().
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					///  int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					///     installMsgHandler(atbDebugOutput);
 | 
				
			||||||
 | 
					///     QApplication app(argc, argv);
 | 
				
			||||||
 | 
					///     ...
 | 
				
			||||||
 | 
					///     return app.exec();
 | 
				
			||||||
 | 
					///  }
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
 | 
				
			||||||
 | 
					    Q_UNUSED(context);
 | 
				
			||||||
 | 
					    QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    switch (debugLevel) {
 | 
				
			||||||
 | 
					        case LOG_DEBUG: { // debug-level message
 | 
				
			||||||
 | 
					            syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_INFO: { // informational message
 | 
				
			||||||
 | 
					            if (type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_NOTICE: { // normal, but significant, condition
 | 
				
			||||||
 | 
					            if (type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_WARNING: { // warning conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_ERR: { // error conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_CRIT: { // critical conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_ALERT: { // action must be taken immediately
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_EMERG: { // system is unusable
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        default: {
 | 
				
			||||||
 | 
					            //fprintf(stderr, "%s No ErrorLevel defined! %s\n",
 | 
				
			||||||
 | 
					            //    datetime.toStdString().c_str(), msg.toStdString().c_str());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										23
									
								
								DownloadDCFirmware/message_handler.h
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										23
									
								
								DownloadDCFirmware/message_handler.h
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,23 @@
 | 
				
			|||||||
 | 
					#ifndef MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
 | 
					#define MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#ifdef __linux__
 | 
				
			||||||
 | 
					#include <syslog.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int getDebugLevel();
 | 
				
			||||||
 | 
					void setDebugLevel(int newDebugLevel);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool messageHandlerInstalled();
 | 
				
			||||||
 | 
					QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 | 
				
			||||||
 | 
					// typedef void (*QtMessageHandler)(QtMsgType, const char *);
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const char *msg);
 | 
				
			||||||
 | 
					#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 | 
				
			||||||
 | 
					// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										0
									
								
								DownloadDCFirmware/receiver_thread.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								DownloadDCFirmware/receiver_thread.cpp
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								DownloadDCFirmware/receiver_thread.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								DownloadDCFirmware/receiver_thread.h
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								DownloadDCFirmware/sender_thread.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								DownloadDCFirmware/sender_thread.cpp
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								DownloadDCFirmware/sender_thread.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								DownloadDCFirmware/sender_thread.h
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										477
									
								
								DownloadDCFirmware/update.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										477
									
								
								DownloadDCFirmware/update.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,477 @@
 | 
				
			|||||||
 | 
					#include "update.h"
 | 
				
			||||||
 | 
					#include "process/command.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QCoreApplication>
 | 
				
			||||||
 | 
					#include <QFile>
 | 
				
			||||||
 | 
					#include <QTemporaryFile>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					#include <QTextStream>
 | 
				
			||||||
 | 
					#include <QRegularExpression>
 | 
				
			||||||
 | 
					#include <QRegExp>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
 | 
				
			||||||
 | 
					#include "unistd.h"
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QSharedMemory>
 | 
				
			||||||
 | 
					#include <QScopedPointer>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QThread>
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <QPluginLoader>
 | 
				
			||||||
 | 
					#include <QMap>
 | 
				
			||||||
 | 
					#include <QStringList>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QSerialPort>
 | 
				
			||||||
 | 
					#include <QSerialPortInfo>
 | 
				
			||||||
 | 
					#include <QSettings>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define UPDATE_OPKG                 (1)
 | 
				
			||||||
 | 
					#define UPDATE_DC                   (0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static const QMap<QString, int> baudrateMap = {
 | 
				
			||||||
 | 
					  {"1200"   ,   0}, {"9600"   ,   1}, {"19200"  ,   2}, {"38400"  ,   3},
 | 
				
			||||||
 | 
					  {"57600"  ,   4}, {"115200" ,   5}
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QPluginLoader Update::pluginLoader;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					hwinf *Update::loadDCPlugin(QString const &libCA /* absolute file path */) {
 | 
				
			||||||
 | 
					    hwinf *hw = nullptr;
 | 
				
			||||||
 | 
					    QFileInfo libCAInfo(libCA);
 | 
				
			||||||
 | 
					    if (libCAInfo.exists()) {
 | 
				
			||||||
 | 
					        pluginLoader.setFileName(libCA);
 | 
				
			||||||
 | 
					        // static QPluginLoader pluginLoader(pluginLibName);
 | 
				
			||||||
 | 
					        if (!pluginLoader.load()) {
 | 
				
			||||||
 | 
					            qCritical() << "cannot load plugin" << pluginLoader.fileName();
 | 
				
			||||||
 | 
					            qCritical() << pluginLoader.errorString();
 | 
				
			||||||
 | 
					            return nullptr;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // qCritical() << "loadDCPlugin() plugin file name:" << pluginLoader.fileName();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!pluginLoader.isLoaded()) {
 | 
				
			||||||
 | 
					            qCritical() << pluginLoader.errorString();
 | 
				
			||||||
 | 
					            return nullptr;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        QObject *plugin = pluginLoader.instance();
 | 
				
			||||||
 | 
					        if (!plugin) {
 | 
				
			||||||
 | 
					            qCritical() << "cannot start instance";
 | 
				
			||||||
 | 
					            return nullptr;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        if (! (hw = qobject_cast<hwinf *>(plugin))) {
 | 
				
			||||||
 | 
					            qCritical() << "cannot cast plugin" << plugin << "to hwinf";
 | 
				
			||||||
 | 
					            return nullptr;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        qCritical() << libCAInfo.absoluteFilePath() << "does not exist";
 | 
				
			||||||
 | 
					        return nullptr;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return hw;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Update::unloadDCPlugin() {
 | 
				
			||||||
 | 
					    if (pluginLoader.unload()) {
 | 
				
			||||||
 | 
					        qCritical() << "unloaded plugin" << pluginLoader.fileName();
 | 
				
			||||||
 | 
					        // Note: will re-instantiate the library !
 | 
				
			||||||
 | 
					        // QObject *rootObject = pluginLoader.instance();
 | 
				
			||||||
 | 
					        // if (rootObject) {
 | 
				
			||||||
 | 
					        //    qCritical() << "reloaded plugin: root object again available";
 | 
				
			||||||
 | 
					        //    return false;
 | 
				
			||||||
 | 
					        // }
 | 
				
			||||||
 | 
					        // qCritical()unloaded plugin: root object gone";
 | 
				
			||||||
 | 
					        return true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QString Update::dcVersion(QString const &dcBinFile) {
 | 
				
			||||||
 | 
					    QProcess p;
 | 
				
			||||||
 | 
					    QStringList params;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    params << "-c" << QString(R"(strings %1 | grep DC2c.\[0-9\] | uniq)").arg(dcBinFile);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    p.start("bash", params);
 | 
				
			||||||
 | 
					    p.waitForFinished();
 | 
				
			||||||
 | 
					    return QString(p.readAllStandardOutput()).trimmed().split(QRegularExpression("\\s")).first();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class hwapi;
 | 
				
			||||||
 | 
					Update::Update(QString const &dcFileName, QString const &libCA, bool debug, bool noaction)
 | 
				
			||||||
 | 
					    : m_dcFileName(dcFileName)
 | 
				
			||||||
 | 
					    , m_hw(loadDCPlugin(libCA))
 | 
				
			||||||
 | 
					    , m_sys_areDCdataValid(false)
 | 
				
			||||||
 | 
					    , m_debug(debug)
 | 
				
			||||||
 | 
					    , m_noaction(noaction) {
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Update::~Update() {
 | 
				
			||||||
 | 
					    unloadDCPlugin();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Update::DownloadResult Update::sendStatus(int ret) const {
 | 
				
			||||||
 | 
					    switch (ret) {                  // return values of dc are:
 | 
				
			||||||
 | 
					    case 0:                         // 0: no answer by now
 | 
				
			||||||
 | 
					        return DownloadResult::NOP; // 1: error
 | 
				
			||||||
 | 
					    case 10:                        // 10: success
 | 
				
			||||||
 | 
					        return DownloadResult::OK;
 | 
				
			||||||
 | 
					    default:;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return DownloadResult::ERROR;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Update::DownloadResult
 | 
				
			||||||
 | 
					Update::sendNextAddress(int bNum) const {
 | 
				
			||||||
 | 
					    // sends address only if blockNumber is one of 0, 1024, 2048, 3072, 4096
 | 
				
			||||||
 | 
					    int noAnswerCount = 0;
 | 
				
			||||||
 | 
					    int errorCount = 0;
 | 
				
			||||||
 | 
					    if ( bNum==0 || bNum==1024 || bNum==2048 || bNum==3072 || bNum==4096 ) {
 | 
				
			||||||
 | 
					        // qDebug() << "addr-block" << bNum << "...";
 | 
				
			||||||
 | 
					        while (noAnswerCount <= 250) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            DownloadResult res = DownloadResult::OK;
 | 
				
			||||||
 | 
					            if (!m_debug) {
 | 
				
			||||||
 | 
					                m_hw->bl_sendAddress(bNum);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                QThread::msleep(10); //from 100ms to 20ms
 | 
				
			||||||
 | 
					//###################################################################################
 | 
				
			||||||
 | 
					                res = sendStatus(m_hw->bl_wasSendingAddOK());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (res != DownloadResult::NOP) {
 | 
				
			||||||
 | 
					                if (res == DownloadResult::ERROR) {
 | 
				
			||||||
 | 
					                    if (++errorCount >= 10) {
 | 
				
			||||||
 | 
					                        qCritical() << "addr-block" << bNum << "...FAILED";
 | 
				
			||||||
 | 
					                        return res;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                } else { // res == DownloadResult::OK
 | 
				
			||||||
 | 
					                    qInfo() << nextTimePoint().toUtf8().constData() << "addr-block" << bNum << "...done";
 | 
				
			||||||
 | 
					                    return res;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                noAnswerCount += 1; // no answer by now
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } // while
 | 
				
			||||||
 | 
					        // wait max. about 3 seconds
 | 
				
			||||||
 | 
					        return DownloadResult::TIMEOUT;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    // blockNumber is not one of 0, 1024, 2048, 3072, 4096 -> do nothing
 | 
				
			||||||
 | 
					    return DownloadResult::NOP;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Update::DownloadResult
 | 
				
			||||||
 | 
					Update::sendNextDataBlock(QByteArray const &binary, int bNum) const {
 | 
				
			||||||
 | 
					    uint8_t local[66];
 | 
				
			||||||
 | 
					    int const bAddr = bNum * 64;
 | 
				
			||||||
 | 
					    int noAnswerCount = 0;
 | 
				
			||||||
 | 
					    int errorCount = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    memcpy(local, binary.constData() + bAddr, 64);
 | 
				
			||||||
 | 
					    local[64] = local[65] = 0x00;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString s = nextTimePoint();
 | 
				
			||||||
 | 
					    s += " sending block ";
 | 
				
			||||||
 | 
					    s += QString("%1/%2 ...done <DC-PROGRESS>").arg(bNum).arg(m_totalBlocks);
 | 
				
			||||||
 | 
					    s += QString::number(ceil(((bNum * 100.0) / (double)m_totalBlocks)));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qInfo() << s.toUtf8().constData();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QThread::msleep(20); //reduce from 200 to 50 ms
 | 
				
			||||||
 | 
					    //############################################################################
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QByteArray b((const char *)(&local[0]), 64);
 | 
				
			||||||
 | 
					    qCritical() << "SNDB" << bNum << b.size() << b.toHex();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    while (noAnswerCount <= 250) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        DownloadResult res = DownloadResult::OK;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!m_debug) {
 | 
				
			||||||
 | 
					            m_hw->bl_sendDataBlock(64, local);
 | 
				
			||||||
 | 
					            res = sendStatus(m_hw->bl_wasSendingDataOK());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (res != DownloadResult::NOP) {
 | 
				
			||||||
 | 
					            if (res == DownloadResult::ERROR) {
 | 
				
			||||||
 | 
					                if (++errorCount >= 10) {
 | 
				
			||||||
 | 
					                    qCritical() << "data for block" << bNum << "...FAILED";
 | 
				
			||||||
 | 
					                    return res;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                qInfo() << nextTimePoint().toUtf8().constData() << "data for block"
 | 
				
			||||||
 | 
					                        << QString("%1/%2").arg(bNum).arg(m_totalBlocks) << "done";
 | 
				
			||||||
 | 
					                return res;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            noAnswerCount += 1; // no answer by now
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    // wait max. about 3 seconds
 | 
				
			||||||
 | 
					    return DownloadResult::TIMEOUT;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Update::startBootloader() const {
 | 
				
			||||||
 | 
					    qDebug() << "starting bootloader...";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!m_debug) {
 | 
				
			||||||
 | 
					        int nTry = 10;
 | 
				
			||||||
 | 
					        while (--nTry >= 0) {
 | 
				
			||||||
 | 
					            m_hw->bl_startBL();
 | 
				
			||||||
 | 
					            QThread::msleep(1000);
 | 
				
			||||||
 | 
					            m_hw->bl_checkBL();
 | 
				
			||||||
 | 
					            if (m_hw->bl_isUp()) {
 | 
				
			||||||
 | 
					                qInfo() << "starting bootloader...OK";
 | 
				
			||||||
 | 
					                QThread::msleep(5000);
 | 
				
			||||||
 | 
					                return true;
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                qCritical() << "bootloader not up (" << nTry << ")";
 | 
				
			||||||
 | 
					                qCritical() << "IS BOOTLOADER INSTALLED ???";
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        qCritical() << "starting bootloader...FAILED";
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        QThread::msleep(1000);
 | 
				
			||||||
 | 
					        qInfo() << "starting bootloader...OK";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return true;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Update::stopBootloader() const {
 | 
				
			||||||
 | 
					    qDebug() << "stopping bootloader...";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!m_debug) {
 | 
				
			||||||
 | 
					        int nTry = 5;
 | 
				
			||||||
 | 
					        while (--nTry >= 0) {
 | 
				
			||||||
 | 
					            m_hw->bl_stopBL();
 | 
				
			||||||
 | 
					            QThread::msleep(1000);
 | 
				
			||||||
 | 
					            if (!m_hw->bl_isUp()) {
 | 
				
			||||||
 | 
					                qInfo() << "stopping bootloader...OK";
 | 
				
			||||||
 | 
					                return true;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        qCritical() << "stopping bootloader...FAILED";
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        QThread::msleep(1000);
 | 
				
			||||||
 | 
					        qInfo() << "stopping bootloader...OK";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return true;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Update::resetDeviceController() const {
 | 
				
			||||||
 | 
					    qInfo() << nextTimePoint().toUtf8().constData() << "resetting device controller";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!m_debug) {
 | 
				
			||||||
 | 
					        m_hw->bl_rebootDC();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // wait maximally 3 seconds, before starting bootloader
 | 
				
			||||||
 | 
					    QThread::sleep(1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qInfo() << nextTimePoint().toUtf8().constData()
 | 
				
			||||||
 | 
					            << "resetting device controller ...done";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return true;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QByteArray Update::loadBinaryDCFile(QString const &filename) const {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QFile file(filename); // closed in destructor call
 | 
				
			||||||
 | 
					    if (!file.exists()) {
 | 
				
			||||||
 | 
					        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
 | 
				
			||||||
 | 
					                    << file.fileName() << "does not exist";
 | 
				
			||||||
 | 
					        return QByteArray{};
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (!file.open(QIODevice::ReadOnly)) {
 | 
				
			||||||
 | 
					        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
 | 
				
			||||||
 | 
					                    << "cannot open file" << file.fileName();
 | 
				
			||||||
 | 
					        return QByteArray{};
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qInfo() << nextTimePoint().toUtf8().constData()
 | 
				
			||||||
 | 
					            << "loading dc binary to memory" << Update::dcVersion(filename) << "...done";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return file.readAll();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 ///////////////////////////////////////////////////////////////////////////////
 | 
				
			||||||
 | 
					 //
 | 
				
			||||||
 | 
					 //                        USING THE DC BOOTLOADER
 | 
				
			||||||
 | 
					 //
 | 
				
			||||||
 | 
					 ///////////////////////////////////////////////////////////////////////////////
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 1  :   bl_reboot()     // send to application, want DC2 to reset (in order to
 | 
				
			||||||
 | 
					                        // start the bootloader)
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: this function is NOT reliable !!! Sometimes it
 | 
				
			||||||
 | 
					                        // simply does not work, in which case bl_startBL,
 | 
				
			||||||
 | 
					                        // bl_checkBL and bl_isUp do not work as well.
 | 
				
			||||||
 | 
					                        // Alas, there is no feedback if bl_reboot worked!
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: this function can be called only once per
 | 
				
			||||||
 | 
					                        // minute, because once called again, the controller
 | 
				
			||||||
 | 
					                        // performs some self-checks consuming some time.
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: after a successful bl_reboot(), the device is
 | 
				
			||||||
 | 
					                        // waiting about 4 seconds in the bootloader. To stay in
 | 
				
			||||||
 | 
					                        // the bootloader, we have to send the command
 | 
				
			||||||
 | 
					                        // bl_startBL(), which is kind of a misnomer, as it
 | 
				
			||||||
 | 
					                        // should be bl_doNotLeaveBL().
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					 2  :   bl_startBL():   // send within 4s after DC power-on, otherwise
 | 
				
			||||||
 | 
					                        // bootloader is left.
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: a running bootloader is a MUST for the download
 | 
				
			||||||
 | 
					                        // process of a device controller firmware as it does
 | 
				
			||||||
 | 
					                        // the actual writing of the memory (the bl_reboot()
 | 
				
			||||||
 | 
					                        // from above erases the available memory).
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					 3  :   bl_check():     // send command to verify if bl is up
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: this command is kind of a request that we want
 | 
				
			||||||
 | 
					                        // to check if the bootloader is up. The device
 | 
				
			||||||
 | 
					                        // (actually the bootloader) responds with its version.
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					 4  :   bl_isUp():      // returns true if bl is up and running
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: we know what the bootloader version actually is
 | 
				
			||||||
 | 
					                        // as the bootloader does not change. By comparing the
 | 
				
			||||||
 | 
					                        // string received in the previous step with this known
 | 
				
			||||||
 | 
					                        // version string we know if the bootloader is up.
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE FOR ALL PREVIOUS STEPS: execute them in their
 | 
				
			||||||
 | 
					                        // own slots each to be sure to receive any possible
 | 
				
			||||||
 | 
					                        // responds from the device.
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					 5  :   bl_sendAddress(blockNumber)
 | 
				
			||||||
 | 
					                        // send start address, nr of 64-byte block, start with 0
 | 
				
			||||||
 | 
					                        // will be sent only for following block-numbers:
 | 
				
			||||||
 | 
					                        // 0, 1024, 2048, 3072 and 4096, so basically every
 | 
				
			||||||
 | 
					                        // 64kByte.
 | 
				
			||||||
 | 
					                        // for other addresses nothing happens
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 6  :   bl_wasSendingAddOK()
 | 
				
			||||||
 | 
					                        // return val:  0: no response by now
 | 
				
			||||||
 | 
					                        //              1: error
 | 
				
			||||||
 | 
					                        //             10: OK
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 7  :   bl_sendDataBlock()
 | 
				
			||||||
 | 
					                        // send 64 byte from bin file
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 8  :   bl_sendLastBlock()
 | 
				
			||||||
 | 
					                        // send this command after all data are transferred
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 9  :   bl_wasSendingDataOK()
 | 
				
			||||||
 | 
					                        // return val:  0: no response by now
 | 
				
			||||||
 | 
					                        //              1: error
 | 
				
			||||||
 | 
					                        //             10: OK
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 10 :   bl_stopBL()     // leave bl and start (the new) application
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // NOTE: this function MUST work under all conditions.
 | 
				
			||||||
 | 
					                        // Alas, there is no direct result for this command, so
 | 
				
			||||||
 | 
					                        // the only way of knowing it was successful is to ask
 | 
				
			||||||
 | 
					                        // the device if the bootloader is still running.
 | 
				
			||||||
 | 
					                        // There is no problem to repeat this command until the
 | 
				
			||||||
 | 
					                        // bootloader is really not running anymore.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					int Update::run() {
 | 
				
			||||||
 | 
					    if (!m_hw) {
 | 
				
			||||||
 | 
					        qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin loaded ???";
 | 
				
			||||||
 | 
					        return -(int)Result::PLUGIN_LOAD_ERROR;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_start = QDateTime::currentDateTime();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (m_debug) {
 | 
				
			||||||
 | 
					        qInfo() << "start dc-update for" << m_dcFileName << "at" << m_start.toString(Qt::ISODate);
 | 
				
			||||||
 | 
					        qInfo() << "<DC-VERSION>" << Update::dcVersion(m_dcFileName);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!m_debug) {
 | 
				
			||||||
 | 
					        m_hw->dc_autoRequest(false);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qInfo() << "DC auto request OFF";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qCritical() << "start dc-update for" << m_dcFileName << "at" << m_start.toString(Qt::ISODate);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QByteArray ba = loadBinaryDCFile(m_dcFileName);
 | 
				
			||||||
 | 
					    if (ba.size() > 0) {
 | 
				
			||||||
 | 
					        m_totalBlocks = (((ba.size())%64)==0) ? (ba.size()/64) : (ba.size()/64)+1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        qInfo() << nextTimePoint().toUtf8().constData() << "blocks to send" << m_totalBlocks;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // fill last block of data to be sent with 0xFF
 | 
				
			||||||
 | 
					        ba = ba.leftJustified(m_totalBlocks*64, (char)(0xFF));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        resetDeviceController();
 | 
				
			||||||
 | 
					        if (startBootloader()) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            int currentBlock = 0;
 | 
				
			||||||
 | 
					            DownloadResult res = DownloadResult::OK;
 | 
				
			||||||
 | 
					            qInfo() << nextTimePoint().toUtf8().constData() << "64-byte block" << currentBlock;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            while (res != DownloadResult::ERROR && currentBlock <= m_totalBlocks) {
 | 
				
			||||||
 | 
					                if ((res = sendNextAddress(currentBlock)) != DownloadResult::ERROR) {
 | 
				
			||||||
 | 
					                    if ((res = sendNextDataBlock(ba, currentBlock)) != DownloadResult::ERROR) {
 | 
				
			||||||
 | 
					                        currentBlock += 1;
 | 
				
			||||||
 | 
					                    } else break;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					            qCritical() << "DownloadThread::run(): last 64-byte block %04d" << currentBlock;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            int const rest = ba.size() % 64;
 | 
				
			||||||
 | 
					            int const offset = ba.size() - rest;
 | 
				
			||||||
 | 
					            char const *startAddress = ba.constData() + offset;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (rest > 0) {
 | 
				
			||||||
 | 
					                // SHOULD NEVER HAPPEN !!!
 | 
				
			||||||
 | 
					                uint8_t local[66];
 | 
				
			||||||
 | 
					                memset(local, 0xFF, sizeof(local));
 | 
				
			||||||
 | 
					                memcpy(local, startAddress, rest);
 | 
				
			||||||
 | 
					                qCritical() << "DownloadThread::run(): ERROR SEND REMAINING" << rest << "BYTES";
 | 
				
			||||||
 | 
					                m_hw->bl_sendDataBlock(64, local);
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                m_hw->bl_sendLastBlock();
 | 
				
			||||||
 | 
					                m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            qCritical() << "DownloadThread::run(): last result" << (int)sendStatus(m_hw->bl_wasSendingDataOK());
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        stopBootloader();   // there is no harm in stopping the bootloader even
 | 
				
			||||||
 | 
					                            // if starting the bootloader failed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // check if update was successful
 | 
				
			||||||
 | 
					        if (!m_debug) {
 | 
				
			||||||
 | 
					            m_hw->dc_autoRequest(true); //restart dc_autoRequest after download else E255!
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        for (int i = 0; i < 3; ++i) {
 | 
				
			||||||
 | 
					            qInfo() << "waiting for device controller restart...(" << i << ")";
 | 
				
			||||||
 | 
					            QThread::sleep(20);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            resetDeviceController();
 | 
				
			||||||
 | 
					            if (startBootloader()) {
 | 
				
			||||||
 | 
					                qInfo() << nextTimePoint().toUtf8().constData() << "<DC-UPDATE-SUCCESS>";
 | 
				
			||||||
 | 
					                stopBootloader();
 | 
				
			||||||
 | 
					                return -(int)Result::SUCCESS;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qInfo() << nextTimePoint().toUtf8().constData() << "<DC-UPDATE-FAILURE>";
 | 
				
			||||||
 | 
					    //To Do Error handling if Dc doesnt start after download
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										92
									
								
								DownloadDCFirmware/update.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										92
									
								
								DownloadDCFirmware/update.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,92 @@
 | 
				
			|||||||
 | 
					#ifndef UPDATE_H_INCLUDED
 | 
				
			||||||
 | 
					#define UPDATE_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QObject>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QFile>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QByteArray>
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					#include <QPluginLoader>
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <cmath>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <initializer_list>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifdef PTU5
 | 
				
			||||||
 | 
					#define SERIAL_PORT "ttymxc2"
 | 
				
			||||||
 | 
					#define BAUDRATE 115200
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					#define SERIAL_PORT "ttyUSB0"
 | 
				
			||||||
 | 
					#define BAUDRATE 115200
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class QSerialPort;
 | 
				
			||||||
 | 
					class Update : public QObject {
 | 
				
			||||||
 | 
					    Q_OBJECT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString m_dcFileName{};
 | 
				
			||||||
 | 
					    hwinf *m_hw = nullptr;
 | 
				
			||||||
 | 
					    bool m_sys_areDCdataValid{};
 | 
				
			||||||
 | 
					    bool m_debug{false};
 | 
				
			||||||
 | 
					    bool m_noaction;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    static QPluginLoader pluginLoader;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QDateTime m_start;
 | 
				
			||||||
 | 
					    QString nextTimePoint() const {
 | 
				
			||||||
 | 
					        float const secs = m_start.msecsTo(QDateTime::currentDateTime()) / 1000.0;
 | 
				
			||||||
 | 
					        return QStringLiteral("+%1s").arg(secs, 7, 'f', 2, QChar('0'));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
 | 
				
			||||||
 | 
					    enum class Result {SUCCESS=0, PLUGIN_LOAD_ERROR};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    static hwinf *loadDCPlugin(QString const &libCA = "/usr/lib/libCAslave.so");
 | 
				
			||||||
 | 
					    static bool unloadDCPlugin();
 | 
				
			||||||
 | 
					    static QStringList split(QString line, QChar sep = ',');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    explicit Update(QString const &dcBinFile, QString const &libCA, bool debug, bool noaction);
 | 
				
			||||||
 | 
					    virtual ~Update() override;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int run();
 | 
				
			||||||
 | 
					    static QString dcVersion(QString const &dcBinFile);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private:
 | 
				
			||||||
 | 
					    DownloadResult sendStatus(int ret) const;
 | 
				
			||||||
 | 
					    DownloadResult sendNextAddress(int bNum) const;
 | 
				
			||||||
 | 
					    DownloadResult sendNextDataBlock(QByteArray const &binary, int bNum) const;
 | 
				
			||||||
 | 
					    bool startBootloader() const;
 | 
				
			||||||
 | 
					    bool stopBootloader() const;
 | 
				
			||||||
 | 
					    QByteArray loadBinaryDCFile(QString const &dcFilename) const;
 | 
				
			||||||
 | 
					    bool resetDeviceController() const;
 | 
				
			||||||
 | 
					    DownloadResult dcDownloadBinary(QByteArray const &b) const;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString m_fileToDownload;
 | 
				
			||||||
 | 
					    uint16_t m_totalBlocks = 0;
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					private:
 | 
				
			||||||
 | 
					    static QString jsonType(enum FileTypeJson type);
 | 
				
			||||||
 | 
					    bool openSerial(int br, QString baudrate, QString comPort) const;
 | 
				
			||||||
 | 
					    void closeSerial() const;
 | 
				
			||||||
 | 
					    bool isSerialOpen() const;
 | 
				
			||||||
 | 
					    bool resetDeviceController() const;
 | 
				
			||||||
 | 
					    QByteArray loadBinaryDCFile(QString filename) const;
 | 
				
			||||||
 | 
					    bool downloadBinaryToDC(QString const &bFile) const;
 | 
				
			||||||
 | 
					    bool updateBinary(QString const &fileToSendToDC);
 | 
				
			||||||
 | 
					    QStringList getDcSoftAndHardWareVersion();
 | 
				
			||||||
 | 
					    QString getFileVersion(QString const& jsonFile);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private slots:
 | 
				
			||||||
 | 
					    void readyReadStandardOutput();
 | 
				
			||||||
 | 
					    void readyReadStandardError();
 | 
				
			||||||
 | 
					    void finished(int exitCode, QProcess::ExitStatus exitStatus);
 | 
				
			||||||
 | 
					    void onReportDCDownloadStatus(QString const &status);
 | 
				
			||||||
 | 
					    void onReportDCDownloadSuccess(QString const &msg);
 | 
				
			||||||
 | 
					    void onReportDCDownloadFailure(QString const &errorMsg);
 | 
				
			||||||
 | 
					*/
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					#endif // UPDATE_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										13
									
								
								DownloadDCFirmware/worker_thread.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								DownloadDCFirmware/worker_thread.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,13 @@
 | 
				
			|||||||
 | 
					#include "worker_thread.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					WorkerThread::WorkerThread(QObject *parent)
 | 
				
			||||||
 | 
					  : QThread(parent) {
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					WorkerThread::~WorkerThread() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void WorkerThread::run() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										20
									
								
								DownloadDCFirmware/worker_thread.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								DownloadDCFirmware/worker_thread.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,20 @@
 | 
				
			|||||||
 | 
					#ifndef WORKER_THREAD_H_INCLUDED
 | 
				
			||||||
 | 
					#define WORKER_THREAD_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QThread>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class WorkerThread : public QThread {
 | 
				
			||||||
 | 
					    Q_OBJECT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    explicit WorkerThread(QObject *parent = nullptr);
 | 
				
			||||||
 | 
					    ~WorkerThread();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private:
 | 
				
			||||||
 | 
					    void run() override;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool m_quit = false;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // WORKER_THREAD_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										0
									
								
								DownloadDCJsonFiles/ATBDownloadDCJsonFiles.ini
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								DownloadDCJsonFiles/ATBDownloadDCJsonFiles.ini
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										103
									
								
								DownloadDCJsonFiles/DownloadDCJsonFiles.pro
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										103
									
								
								DownloadDCJsonFiles/DownloadDCJsonFiles.pro
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,103 @@
 | 
				
			|||||||
 | 
					QT += core
 | 
				
			||||||
 | 
					QT += serialport network
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TARGET = ATBUpdateJsonFiles
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					VERSION="0.1.0"
 | 
				
			||||||
 | 
					win32 {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date /t")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("time /t")
 | 
				
			||||||
 | 
					} else {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date +%d-%m-%y")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("date +%H:%M:%S")
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					!contains(CONFIG, INCLUDEINTERFACES) {
 | 
				
			||||||
 | 
					    INCLUDEINTERFACES=/opt/ptu5/opt/DCLibraries/include
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					INCLUDEPATH += \
 | 
				
			||||||
 | 
					    plugins \
 | 
				
			||||||
 | 
					    $${INCLUDEINTERFACES} \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../UpdatePTUDevCtrl \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../common/include
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CONFIG += c++17
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# keep comments, as /* fall through */
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -C
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -g
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
 | 
				
			||||||
 | 
					    CONFIG += link_pkgconfig
 | 
				
			||||||
 | 
					    lessThan(QT_MAJOR_VERSION, 5):   PKGCONFIG += qextserialport
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
 | 
				
			||||||
 | 
					    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5_YOCTO ) {
 | 
				
			||||||
 | 
					    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # add qmqtt lib
 | 
				
			||||||
 | 
					    #LIBS += -lQt5Qmqtt
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, DesktopLinux ) {
 | 
				
			||||||
 | 
					    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
 | 
				
			||||||
 | 
					    lessThan(QT_MAJOR_VERSION, 5):    CONFIG += extserialport
 | 
				
			||||||
 | 
					    # QMAKE_CC = ccache $$QMAKE_CC
 | 
				
			||||||
 | 
					    # QMAKE_CXX = ccache $$QMAKE_CXX
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
 | 
				
			||||||
 | 
					    ARCH = DesktopLinux
 | 
				
			||||||
 | 
					    DEFINES+=DesktopLinux
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					SOURCES += \
 | 
				
			||||||
 | 
					        main.cpp \
 | 
				
			||||||
 | 
					        ../UpdatePTUDevCtrl/message_handler.cpp \
 | 
				
			||||||
 | 
					        ../common/src/commandline_parser.cpp \
 | 
				
			||||||
 | 
					        update.cpp \
 | 
				
			||||||
 | 
					        ../common/src/System.cpp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					HEADERS += \
 | 
				
			||||||
 | 
					        ../UpdatePTUDevCtrl/message_handler.h \
 | 
				
			||||||
 | 
					        ../common/include/commandline_parser.h \
 | 
				
			||||||
 | 
					        update.h \
 | 
				
			||||||
 | 
					        ../common/include/System.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					OTHER_FILES += \
 | 
				
			||||||
 | 
					    ATBDownloadDCJsonFiles.ini \
 | 
				
			||||||
 | 
					    ../ATBUpdateTool.ini
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					##########################################################################################
 | 
				
			||||||
 | 
					# for running program on target through QtCreator
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					   qnx: target.path = /tmp/$${TARGET}/bin
 | 
				
			||||||
 | 
					   else: unix:!android: target.path = /opt/app/tools/atbupdate/
 | 
				
			||||||
 | 
					   !isEmpty(target.path): INSTALLS += target
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										445
									
								
								DownloadDCJsonFiles/DownloadDCJsonFiles.pro.user
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										445
									
								
								DownloadDCJsonFiles/DownloadDCJsonFiles.pro.user
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,445 @@
 | 
				
			|||||||
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
 | 
					<!DOCTYPE QtCreatorProject>
 | 
				
			||||||
 | 
					<!-- Written by QtCreator 5.0.2, 2024-02-28T16:01:22. -->
 | 
				
			||||||
 | 
					<qtcreator>
 | 
				
			||||||
 | 
					 <data>
 | 
				
			||||||
 | 
					  <variable>EnvironmentId</variable>
 | 
				
			||||||
 | 
					  <value type="QByteArray">{6a494cc5-6dea-4681-86fc-d47b9761a1f4}</value>
 | 
				
			||||||
 | 
					 </data>
 | 
				
			||||||
 | 
					 <data>
 | 
				
			||||||
 | 
					  <variable>ProjectExplorer.Project.ActiveTarget</variable>
 | 
				
			||||||
 | 
					  <value type="int">0</value>
 | 
				
			||||||
 | 
					 </data>
 | 
				
			||||||
 | 
					 <data>
 | 
				
			||||||
 | 
					  <variable>ProjectExplorer.Project.EditorSettings</variable>
 | 
				
			||||||
 | 
					  <valuemap type="QVariantMap">
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
 | 
				
			||||||
 | 
					    <value type="QString" key="language">Cpp</value>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="value">
 | 
				
			||||||
 | 
					     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
 | 
				
			||||||
 | 
					    <value type="QString" key="language">QmlJS</value>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="value">
 | 
				
			||||||
 | 
					     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
 | 
				
			||||||
 | 
					   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
 | 
				
			||||||
 | 
					   <value type="int" key="EditorConfiguration.IndentSize">4</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
 | 
				
			||||||
 | 
					   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
 | 
				
			||||||
 | 
					   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
 | 
				
			||||||
 | 
					   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
 | 
				
			||||||
 | 
					   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
 | 
				
			||||||
 | 
					   <value type="int" key="EditorConfiguration.TabSize">8</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.UseIndenter">false</value>
 | 
				
			||||||
 | 
					   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
 | 
				
			||||||
 | 
					   <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
 | 
				
			||||||
 | 
					  </valuemap>
 | 
				
			||||||
 | 
					 </data>
 | 
				
			||||||
 | 
					 <data>
 | 
				
			||||||
 | 
					  <variable>ProjectExplorer.Project.PluginSettings</variable>
 | 
				
			||||||
 | 
					  <valuemap type="QVariantMap">
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
 | 
				
			||||||
 | 
					    <value type="bool" key="AutoTest.Framework.Boost">true</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="AutoTest.Framework.CTest">false</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="AutoTest.Framework.Catch">true</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="AutoTest.Framework.GTest">true</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="AutoTest.Framework.QtTest">true</value>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
 | 
				
			||||||
 | 
					   <value type="int" key="AutoTest.RunAfterBuild">0</value>
 | 
				
			||||||
 | 
					   <value type="bool" key="AutoTest.UseGlobal">true</value>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="ClangTools">
 | 
				
			||||||
 | 
					    <value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
 | 
				
			||||||
 | 
					    <value type="int" key="ClangTools.ParallelJobs">3</value>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
 | 
				
			||||||
 | 
					    <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					  </valuemap>
 | 
				
			||||||
 | 
					 </data>
 | 
				
			||||||
 | 
					 <data>
 | 
				
			||||||
 | 
					  <variable>ProjectExplorer.Project.Target.0</variable>
 | 
				
			||||||
 | 
					  <valuemap type="QVariantMap">
 | 
				
			||||||
 | 
					   <value type="QString" key="DeviceType">GenericLinuxOsType</value>
 | 
				
			||||||
 | 
					   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Yocto i.MX6-ATB-PTU5</value>
 | 
				
			||||||
 | 
					   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Yocto i.MX6-ATB-PTU5</value>
 | 
				
			||||||
 | 
					   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{804f60e1-6e88-41af-b072-9f5c6a606099}</value>
 | 
				
			||||||
 | 
					   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
 | 
				
			||||||
 | 
					   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
 | 
				
			||||||
 | 
					   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
 | 
				
			||||||
 | 
					    <value type="int" key="EnableQmlDebugging">0</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Debug</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Debug</value>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments">CONFIG+=PTU5</value>
 | 
				
			||||||
 | 
					      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand">/usr/bin/make</value>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand">/usr/bin/make</value>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
 | 
				
			||||||
 | 
					    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Release</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Release</value>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
 | 
				
			||||||
 | 
					      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
 | 
				
			||||||
 | 
					    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
 | 
				
			||||||
 | 
					    <value type="int" key="QtQuickCompiler">0</value>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
 | 
				
			||||||
 | 
					    <value type="int" key="EnableQmlDebugging">0</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Profile</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Profile</value>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
 | 
				
			||||||
 | 
					      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
 | 
				
			||||||
 | 
					    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
 | 
				
			||||||
 | 
					    <value type="int" key="QtQuickCompiler">0</value>
 | 
				
			||||||
 | 
					    <value type="int" key="SeparateDebugInfo">0</value>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.CheckForFreeDiskSpaceStep</value>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedFiles"/>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedHosts"/>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedRemotePaths"/>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedSysroots"/>
 | 
				
			||||||
 | 
					      <value type="QString" key="RemoteLinux.CheckForFreeDiskSpaceStep.PathToCheck">/</value>
 | 
				
			||||||
 | 
					      <value type="qlonglong" key="RemoteLinux.CheckForFreeDiskSpaceStep.RequiredSpace">5242880</value>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="RemoteLinux.LastDeployedLocalTimes"/>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="RemoteLinux.LastDeployedRemoteTimes"/>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.KillAppStep</value>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedFiles"/>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedHosts"/>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedRemotePaths"/>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedSysroots"/>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="RemoteLinux.LastDeployedLocalTimes"/>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="RemoteLinux.LastDeployedRemoteTimes"/>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
 | 
				
			||||||
 | 
					    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">DeployToGenericLinux</value>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
 | 
				
			||||||
 | 
					    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="CustomOutputParsers"/>
 | 
				
			||||||
 | 
					    <value type="int" key="PE.EnvironmentAspect.Base">1</value>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">DownloadDCJsonFiles</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinuxRunConfiguration:/opt/ptu5/opt/DownloadDCJsonFiles/DownloadDCJsonFiles.pro</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/opt/ptu5/opt/DownloadDCJsonFiles/DownloadDCJsonFiles.pro</value>
 | 
				
			||||||
 | 
					    <value type="int" key="RemoteLinux.EnvironmentAspect.Version">1</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="RunConfiguration.X11Forwarding">:0</value>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
 | 
				
			||||||
 | 
					  </valuemap>
 | 
				
			||||||
 | 
					 </data>
 | 
				
			||||||
 | 
					 <data>
 | 
				
			||||||
 | 
					  <variable>ProjectExplorer.Project.Target.1</variable>
 | 
				
			||||||
 | 
					  <valuemap type="QVariantMap">
 | 
				
			||||||
 | 
					   <value type="QString" key="DeviceType">Desktop</value>
 | 
				
			||||||
 | 
					   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.12 GCC 64bit</value>
 | 
				
			||||||
 | 
					   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.12 GCC 64bit</value>
 | 
				
			||||||
 | 
					   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.51212.gcc_64_kit</value>
 | 
				
			||||||
 | 
					   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
 | 
				
			||||||
 | 
					   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
 | 
				
			||||||
 | 
					   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
 | 
				
			||||||
 | 
					    <value type="int" key="EnableQmlDebugging">0</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Debug</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Debug</value>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
 | 
				
			||||||
 | 
					      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
 | 
				
			||||||
 | 
					    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Release</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Release</value>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
 | 
				
			||||||
 | 
					      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
 | 
				
			||||||
 | 
					    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
 | 
				
			||||||
 | 
					    <value type="int" key="QtQuickCompiler">0</value>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
 | 
				
			||||||
 | 
					    <value type="int" key="EnableQmlDebugging">0</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Profile</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Profile</value>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
 | 
				
			||||||
 | 
					      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
 | 
				
			||||||
 | 
					      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
 | 
				
			||||||
 | 
					     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
 | 
				
			||||||
 | 
					      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
 | 
				
			||||||
 | 
					      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
 | 
				
			||||||
 | 
					     </valuemap>
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
 | 
				
			||||||
 | 
					    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
 | 
				
			||||||
 | 
					    <value type="int" key="QtQuickCompiler">0</value>
 | 
				
			||||||
 | 
					    <value type="int" key="SeparateDebugInfo">0</value>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
 | 
				
			||||||
 | 
					     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
 | 
				
			||||||
 | 
					     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
 | 
				
			||||||
 | 
					    </valuemap>
 | 
				
			||||||
 | 
					    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
 | 
				
			||||||
 | 
					    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
 | 
				
			||||||
 | 
					    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
 | 
				
			||||||
 | 
					   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
 | 
				
			||||||
 | 
					    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="CustomOutputParsers"/>
 | 
				
			||||||
 | 
					    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
 | 
				
			||||||
 | 
					    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
 | 
				
			||||||
 | 
					    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
 | 
				
			||||||
 | 
					    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
 | 
				
			||||||
 | 
					    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
 | 
				
			||||||
 | 
					   </valuemap>
 | 
				
			||||||
 | 
					   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
 | 
				
			||||||
 | 
					  </valuemap>
 | 
				
			||||||
 | 
					 </data>
 | 
				
			||||||
 | 
					 <data>
 | 
				
			||||||
 | 
					  <variable>ProjectExplorer.Project.TargetCount</variable>
 | 
				
			||||||
 | 
					  <value type="int">2</value>
 | 
				
			||||||
 | 
					 </data>
 | 
				
			||||||
 | 
					 <data>
 | 
				
			||||||
 | 
					  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
 | 
				
			||||||
 | 
					  <value type="int">22</value>
 | 
				
			||||||
 | 
					 </data>
 | 
				
			||||||
 | 
					 <data>
 | 
				
			||||||
 | 
					  <variable>Version</variable>
 | 
				
			||||||
 | 
					  <value type="int">22</value>
 | 
				
			||||||
 | 
					 </data>
 | 
				
			||||||
 | 
					</qtcreator>
 | 
				
			||||||
							
								
								
									
										0
									
								
								DownloadDCJsonFiles/README.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								DownloadDCJsonFiles/README.md
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										170
									
								
								DownloadDCJsonFiles/main.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										170
									
								
								DownloadDCJsonFiles/main.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,170 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#include <QCoreApplication>
 | 
				
			||||||
 | 
					#include <QByteArray>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					#include <QCommandLineParser>
 | 
				
			||||||
 | 
					#include <QStandardPaths>
 | 
				
			||||||
 | 
					#include <QSettings>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "message_handler.h"
 | 
				
			||||||
 | 
					#include "commandline_parser.h"
 | 
				
			||||||
 | 
					#include "utils.h"
 | 
				
			||||||
 | 
					#include "update.h"
 | 
				
			||||||
 | 
					#include "System.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					//#include <unistd.h>
 | 
				
			||||||
 | 
					//#include <errno.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifdef PTU5
 | 
				
			||||||
 | 
					#define SERIAL_PORT "ttymxc2"
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					#define SERIAL_PORT "ttyUSB0"
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int read1stLineOfFile(QString fileName) {
 | 
				
			||||||
 | 
					    QFile f(fileName);
 | 
				
			||||||
 | 
					    if (f.exists()) {
 | 
				
			||||||
 | 
					        if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
 | 
				
			||||||
 | 
					            QTextStream in(&f);
 | 
				
			||||||
 | 
					            in.setCodec("UTF-8");
 | 
				
			||||||
 | 
					            while(!in.atEnd()) {
 | 
				
			||||||
 | 
					                return in.readLine().toInt();
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return -1;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					    QByteArray const value = qgetenv("LC_ALL");
 | 
				
			||||||
 | 
					    if (value != "C") {
 | 
				
			||||||
 | 
					        qputenv("LC_ALL", "C");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    // qputenv("XDG_RUNTIME_DIR", "/var/run/user/0");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    openlog("ATB-DL-JSON", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QCoreApplication a(argc, argv);
 | 
				
			||||||
 | 
					    QCoreApplication::setApplicationName("ATBDownloadDCJsonFiles");
 | 
				
			||||||
 | 
					    QCoreApplication::setApplicationVersion(APP_VERSION);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
 | 
				
			||||||
 | 
					        atbInstallMessageHandler(atbDebugOutput);
 | 
				
			||||||
 | 
					        setDebugLevel(LOG_NOTICE);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    CommandLineParser parser;
 | 
				
			||||||
 | 
					    parser.process(a);
 | 
				
			||||||
 | 
					    parser.readSettings();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString repositoryUrl = parser.repositoryUrl();
 | 
				
			||||||
 | 
					    QString plugInDir = parser.plugInDir();
 | 
				
			||||||
 | 
					    QString plugInName = parser.plugInName();
 | 
				
			||||||
 | 
					    QString workingDir = parser.workingDir();
 | 
				
			||||||
 | 
					    QString psaConfigDir = parser.psaConfigDir();
 | 
				
			||||||
 | 
					    QString psaTariffDir = parser.psaTariffDir();
 | 
				
			||||||
 | 
					    QString iniFileName = parser.iniFileName();
 | 
				
			||||||
 | 
					    bool const dryRun = parser.dryRun();
 | 
				
			||||||
 | 
					    bool const noUpdatePsaHardware = parser.noUpdatePsaHardware();
 | 
				
			||||||
 | 
					    bool const showYoctoVersion = parser.yoctoVersion();
 | 
				
			||||||
 | 
					    bool const showYoctoInstallStatus = parser.yoctoInstallStatus();
 | 
				
			||||||
 | 
					    bool const showExtendedVersion = parser.extendedVersion();
 | 
				
			||||||
 | 
					    bool const alwaysDownloadConfig = parser.alwaysDownloadConfig();
 | 
				
			||||||
 | 
					    bool const alwaysDownloadDC = parser.alwaysDownloadDC();
 | 
				
			||||||
 | 
					    Update::setPPid(parser.ppid());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString const rtPath = QCoreApplication::applicationDirPath();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int const machineNr = read1stLineOfFile("/mnt/system_data/machine_nr");
 | 
				
			||||||
 | 
					    int const customerNr = read1stLineOfFile("/mnt/system_data/cust_nr");
 | 
				
			||||||
 | 
					    int const zoneNr = read1stLineOfFile("/mnt/system_data/zone_nr");
 | 
				
			||||||
 | 
					    QString const branchName = (zoneNr != 0)
 | 
				
			||||||
 | 
					            ? QString("zg1/zone%1").arg(zoneNr) : "master";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (Update::ppid() == -1) {
 | 
				
			||||||
 | 
					        qInfo() << "pwd ......................" << rtPath;
 | 
				
			||||||
 | 
					        qInfo() << "repositoryUrl ............" << repositoryUrl;
 | 
				
			||||||
 | 
					        qInfo() << "plugInDir ................" << plugInDir;
 | 
				
			||||||
 | 
					        qInfo() << "plugInName ..............." << plugInName;
 | 
				
			||||||
 | 
					        qInfo() << "workingDir ..............." << workingDir;
 | 
				
			||||||
 | 
					        qInfo() << "psaConfigDir ............." << psaConfigDir;
 | 
				
			||||||
 | 
					        qInfo() << "psaTariffDir ............." << psaTariffDir;
 | 
				
			||||||
 | 
					        qInfo() << "dryRun ..................." << dryRun;
 | 
				
			||||||
 | 
					        qInfo() << "noUpdatePsaHardware ......" << noUpdatePsaHardware;
 | 
				
			||||||
 | 
					        qInfo() << "alwaysDownloadConfig ....." << alwaysDownloadConfig;
 | 
				
			||||||
 | 
					        qInfo() << "alwaysDownloadDC ........." << alwaysDownloadDC;
 | 
				
			||||||
 | 
					        qInfo() << "showYoctoVersion ........." << showYoctoVersion;
 | 
				
			||||||
 | 
					        qInfo() << "showYoctoInstallStatus ..." << showYoctoInstallStatus;
 | 
				
			||||||
 | 
					        qInfo() << "showExtendedVersion ......" << showExtendedVersion;
 | 
				
			||||||
 | 
					        qInfo() << "iniFileName .............." << iniFileName;
 | 
				
			||||||
 | 
					        qInfo() << "extended-version ........." << APP_EXTENDED_VERSION;
 | 
				
			||||||
 | 
					        qInfo() << "machineNr ................" << machineNr;
 | 
				
			||||||
 | 
					        qInfo() << "customerNr ..............." << customerNr;
 | 
				
			||||||
 | 
					        qInfo() << "zoneNr ..................." << zoneNr;
 | 
				
			||||||
 | 
					        qInfo() << "parent pid ..............." << Update::ppid();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (showExtendedVersion) {
 | 
				
			||||||
 | 
					            printf(APP_EXTENDED_VERSION"\n");
 | 
				
			||||||
 | 
					            return 0;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString const &customerRepo = QDir::cleanPath(workingDir + QDir::separator() + QString("customer_%1").arg(customerNr));
 | 
				
			||||||
 | 
					    QStringList filesToUpdate;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // etc/psa_config: located under mount-path
 | 
				
			||||||
 | 
					    std::optional<QString> mountPath = System::checkForUSBStick(psaConfigDir);
 | 
				
			||||||
 | 
					    if (mountPath.has_value()) {
 | 
				
			||||||
 | 
					        filesToUpdate = System::getJsonFilesOnUsbStick(mountPath.value());
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (Update::ppid() == -1) {
 | 
				
			||||||
 | 
					            qCritical() << "Using customer repository" << customerRepo;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        QDir dir(QDir::cleanPath(customerRepo + QDir::separator() + "etc/psa_config"));
 | 
				
			||||||
 | 
					        if (dir.exists()) {
 | 
				
			||||||
 | 
					            QStringList jsons = dir.entryList(QStringList() << "DC2C*.json", QDir::Files);
 | 
				
			||||||
 | 
					            if (!jsons.isEmpty()) {
 | 
				
			||||||
 | 
					                for (QStringList::size_type i=0; i<jsons.size(); ++i) {
 | 
				
			||||||
 | 
					                    filesToUpdate << QDir::cleanPath(QString("etc/psa_config/") + jsons.at(i));
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            qCritical() << "DIRECTORY" << dir << "DOES NOT EXIST";
 | 
				
			||||||
 | 
					            return -1;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qCritical() << __LINE__ << "JSON FILES TO UPDATE" << filesToUpdate;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Update update(customerRepo,
 | 
				
			||||||
 | 
					                  QString::number(customerNr),
 | 
				
			||||||
 | 
					                  branchName,
 | 
				
			||||||
 | 
					                  plugInDir,
 | 
				
			||||||
 | 
					                  plugInName,
 | 
				
			||||||
 | 
					                  workingDir);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!filesToUpdate.empty()) {
 | 
				
			||||||
 | 
					        update.doUpdate(filesToUpdate, mountPath.has_value());
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // update.checkJsonVersions();
 | 
				
			||||||
 | 
					    //update.checkJsonVersions(filesToUpdate);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (mountPath.has_value()) {
 | 
				
			||||||
 | 
					        System::umountUSBStick();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qInfo() << "<JS-UPDATE-FINISH>";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										97
									
								
								DownloadDCJsonFiles/message_handler.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										97
									
								
								DownloadDCJsonFiles/message_handler.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,97 @@
 | 
				
			|||||||
 | 
					#include "message_handler.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <cstring>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QFileInfo>
 | 
				
			||||||
 | 
					#include <QMessageLogContext>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static char const *DBG_NAME[] = { "DBG  ", "WARN ", "CRIT ", "FATAL", "INFO " };
 | 
				
			||||||
 | 
					static bool installedMsgHandler = false;
 | 
				
			||||||
 | 
					static int debugLevel = LOG_NOTICE;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int getDebugLevel() { return debugLevel; }
 | 
				
			||||||
 | 
					void setDebugLevel(int newDebugLevel) {
 | 
				
			||||||
 | 
					    debugLevel = newDebugLevel;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool messageHandlerInstalled() {
 | 
				
			||||||
 | 
					    return installedMsgHandler;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
 | 
				
			||||||
 | 
					    installedMsgHandler = (handler != 0);
 | 
				
			||||||
 | 
					    static QtMessageHandler prevHandler = nullptr;
 | 
				
			||||||
 | 
					    if (handler) {
 | 
				
			||||||
 | 
					        prevHandler = qInstallMessageHandler(handler);
 | 
				
			||||||
 | 
					        return prevHandler;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        return qInstallMessageHandler(prevHandler);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					/// \brief Print message according to given debug level.
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					/// \note Install this function using qInstallMsgHandler().
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					///  int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					///     installMsgHandler(atbDebugOutput);
 | 
				
			||||||
 | 
					///     QApplication app(argc, argv);
 | 
				
			||||||
 | 
					///     ...
 | 
				
			||||||
 | 
					///     return app.exec();
 | 
				
			||||||
 | 
					///  }
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
 | 
				
			||||||
 | 
					    Q_UNUSED(context);
 | 
				
			||||||
 | 
					    QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    switch (debugLevel) {
 | 
				
			||||||
 | 
					        case LOG_DEBUG: { // debug-level message
 | 
				
			||||||
 | 
					            syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_INFO: { // informational message
 | 
				
			||||||
 | 
					            if (type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_NOTICE: { // normal, but significant, condition
 | 
				
			||||||
 | 
					            if (type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_WARNING: { // warning conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_ERR: { // error conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_CRIT: { // critical conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_ALERT: { // action must be taken immediately
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_EMERG: { // system is unusable
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        default: {
 | 
				
			||||||
 | 
					            //fprintf(stderr, "%s No ErrorLevel defined! %s\n",
 | 
				
			||||||
 | 
					            //    datetime.toStdString().c_str(), msg.toStdString().c_str());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										23
									
								
								DownloadDCJsonFiles/message_handler.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								DownloadDCJsonFiles/message_handler.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,23 @@
 | 
				
			|||||||
 | 
					#ifndef MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
 | 
					#define MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#ifdef __linux__
 | 
				
			||||||
 | 
					#include <syslog.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int getDebugLevel();
 | 
				
			||||||
 | 
					void setDebugLevel(int newDebugLevel);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool messageHandlerInstalled();
 | 
				
			||||||
 | 
					QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 | 
				
			||||||
 | 
					// typedef void (*QtMessageHandler)(QtMsgType, const char *);
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const char *msg);
 | 
				
			||||||
 | 
					#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 | 
				
			||||||
 | 
					// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										99
									
								
								interfaces.h → DownloadDCJsonFiles/plugins/interfaces.h
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										99
									
								
								interfaces.h → DownloadDCJsonFiles/plugins/interfaces.h
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							@@ -24,6 +24,7 @@ struct T_emp
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
   // dynamic:
 | 
					   // dynamic:
 | 
				
			||||||
   uint8_t state;      // step counter of EMP (electronic coin checker) FSM (finite state machine):
 | 
					   uint8_t state;      // step counter of EMP (electronic coin checker) FSM (finite state machine):
 | 
				
			||||||
 | 
					   /*
 | 
				
			||||||
   // 0=start command
 | 
					   // 0=start command
 | 
				
			||||||
       // 1=powered, do emp ini, send reset
 | 
					       // 1=powered, do emp ini, send reset
 | 
				
			||||||
       // 2=delay
 | 
					       // 2=delay
 | 
				
			||||||
@@ -39,7 +40,7 @@ struct T_emp
 | 
				
			|||||||
       // 90: stop all, 1s delay
 | 
					       // 90: stop all, 1s delay
 | 
				
			||||||
       // 99: off, all stopped
 | 
					       // 99: off, all stopped
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					*/
 | 
				
			||||||
   uint8_t pollingRunning;
 | 
					   uint8_t pollingRunning;
 | 
				
			||||||
   uint8_t paymentRunning;
 | 
					   uint8_t paymentRunning;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -238,6 +239,7 @@ struct T_dynamicCondition
 | 
				
			|||||||
        uint8_t lastVDoorState;
 | 
					        uint8_t lastVDoorState;
 | 
				
			||||||
        uint8_t lastCBstate;
 | 
					        uint8_t lastCBstate;
 | 
				
			||||||
        char        paymentInProgress;
 | 
					        char        paymentInProgress;
 | 
				
			||||||
 | 
					        // Version Szeged:  aug2023
 | 
				
			||||||
        //	0: stopped by timeout
 | 
					        //	0: stopped by timeout
 | 
				
			||||||
        //  1: running  2: wait4lastCoin
 | 
					        //  1: running  2: wait4lastCoin
 | 
				
			||||||
        //				3: payment stopped manually, coins in Escrow
 | 
					        //				3: payment stopped manually, coins in Escrow
 | 
				
			||||||
@@ -246,6 +248,21 @@ struct T_dynamicCondition
 | 
				
			|||||||
        //			    6: coins encashed   7:coins returned
 | 
					        //			    6: coins encashed   7:coins returned
 | 
				
			||||||
        //				8: CoinChecker or MDB on Error
 | 
					        //				8: CoinChecker or MDB on Error
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // since Schoenau with bill and changer, nov2023
 | 
				
			||||||
 | 
					        //0 = no payment
 | 
				
			||||||
 | 
					        //will be set to 1 by cash_startCollection()
 | 
				
			||||||
 | 
					        //neu 1: wait for devices getting ready for payment
 | 
				
			||||||
 | 
					        //2 = payment,
 | 
				
			||||||
 | 
					        //3 = wait for last coin/bill
 | 
				
			||||||
 | 
					        //4 = Bezahlvorgang manuell beendet
 | 
				
			||||||
 | 
					        //5 = payment stopped autom, amount collected, coins in Escrow
 | 
				
			||||||
 | 
					        //6 = Bezahlvorgang beendet weil ZK voll
 | 
				
			||||||
 | 
					        //4,5,6: payment done, keep on polling, wait for cash or return command
 | 
				
			||||||
 | 
					        //7 = encash collected money from coin escrow into cash box
 | 
				
			||||||
 | 
					        //8 = return "amountToReturn", can be complete inserted amount or only overpayment
 | 
				
			||||||
 | 
					        //9 = wait for changer result
 | 
				
			||||||
 | 
					        //10= print refund receipt with "amountToReturn"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        char        res1;
 | 
					        char        res1;
 | 
				
			||||||
        uint16_t    U_Batt;
 | 
					        uint16_t    U_Batt;
 | 
				
			||||||
@@ -397,6 +414,7 @@ struct T_bna
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class DownloadThread;
 | 
				
			||||||
class hwinf
 | 
					class hwinf
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -2252,14 +2270,23 @@ public:
 | 
				
			|||||||
    virtual void bna_requestCurrentNotes() const {}
 | 
					    virtual void bna_requestCurrentNotes() const {}
 | 
				
			||||||
    // send command to DC in order to get transaction data
 | 
					    // send command to DC in order to get transaction data
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const {
 | 
					    virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
        Q_UNUSED(latestBill);
 | 
					        Q_UNUSED(latestBill);
 | 
				
			||||||
        Q_UNUSED(currentNotes);
 | 
					        Q_UNUSED(currentNotes);
 | 
				
			||||||
        return 0;
 | 
					        return 0;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    // returns number of collected bank notes since start-command (current transaction)
 | 
					    // returns number of collected bank notes since start-command (current transaction)
 | 
				
			||||||
    //  latestBill: last accepted bank note, value in cent
 | 
					    // return value: numbers of bills or 99 in case of error
 | 
				
			||||||
    //  currentNotes an array with up to 16 (further) notes collected
 | 
					    //  latestBill: not used
 | 
				
			||||||
 | 
					    // in case of error: currentNotes[0,1,2,3] = 1..4 error number(s)
 | 
				
			||||||
 | 
					    // in normal case:
 | 
				
			||||||
 | 
					    //  currentNotes[0]: last bill in cent (e.g. 1000 = 10€)
 | 
				
			||||||
 | 
					    //  currentNotes[1]: bin 1 = bill is still in escrow   else bill is stacked
 | 
				
			||||||
 | 
					    //       note: by now (dec2023) escrow is not used, bills always go to stacker (box)
 | 
				
			||||||
 | 
					    //  currentNotes[2]: total sum of bills in cent, low word (16bit)
 | 
				
			||||||
 | 
					    //  currentNotes[3]: total sum of bills in cent, high word (16bit)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual void bna_requestStackerLevel() const {}
 | 
					    virtual void bna_requestStackerLevel() const {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -2273,9 +2300,73 @@ public:
 | 
				
			|||||||
    //                                          countOfBills[1] for 10€   and so on
 | 
					    //                                          countOfBills[1] for 10€   and so on
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // download device controller
 | 
				
			||||||
 | 
					    virtual bool dcDownloadRequest(QString const &fileToDownload) const {
 | 
				
			||||||
 | 
					        Q_UNUSED(fileToDownload);
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadRequested() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadResetRequest() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadRequestAck() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadRunning() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadFinished() { return false; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual bool dcDownloadReportStart() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadReportRunning() const { return true; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadReportFinished() { return true; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual bool dcDownloadThreadStart() { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadThreadRunning() const { return true; }
 | 
				
			||||||
 | 
					    virtual void dcDownloadThreadFinalize(DownloadThread *) {}
 | 
				
			||||||
 | 
					    virtual bool dcDownloadThreadFinished() const { return true; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadReportThreadStart() { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadReportThreadRunning() const { return true; }
 | 
				
			||||||
 | 
					    virtual void dcDownloadReportThreadFinalize() {}
 | 
				
			||||||
 | 
					    virtual void dcDownloadReportThreadQuit() {}
 | 
				
			||||||
 | 
					    virtual bool dcDownloadReportThreadFinished() const { return true; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual QString dcDownloadFileName() const { return ""; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadSetRequested(bool requested) {
 | 
				
			||||||
 | 
					       Q_UNUSED(requested); return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadSetRunning(bool running) {
 | 
				
			||||||
 | 
					       Q_UNUSED(running); return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadSetFinished(bool finished) {
 | 
				
			||||||
 | 
					       Q_UNUSED(finished); return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    virtual void dcDownloadSetTotalBlockNumber(uint16_t totalBlockNumber) {
 | 
				
			||||||
 | 
					       Q_UNUSED(totalBlockNumber);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    virtual void dcDownloadSetCurrentBlockNumber(uint16_t currentBlockNumber) {
 | 
				
			||||||
 | 
					       Q_UNUSED(currentBlockNumber);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadGetRequested() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadGetRunning() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadGetFinished() const { return false; }
 | 
				
			||||||
 | 
					    virtual uint16_t dcDownloadGetTotalBlockNumber() const { return 0; }
 | 
				
			||||||
 | 
					    virtual uint16_t dcDownloadGetCurrentBlockNumber() const { return 0; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual QObject const *getAPI() { return nullptr; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
signals:
 | 
					signals:
 | 
				
			||||||
 | 
					    /*
 | 
				
			||||||
 | 
					        NOTE: the difference between a virtual Qt signal and a normal Qt signal:
 | 
				
			||||||
 | 
					        A Qt virtual signal is a connection that is established using a pointer
 | 
				
			||||||
 | 
					        or reference and is not connected to an object or data. It is therefore
 | 
				
			||||||
 | 
					        not bound to a particular object, but to a specific class (object type).
 | 
				
			||||||
 | 
					        Qt virtual signals are useful because they allow you to create
 | 
				
			||||||
 | 
					        connections without worrying about whether an object or a specific data
 | 
				
			||||||
 | 
					        element has been destroyed.
 | 
				
			||||||
 | 
					        https://www.youtube.com/watch?v=HTH3VFfqsXw
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    virtual void hwapi_reportDCDownloadStatus(QString const&) const {}
 | 
				
			||||||
 | 
					    virtual void hwapi_reportDCDownloadSuccess(QString const&) const {}
 | 
				
			||||||
 | 
					    virtual void hwapi_reportDCDownloadFailure(QString const&) const {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual void hwapi_templatePrintFinished_OK(void) const=0;
 | 
					    virtual void hwapi_templatePrintFinished_OK(void) const=0;
 | 
				
			||||||
    virtual void hwapi_templatePrintFinished_Err(void) const=0;
 | 
					    virtual void hwapi_templatePrintFinished_Err(void) const=0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1,6 +1,5 @@
 | 
				
			|||||||
#ifndef COMMAND_H_INCLUDED
 | 
					#ifndef COMMAND_H_INCLUDED
 | 
				
			||||||
#define COMMAND_H_INCLUDED
 | 
					#define COMMAND_H_INCLUDED
 | 
				
			||||||
#endif // COMMAND_H_INCLUDED
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <QObject>
 | 
					#include <QObject>
 | 
				
			||||||
#include <QCoreApplication>
 | 
					#include <QCoreApplication>
 | 
				
			||||||
@@ -33,3 +32,5 @@ private slots:
 | 
				
			|||||||
    void readyReadStandardError();
 | 
					    void readyReadStandardError();
 | 
				
			||||||
    void finished(int exitCode, QProcess::ExitStatus exitStatus);
 | 
					    void finished(int exitCode, QProcess::ExitStatus exitStatus);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // COMMAND_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										477
									
								
								DownloadDCJsonFiles/update.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										477
									
								
								DownloadDCJsonFiles/update.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,477 @@
 | 
				
			|||||||
 | 
					#include "update.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QCoreApplication>
 | 
				
			||||||
 | 
					#include <QFile>
 | 
				
			||||||
 | 
					#include <QTemporaryFile>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					#include <QTextStream>
 | 
				
			||||||
 | 
					#include <QRegularExpression>
 | 
				
			||||||
 | 
					#include <QRegExp>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
 | 
				
			||||||
 | 
					#include "unistd.h"
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QSharedMemory>
 | 
				
			||||||
 | 
					#include <QScopedPointer>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QThread>
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <QPluginLoader>
 | 
				
			||||||
 | 
					#include <QMap>
 | 
				
			||||||
 | 
					#include <cmath>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define UPDATE_OPKG                 (1)
 | 
				
			||||||
 | 
					#define UPDATE_DC                   (0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					qint64 Update::c_ppid = -1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static const QMap<QString, int> baudrateMap = {
 | 
				
			||||||
 | 
					  {"1200"   ,   0}, {"9600"   ,   1}, {"19200"  ,   2}, {"38400"  ,   3},
 | 
				
			||||||
 | 
					  {"57600"  ,   4}, {"115200" ,   5}
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QPluginLoader Update::pluginLoader;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
 | 
				
			||||||
 | 
					    hwinf *hw = nullptr;
 | 
				
			||||||
 | 
					    if (plugInDir.exists()) {
 | 
				
			||||||
 | 
					        QString pluginLibName(fname);
 | 
				
			||||||
 | 
					        pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
 | 
				
			||||||
 | 
					        QFileInfo info(pluginLibName);
 | 
				
			||||||
 | 
					        if (info.exists()) {
 | 
				
			||||||
 | 
					            pluginLibName = plugInDir.absoluteFilePath(pluginLibName);
 | 
				
			||||||
 | 
					            pluginLoader.setFileName(pluginLibName);
 | 
				
			||||||
 | 
					            // static QPluginLoader pluginLoader(pluginLibName);
 | 
				
			||||||
 | 
					            if (!pluginLoader.load()) {
 | 
				
			||||||
 | 
					                qCritical() << "in directory" << plugInDir.absolutePath();
 | 
				
			||||||
 | 
					                qCritical() << "cannot load plugin" << pluginLoader.fileName();
 | 
				
			||||||
 | 
					                qCritical() << pluginLoader.errorString();
 | 
				
			||||||
 | 
					                return nullptr;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            qCritical() << "loadDCPlugin() plugin directory:" << plugInDir.absolutePath();
 | 
				
			||||||
 | 
					            qCritical() << "loadDCPlugin() plugin file name:" << pluginLoader.fileName();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (!pluginLoader.isLoaded()) {
 | 
				
			||||||
 | 
					                qCritical() << pluginLoader.errorString();
 | 
				
			||||||
 | 
					                return nullptr;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            QObject *plugin = pluginLoader.instance();
 | 
				
			||||||
 | 
					            if (!plugin) {
 | 
				
			||||||
 | 
					                qCritical() << "cannot start instance";
 | 
				
			||||||
 | 
					                return nullptr;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            if (! (hw = qobject_cast<hwinf *>(plugin))) {
 | 
				
			||||||
 | 
					                qCritical() << "cannot cast plugin" << plugin << "to hwinf";
 | 
				
			||||||
 | 
					                return nullptr;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            qCritical() << pluginLibName << "does not exist";
 | 
				
			||||||
 | 
					            return nullptr;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        qCritical() << "plugins directory" << plugInDir.absolutePath()
 | 
				
			||||||
 | 
					                    << "does not exist";
 | 
				
			||||||
 | 
					        return nullptr;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return hw;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Update::unloadDCPlugin() {
 | 
				
			||||||
 | 
					    if (pluginLoader.unload()) {
 | 
				
			||||||
 | 
					        qCritical() << "unloaded plugin" << pluginLoader.fileName();
 | 
				
			||||||
 | 
					        // Note: will re-instantiate the library !
 | 
				
			||||||
 | 
					        // QObject *rootObject = pluginLoader.instance();
 | 
				
			||||||
 | 
					        // if (rootObject) {
 | 
				
			||||||
 | 
					        //    qCritical() << "reloaded plugin: root object again available";
 | 
				
			||||||
 | 
					        //    return false;
 | 
				
			||||||
 | 
					        // }
 | 
				
			||||||
 | 
					        // qCritical()unloaded plugin: root object gone";
 | 
				
			||||||
 | 
					        return true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class hwapi;
 | 
				
			||||||
 | 
					Update::Update(QString customerRepository,
 | 
				
			||||||
 | 
					               QString customerNrStr,
 | 
				
			||||||
 | 
					               QString branchName,
 | 
				
			||||||
 | 
					               QString plugInDir,
 | 
				
			||||||
 | 
					               QString pluginName,
 | 
				
			||||||
 | 
					               QString workingDir,
 | 
				
			||||||
 | 
					               bool dryRun,
 | 
				
			||||||
 | 
					               QObject *parent,
 | 
				
			||||||
 | 
					               char const *serialInterface,
 | 
				
			||||||
 | 
					               char const *baudrate)
 | 
				
			||||||
 | 
					    : QObject(parent)
 | 
				
			||||||
 | 
					    , m_hw(loadDCPlugin(QDir(plugInDir), pluginName))
 | 
				
			||||||
 | 
					    , m_serialInterface(serialInterface)
 | 
				
			||||||
 | 
					    , m_baudrate(baudrate)
 | 
				
			||||||
 | 
					    , m_customerRepository(customerRepository)
 | 
				
			||||||
 | 
					    , m_customerNrStr(customerNrStr)
 | 
				
			||||||
 | 
					    , m_branchName(branchName)
 | 
				
			||||||
 | 
					    , m_pluginName(pluginName)
 | 
				
			||||||
 | 
					    , m_workingDir(workingDir)
 | 
				
			||||||
 | 
					    , m_dryRun(dryRun)
 | 
				
			||||||
 | 
					    , m_sys_areDCdataValid(false) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_start = QDateTime::currentDateTime();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (Update::ppid() == -1) {
 | 
				
			||||||
 | 
					        if (!m_hw) {
 | 
				
			||||||
 | 
					            qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin loaded ???";
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            int tries = 20;
 | 
				
			||||||
 | 
					            while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
 | 
				
			||||||
 | 
					                // must deliver 'true', only then are all data from hwapi valid
 | 
				
			||||||
 | 
					                if (--tries < 0) {
 | 
				
			||||||
 | 
					                    qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                m_hw->dc_autoRequest(true);
 | 
				
			||||||
 | 
					                QThread::msleep(500);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_sys_areDCDataValid ..."
 | 
				
			||||||
 | 
					                        << m_sys_areDCdataValid;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Update::~Update() {
 | 
				
			||||||
 | 
					    // unloadDCPlugin();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					bool Update::doUpdate() { // test function
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int numberOfFiles = 3;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString s = nextTimePoint();
 | 
				
			||||||
 | 
					    s += " sending ";
 | 
				
			||||||
 | 
					    s += QString("%1 ...done <JS-PROGRESS>").arg("DC2C_cash.json");
 | 
				
			||||||
 | 
					    s += QString::number(ceil(((1 * 100.0) / (double)numberOfFiles)));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qInfo() << s.toUtf8().constData();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QThread::msleep(2000);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    s = nextTimePoint();
 | 
				
			||||||
 | 
					    s += " sending ";
 | 
				
			||||||
 | 
					    s += QString("%1 ...done <JS-PROGRESS>").arg("DC2C_device.json");
 | 
				
			||||||
 | 
					    s += QString::number(ceil(((2 * 100.0) / (double)numberOfFiles)));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qInfo() << s.toUtf8().constData();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QThread::msleep(2000);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    s = nextTimePoint();
 | 
				
			||||||
 | 
					    s += " sending ";
 | 
				
			||||||
 | 
					    s += QString("%1 ...done <JS-PROGRESS>").arg("DC2C_print01.json");
 | 
				
			||||||
 | 
					    s += QString::number(ceil(((3 * 100.0) / (double)numberOfFiles)));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qInfo() << s.toUtf8().constData();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QThread::msleep(2000);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return true;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Update::doUpdate(QStringList const &filesToWorkOn, bool usbStickDetected) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!m_hw) {
 | 
				
			||||||
 | 
					        qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
 | 
				
			||||||
 | 
					                    << "ERROR!!! m_hw == nullptr";
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int tries = 20;
 | 
				
			||||||
 | 
					    while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
 | 
				
			||||||
 | 
					        // must deliver 'true', only then are all data from hwapi valid
 | 
				
			||||||
 | 
					        if (--tries < 0) {
 | 
				
			||||||
 | 
					            qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
 | 
				
			||||||
 | 
					                        << "ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED";
 | 
				
			||||||
 | 
					            return false;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
 | 
				
			||||||
 | 
					                    << "ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED (" << tries << ")";
 | 
				
			||||||
 | 
					        m_hw->dc_autoRequest(true);
 | 
				
			||||||
 | 
					        QThread::msleep(500);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool res = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QList<QString>::const_iterator it;
 | 
				
			||||||
 | 
					    for (it = filesToWorkOn.cbegin(); it != filesToWorkOn.cend(); ++it) {
 | 
				
			||||||
 | 
					        QString const &fToWorkOn = usbStickDetected ? QDir::cleanPath(it->trimmed())
 | 
				
			||||||
 | 
					            : QDir::cleanPath(m_customerRepository + QDir::separator() + it->trimmed());
 | 
				
			||||||
 | 
					        if (fToWorkOn.contains("DC2C_print", Qt::CaseInsensitive)
 | 
				
			||||||
 | 
					         && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					            res = true;
 | 
				
			||||||
 | 
					            int i = fToWorkOn.indexOf("DC2C_print", Qt::CaseInsensitive);
 | 
				
			||||||
 | 
					            int const templateIdx = fToWorkOn.mid(i).midRef(10, 2).toInt();
 | 
				
			||||||
 | 
					            if ((templateIdx < 1) || (templateIdx > 32)) {
 | 
				
			||||||
 | 
					                qCritical() << "WRONG TEMPLATE INDEX" << templateIdx;
 | 
				
			||||||
 | 
					                res = false;
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                if ((res = updatePrinterTemplate(templateIdx, fToWorkOn))) {
 | 
				
			||||||
 | 
					                    qCritical() <<
 | 
				
			||||||
 | 
					                        QString("DOWNLOADED PRINTER TEMPLATE %1 WITH INDEX=%2")
 | 
				
			||||||
 | 
					                            .arg(fToWorkOn)
 | 
				
			||||||
 | 
					                            .arg(templateIdx);
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
 | 
				
			||||||
 | 
					                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					            if ((res = updateCashConf(fToWorkOn))) {
 | 
				
			||||||
 | 
					                qCritical() << QString("DOWNLOADED CASH TEMPLATE %1").arg(fToWorkOn);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else if (fToWorkOn.contains("DC2C_conf", Qt::CaseInsensitive)
 | 
				
			||||||
 | 
					                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					            if ((res = updateConfig(fToWorkOn))) {
 | 
				
			||||||
 | 
					                qCritical() << QString("DOWNLOADED CONFIG TEMPLATE %1").arg(fToWorkOn);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else if (fToWorkOn.contains("DC2C_device", Qt::CaseInsensitive)
 | 
				
			||||||
 | 
					                && fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					            if ((res = updateDeviceConf(fToWorkOn))) {
 | 
				
			||||||
 | 
					                qCritical() << QString("DOWNLOADED DEVICE TEMPLATE %1").arg(fToWorkOn);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;
 | 
				
			||||||
 | 
					            res = false;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return res;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Update::checkJsonVersions(QStringList const& jsonFileNames) {
 | 
				
			||||||
 | 
					    if (!m_hw) {
 | 
				
			||||||
 | 
					        qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
 | 
				
			||||||
 | 
					                    << "ERROR!!! m_hw == nullptr";
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int tries = 20;
 | 
				
			||||||
 | 
					    while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
 | 
				
			||||||
 | 
					        // must deliver 'true', only then are all data from hwapi valid
 | 
				
			||||||
 | 
					        if (--tries < 0) {
 | 
				
			||||||
 | 
					            qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
 | 
				
			||||||
 | 
					                        << "ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED";
 | 
				
			||||||
 | 
					            return false;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        qCritical() << "(" << __func__ << ":" << __LINE__ << "):"
 | 
				
			||||||
 | 
					                    << "ERROR!!! DC DATA NOT VALID -> CA-SLAVE-PLUGIN NOT CONNECTED (" << tries << ")";
 | 
				
			||||||
 | 
					        m_hw->dc_autoRequest(true);
 | 
				
			||||||
 | 
					        QThread::msleep(500);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    for (QStringList::size_type i=0; i < jsonFileNames.size(); ++i) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        uint8_t jsonNr = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        QString const &fName = jsonFileNames[i];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // send one request for every single version
 | 
				
			||||||
 | 
					        // jsonNr=1...36, 1=config file (cust.Nr) 2=devices  3=cash  4=res.
 | 
				
			||||||
 | 
					        //      6=printer template 1 ..... 36= template 32
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (fName.endsWith("conf.json")) {
 | 
				
			||||||
 | 
					            jsonNr = 1;
 | 
				
			||||||
 | 
					        } else
 | 
				
			||||||
 | 
					        if (fName.endsWith("device.json")) {
 | 
				
			||||||
 | 
					            jsonNr = 2;
 | 
				
			||||||
 | 
					        } else
 | 
				
			||||||
 | 
					        if (fName.endsWith("cash.json")) {
 | 
				
			||||||
 | 
					            jsonNr = 3;
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            QRegularExpressionMatch match;
 | 
				
			||||||
 | 
					            static const QRegularExpression re("^(.*print)([0-3][0-9])\\.json\\s*$");
 | 
				
			||||||
 | 
					            int idx = fName.indexOf(re, 0, &match);
 | 
				
			||||||
 | 
					            if (idx != -1) {
 | 
				
			||||||
 | 
					                QString captured = match.captured(match.lastCapturedIndex());
 | 
				
			||||||
 | 
					                bool ok = false;
 | 
				
			||||||
 | 
					                int n = captured.toInt(&ok);
 | 
				
			||||||
 | 
					                if (ok) {
 | 
				
			||||||
 | 
					                    // note: use 5 (instead of 4 -> index has been shifted)
 | 
				
			||||||
 | 
					                    jsonNr = n + 5;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (jsonNr != 0) {
 | 
				
			||||||
 | 
					            // send one request for every single version
 | 
				
			||||||
 | 
					            // jsonNr=1...36, 1=config file (cust.Nr) 2=devices  3=cash  4=res.
 | 
				
			||||||
 | 
					            //      5=printer template 1 ..... 36= template 32
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            m_hw->sys_requestJsonVersions(jsonNr);
 | 
				
			||||||
 | 
					            QThread::msleep(500);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            char buf[64];
 | 
				
			||||||
 | 
					            memset(buf, 0x00, sizeof(buf));
 | 
				
			||||||
 | 
					            m_hw->sys_getJsonVersions(jsonNr, buf);
 | 
				
			||||||
 | 
					            buf[16] = '\0'; // the DC only handles 16 bytes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            static const QByteArray cb(16, (char)0xff);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            QString const installedVersion(QString::fromStdString(buf));
 | 
				
			||||||
 | 
					            QString const fileVersion = getFileVersion(jsonFileNames[i]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            QFileInfo fi(jsonFileNames[i]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            qCritical() << endl;
 | 
				
			||||||
 | 
					            qCritical() << "                json request nr:" << jsonNr;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (installedVersion == fileVersion) {
 | 
				
			||||||
 | 
					                qCritical() << "                      json file:" << fi.fileName();
 | 
				
			||||||
 | 
					                qCritical() << "        installed version in DC:" << installedVersion;
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if (cb == QByteArray(buf) && fileVersion == "") {
 | 
				
			||||||
 | 
					                qCritical() << "unknown json file (repo and DC):" << fi.fileName();
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                qCritical() << "                      json file:" << fi.fileName();
 | 
				
			||||||
 | 
					                qCritical() << "        installed version in DC:" << installedVersion;
 | 
				
			||||||
 | 
					                qCritical() << "     file version in repository:" << fileVersion;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            qCritical() << "CANNOT FIND JSON-NR FOR" << fName;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QString Update::getFileVersion(QString const& jsonFileName) {
 | 
				
			||||||
 | 
					    // "version":"15.10.2023 14:55 02.00.06",
 | 
				
			||||||
 | 
					    static const QRegularExpression re("^.*(\\\"[Vv]ersion\\\":)([\\s\\\"]{0,})([^,\\\"]{0,}).*$");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString fileVersion("");
 | 
				
			||||||
 | 
					    QFile inputFile(QDir::cleanPath(m_customerRepository + QDir::separator() + jsonFileName));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (inputFile.exists()) {
 | 
				
			||||||
 | 
					        if (inputFile.open(QIODevice::ReadOnly)) {
 | 
				
			||||||
 | 
					           QTextStream in(&inputFile);
 | 
				
			||||||
 | 
					           while (!in.atEnd()) {
 | 
				
			||||||
 | 
					              QString line = in.readLine();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					              QRegularExpressionMatch match;
 | 
				
			||||||
 | 
					              int idx = line.indexOf(re, 0, &match);
 | 
				
			||||||
 | 
					              if (idx != -1) {
 | 
				
			||||||
 | 
					                  int const lastCaptured = match.lastCapturedIndex();
 | 
				
			||||||
 | 
					                  // the dc only sends 16 Byte
 | 
				
			||||||
 | 
					                  fileVersion = match.captured(lastCaptured);
 | 
				
			||||||
 | 
					                  fileVersion.truncate(16);
 | 
				
			||||||
 | 
					                  break;
 | 
				
			||||||
 | 
					              }
 | 
				
			||||||
 | 
					           }
 | 
				
			||||||
 | 
					           inputFile.close();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        // qCritical() << "ERROR" << inputFile.fileName() << "does not exist";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return fileVersion;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Update::downloadJson(enum FileTypeJson type,
 | 
				
			||||||
 | 
					                          int templateIdx,
 | 
				
			||||||
 | 
					                          QString jsFileToSendToDC) const {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_hw->dc_autoRequest(true); // downloading Json needs the AutoEmission flag
 | 
				
			||||||
 | 
					    qDebug() << "SET AUTO-REQUEST=TRUE";
 | 
				
			||||||
 | 
					    QThread::sleep(1);  // make sure the auto-request flag is acknowledged
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QStringList lst;
 | 
				
			||||||
 | 
					    bool ready = false;
 | 
				
			||||||
 | 
					    int nTry = 25;
 | 
				
			||||||
 | 
					    while ((ready = m_hw->sys_ready4sending()) == false) {
 | 
				
			||||||
 | 
					        QThread::msleep(200);
 | 
				
			||||||
 | 
					        if (--nTry <= 0) {
 | 
				
			||||||
 | 
					            qCritical() << "SYS NOT READY FOR SENDING AFTER 5 SECONDS";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool ret = false;
 | 
				
			||||||
 | 
					    QString msg;
 | 
				
			||||||
 | 
					    lst.clear();
 | 
				
			||||||
 | 
					    if (ready) {
 | 
				
			||||||
 | 
					        QFile file(jsFileToSendToDC);
 | 
				
			||||||
 | 
					        QFileInfo fi(jsFileToSendToDC); // max. size of template file is 800 bytes
 | 
				
			||||||
 | 
					        if (file.exists()) {
 | 
				
			||||||
 | 
					            if (file.open(QIODevice::ReadOnly)) {
 | 
				
			||||||
 | 
					                if (fi.size() > 0 && fi.size() <= 800) {
 | 
				
			||||||
 | 
					                    QByteArray ba = file.readAll();
 | 
				
			||||||
 | 
					                    // kindOfFile: 1=config, 2=device, 3=cash, 4=serial, 5=time, 6=printer
 | 
				
			||||||
 | 
					                    //      nrOfTemplate=1...32 if kindOfFile==6
 | 
				
			||||||
 | 
					                    //      content = content of the Json file, max 800byte ascii signs
 | 
				
			||||||
 | 
					                    if (m_hw->sys_sendJsonFileToDc((uint8_t)(type),
 | 
				
			||||||
 | 
					                                                   templateIdx,
 | 
				
			||||||
 | 
					                                                   (uint8_t *)ba.data())) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                        /*
 | 
				
			||||||
 | 
					                         *  Note: the machine id is contained in DC2C_conf.json.
 | 
				
			||||||
 | 
					                         *  The idea was to use this to check if the download of
 | 
				
			||||||
 | 
					                         *  the json-file was correct. It did not work, as the
 | 
				
			||||||
 | 
					                         *  update of the PSA (to reflect a change in the
 | 
				
			||||||
 | 
					                         *  machine id) did not happen immediately.
 | 
				
			||||||
 | 
					                         *
 | 
				
			||||||
 | 
					                            m_hw->dc_autoRequest(true);
 | 
				
			||||||
 | 
					                            QThread::msleep(500);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                            // testing
 | 
				
			||||||
 | 
					                            m_hw->request_ReadbackMachineID();
 | 
				
			||||||
 | 
					                            QThread::msleep(500);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                            uint8_t data[64];
 | 
				
			||||||
 | 
					                            memset(data, 0x00, sizeof(data));
 | 
				
			||||||
 | 
					                            uint8_t length = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                            m_hw->readback_machineIDdata(&length, data);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                            QThread::msleep(500);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                            QByteArray ba((const char*)data, length);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                            qCritical() << length << "MACHINE ID =" << ba.toHex(':');
 | 
				
			||||||
 | 
					                        */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                        ret = true;
 | 
				
			||||||
 | 
					                    } else {
 | 
				
			||||||
 | 
					                        qCritical() << QString("ERROR SEND JSON-FILE %1 TO DC").arg(file.fileName());
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                } else {
 | 
				
			||||||
 | 
					                    qCritical() << QString("SIZE OF %1 TOO BIG (%2 BYTES)").arg(jsFileToSendToDC).arg(fi.size());
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                qCritical() << QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING";
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            qCritical() << (QString(jsFileToSendToDC) + " DOES NOT EXIST");
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return ret;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Update::updatePrinterTemplate(int templateIdx, QString jsFile) const {
 | 
				
			||||||
 | 
					    return downloadJson(FileTypeJson::PRINTER, templateIdx, jsFile);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Update::updateConfig(QString jsFile) {
 | 
				
			||||||
 | 
					    return downloadJson(FileTypeJson::CONFIG, 0, jsFile);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Update::updateCashConf(QString jsFile) {
 | 
				
			||||||
 | 
					    return downloadJson(FileTypeJson::CASH, 0, jsFile);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Update::updateDeviceConf(QString jsFile) {
 | 
				
			||||||
 | 
					    return downloadJson(FileTypeJson::DEVICE, 0, jsFile);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										160
									
								
								DownloadDCJsonFiles/update.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										160
									
								
								DownloadDCJsonFiles/update.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,160 @@
 | 
				
			|||||||
 | 
					#ifndef UPDATE_H_INCLUDED
 | 
				
			||||||
 | 
					#define UPDATE_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QObject>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QFile>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QByteArray>
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					#include <QPluginLoader>
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <initializer_list>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifdef PTU5
 | 
				
			||||||
 | 
					#define SERIAL_PORT "ttymxc2"
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					#define SERIAL_PORT "ttyUSB0"
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class Update : public QObject {
 | 
				
			||||||
 | 
					    Q_OBJECT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    hwinf *m_hw = nullptr;
 | 
				
			||||||
 | 
					    char const *m_serialInterface;
 | 
				
			||||||
 | 
					    char const *m_baudrate;
 | 
				
			||||||
 | 
					    QString m_customerRepository;
 | 
				
			||||||
 | 
					    QString m_customerNrStr;
 | 
				
			||||||
 | 
					    QString m_branchName;
 | 
				
			||||||
 | 
					    QString m_pluginName;
 | 
				
			||||||
 | 
					    QString m_workingDir;
 | 
				
			||||||
 | 
					    bool m_maintenanceMode;
 | 
				
			||||||
 | 
					    bool m_dryRun;
 | 
				
			||||||
 | 
					    bool m_sys_areDCdataValid;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    static QPluginLoader pluginLoader;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QDateTime m_start;
 | 
				
			||||||
 | 
					    QString nextTimePoint() const {
 | 
				
			||||||
 | 
					        float const secs = m_start.msecsTo(QDateTime::currentDateTime()) / 1000.0;
 | 
				
			||||||
 | 
					        return QStringLiteral("+%1s").arg(secs, 7, 'f', 2, QChar('0'));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    static qint64 c_ppid;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
 | 
				
			||||||
 | 
					    enum class FileTypeJson {CONFIG=1, DEVICE=2, CASH=3, SERIAL=4, TIME=5, PRINTER=6};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    static hwinf *loadDCPlugin(QDir const &plugInDir, QString const &fn);
 | 
				
			||||||
 | 
					    static bool unloadDCPlugin();
 | 
				
			||||||
 | 
					    static QStringList split(QString line, QChar sep = ',');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    static qint64 ppid() { return c_ppid; }
 | 
				
			||||||
 | 
					    static void setPPid(qint64 ppid) { c_ppid = ppid; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    explicit Update(QString customerRepository,
 | 
				
			||||||
 | 
					                    QString customerNrStr,
 | 
				
			||||||
 | 
					                    QString branchName,
 | 
				
			||||||
 | 
					                    QString plugInDir,
 | 
				
			||||||
 | 
					                    QString pluginName,
 | 
				
			||||||
 | 
					                    QString workingDir,
 | 
				
			||||||
 | 
					                    bool dryRun = false,
 | 
				
			||||||
 | 
					                    QObject *parent = nullptr,
 | 
				
			||||||
 | 
					                    char const *serialInterface = SERIAL_PORT,
 | 
				
			||||||
 | 
					                    char const *baudrate = "115200");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual ~Update() override;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool doUpdate(QStringList const &jsonFilesToDownload, bool usbStickDetected = false);
 | 
				
			||||||
 | 
					    bool doUpdate();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool updatePrinterTemplate(int templateIdx, QString fname) const;
 | 
				
			||||||
 | 
					    bool updateConfig(QString jsFileToSendToDC);
 | 
				
			||||||
 | 
					    bool updateCashConf(QString jsFileToSendToDC);
 | 
				
			||||||
 | 
					    bool updateDeviceConf(QString jsFileToSendToDC);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool downloadJson(enum FileTypeJson type, int templateIdx,
 | 
				
			||||||
 | 
					                      QString jsFileToSendToDC) const;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString getFileVersion(QString const& jsonFileName);
 | 
				
			||||||
 | 
					    bool checkJsonVersions(QStringList const& jsonFileNames =
 | 
				
			||||||
 | 
					                            QStringList(
 | 
				
			||||||
 | 
					                                QList(
 | 
				
			||||||
 | 
					                                    std::initializer_list<QString>{
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_conf.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_cash.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_device.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print01.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print02.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print03.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print04.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print05.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print06.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print07.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print08.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print09.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print10.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print11.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print12.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print13.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print14.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print15.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print16.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print17.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print18.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print19.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print20.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print21.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print22.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print23.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print24.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print25.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print26.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print27.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print28.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print29.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print30.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print31.json"),
 | 
				
			||||||
 | 
					                                        QString("etc/psa_config/DC2C_print32.json")})));
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					    bool checkDownloadedJsonVersions(QStringList const& jsonFileNames);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    hwinf *hw() { return m_hw; }
 | 
				
			||||||
 | 
					    hwinf const *hw() const { return m_hw; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    //QString customerId() { return m_customerId; }
 | 
				
			||||||
 | 
					    //QString const customerId() const { return m_customerId; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString branchName() { return m_branchName; }
 | 
				
			||||||
 | 
					    QString const branchName() const { return m_branchName; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    //QString repositoryPath() { return m_repositoryPath; }
 | 
				
			||||||
 | 
					    //QString const repositoryPath() const { return m_repositoryPath; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private:
 | 
				
			||||||
 | 
					    static QString jsonType(enum FileTypeJson type);
 | 
				
			||||||
 | 
					    bool openSerial(int br, QString baudrate, QString comPort) const;
 | 
				
			||||||
 | 
					    void closeSerial() const;
 | 
				
			||||||
 | 
					    bool isSerialOpen() const;
 | 
				
			||||||
 | 
					    bool resetDeviceController() const;
 | 
				
			||||||
 | 
					    QByteArray loadBinaryDCFile(QString filename) const;
 | 
				
			||||||
 | 
					    bool downloadBinaryToDC(QString const &bFile) const;
 | 
				
			||||||
 | 
					    bool updateBinary(QString const &fileToSendToDC);
 | 
				
			||||||
 | 
					    QStringList getDcSoftAndHardWareVersion();
 | 
				
			||||||
 | 
					    QString getFileVersion(QString const& jsonFile);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private slots:
 | 
				
			||||||
 | 
					    void readyReadStandardOutput();
 | 
				
			||||||
 | 
					    void readyReadStandardError();
 | 
				
			||||||
 | 
					    void finished(int exitCode, QProcess::ExitStatus exitStatus);
 | 
				
			||||||
 | 
					    void onReportDCDownloadStatus(QString const &status);
 | 
				
			||||||
 | 
					    void onReportDCDownloadSuccess(QString const &msg);
 | 
				
			||||||
 | 
					    void onReportDCDownloadFailure(QString const &errorMsg);
 | 
				
			||||||
 | 
					*/
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					#endif // UPDATE_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										87
									
								
								Git/Git.pro
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										87
									
								
								Git/Git.pro
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,87 @@
 | 
				
			|||||||
 | 
					QT += core
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TARGET = ATBUpdateGit
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					VERSION="1.0.0"
 | 
				
			||||||
 | 
					win32 {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date /t")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("time /t")
 | 
				
			||||||
 | 
					} else {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date +%d-%m-%y")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("date +%H:%M:%S")
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					INCLUDEPATH += plugins \
 | 
				
			||||||
 | 
					    $${INCLUDEINTERFACES}/ \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../common/ \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../common/include
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CONFIG += c++17
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# keep comments, as /* fall through */
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -C
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -g
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					    CONFIG += link_pkgconfig
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
 | 
				
			||||||
 | 
					    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5_YOCTO ) {
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, DesktopLinux ) {
 | 
				
			||||||
 | 
					    # QMAKE_CC = ccache $$QMAKE_CC
 | 
				
			||||||
 | 
					    # QMAKE_CXX = ccache $$QMAKE_CXX
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
 | 
				
			||||||
 | 
					    ARCH = DesktopLinux
 | 
				
			||||||
 | 
					    DEFINES+=DesktopLinux
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					SOURCES += \
 | 
				
			||||||
 | 
					        main.cpp \
 | 
				
			||||||
 | 
					        message_handler.cpp \
 | 
				
			||||||
 | 
					        ../common/src/utils_internal.cpp \
 | 
				
			||||||
 | 
					        ../common/src/command.cpp \
 | 
				
			||||||
 | 
					        ../common/src/commandline_parser.cpp \
 | 
				
			||||||
 | 
					        git_command.cpp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					HEADERS += \
 | 
				
			||||||
 | 
					        message_handler.h \
 | 
				
			||||||
 | 
					        ../common/include/utils_internal.h \
 | 
				
			||||||
 | 
					        ../common/include/command.h \
 | 
				
			||||||
 | 
					        ../common/include/commandline_parser.h \
 | 
				
			||||||
 | 
					        git_command.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					##########################################################################################
 | 
				
			||||||
 | 
					# for running program on target through QtCreator
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					   qnx: target.path = /tmp/$${TARGET}/bin
 | 
				
			||||||
 | 
					   else: unix:!android: target.path = /opt/app/tools/atbupdate/
 | 
				
			||||||
 | 
					   !isEmpty(target.path): INSTALLS += target
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										105
									
								
								Git/git_command.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										105
									
								
								Git/git_command.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,105 @@
 | 
				
			|||||||
 | 
					#include "git_command.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "command.h"
 | 
				
			||||||
 | 
					#include "utils_internal.h"
 | 
				
			||||||
 | 
					using namespace internal;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					#include <QByteArray>
 | 
				
			||||||
 | 
					#include <QFileInfo>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool GitCommand::initEnv = false;
 | 
				
			||||||
 | 
					static bool initEnv() {
 | 
				
			||||||
 | 
					    QString gitSSHCommand{""};
 | 
				
			||||||
 | 
					    QByteArray const v = qgetenv("GIT_SSH_COMMAND");
 | 
				
			||||||
 | 
					    if (v.isEmpty()) {
 | 
				
			||||||
 | 
					        QString sshKeyFile("/opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig");
 | 
				
			||||||
 | 
					        if (QFileInfo(sshKeyFile).exists()) {
 | 
				
			||||||
 | 
					            if (qgetenv("GIT_SSH_COMMAND").isNull()) {
 | 
				
			||||||
 | 
					                gitSSHCommand = "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig";
 | 
				
			||||||
 | 
					                if (!qputenv("GIT_SSH_COMMAND", QByteArray(gitSSHCommand.toStdString().c_str()))) {
 | 
				
			||||||
 | 
					                    qCritical() << "ERROR: GIT_SSH_COMMAND not put into env. Exiting...";
 | 
				
			||||||
 | 
					                    return false;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            qCritical() << "ERROR ssh-key-file" << sshKeyFile << "does not exists. Exiting...";
 | 
				
			||||||
 | 
					            return false;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        gitSSHCommand = QString(v.toStdString().c_str());
 | 
				
			||||||
 | 
					        qCritical() << "WARNING GIT_SSH_COMMAND already set in enviroment:"
 | 
				
			||||||
 | 
					                    << gitSSHCommand;
 | 
				
			||||||
 | 
					        if (gitSSHCommand != "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig") {
 | 
				
			||||||
 | 
					            qCritical() << "ERROR" << gitSSHCommand << "wrong. Exiting...";
 | 
				
			||||||
 | 
					            return false;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    // qCritical() << __func__ << ":" << __LINE__ << gitSSHCommand;
 | 
				
			||||||
 | 
					    return true;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GitCommand::GitCommand()
 | 
				
			||||||
 | 
					  : m_workingDirectory(customerRepoDir()) {
 | 
				
			||||||
 | 
					    // qCritical() << __func__ << ":" << __LINE__ << m_workingDirectory;
 | 
				
			||||||
 | 
					    if (!GitCommand::initEnv) {
 | 
				
			||||||
 | 
					        GitCommand::initEnv = ::initEnv();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool GitCommand::exec(QStringList const &options, int start_timeout, int finish_timeout) {
 | 
				
			||||||
 | 
					    bool ret = false;
 | 
				
			||||||
 | 
					    if (GitCommand::initEnv) {
 | 
				
			||||||
 | 
					        Command cmd(QString("git"), options, m_workingDirectory,
 | 
				
			||||||
 | 
					                    start_timeout, finish_timeout);
 | 
				
			||||||
 | 
					        ret = cmd.exec();
 | 
				
			||||||
 | 
					        //qCritical() << __func__ << ":" << __LINE__ << cmd.command()
 | 
				
			||||||
 | 
					        //            << "," << cmd.args()
 | 
				
			||||||
 | 
					        //            << ", result" << cmd.commandResult();
 | 
				
			||||||
 | 
					        m_commandResult = cmd.commandResult();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return ret;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool GitCommand::check(int start_timeout, int finish_timeout) {
 | 
				
			||||||
 | 
					    m_workingDirectory = customerRepoDir();
 | 
				
			||||||
 | 
					    QStringList const lst{"fsck"};
 | 
				
			||||||
 | 
					    return exec(lst, start_timeout, finish_timeout);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool GitCommand::checkout(int start_timeout, int finish_timeout) {
 | 
				
			||||||
 | 
					    m_workingDirectory = customerRepoDir();
 | 
				
			||||||
 | 
					    int const zoneNr = read1stLineOfFile("/mnt/system_data/zone_nr");
 | 
				
			||||||
 | 
					    if (zoneNr != -1) {
 | 
				
			||||||
 | 
					        QStringList const lst{"checkout", QString("zg1/zone%1").arg(zoneNr)};
 | 
				
			||||||
 | 
					        // qCritical() << __func__ << __LINE__ << lst;
 | 
				
			||||||
 | 
					        return exec(lst, start_timeout, finish_timeout);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool GitCommand::clone(int start_timeout, int finish_timeout) {
 | 
				
			||||||
 | 
					    m_workingDirectory = customerRepoRoot(); // /opt/app/tools/atbupdate !
 | 
				
			||||||
 | 
					    QDir const repoDir{customerRepoDir()};
 | 
				
			||||||
 | 
					    if (repoDir.exists() && repoDir.entryInfoList(QDir::NoDotAndDotDot|QDir::AllEntries).count() != 0) {
 | 
				
			||||||
 | 
					        qCritical() << "clone error:" << repoDir << "exists and is not empty";
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    // git clone "gitea@ptu-config.atb-comm.de:ATB/customer_999"
 | 
				
			||||||
 | 
					    QStringList const lst{"clone", repositoryUrl() + customerRepoDirName()};
 | 
				
			||||||
 | 
					    return exec(lst, start_timeout, finish_timeout);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool GitCommand::pull(int start_timeout, int finish_timeout) {
 | 
				
			||||||
 | 
					    m_workingDirectory = customerRepoDir();
 | 
				
			||||||
 | 
					    QStringList const lst{"pull"};
 | 
				
			||||||
 | 
					    return exec(lst, start_timeout, finish_timeout);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool GitCommand::status(int start_timeout, int finish_timeout) {
 | 
				
			||||||
 | 
					    m_workingDirectory = customerRepoDir();
 | 
				
			||||||
 | 
					    QStringList const lst{"status"};
 | 
				
			||||||
 | 
					    return exec(lst, start_timeout, finish_timeout);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										30
									
								
								Git/git_command.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								Git/git_command.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,30 @@
 | 
				
			|||||||
 | 
					#ifndef GIT_COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					#define GIT_COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QStringList>
 | 
				
			||||||
 | 
					#include <QScopedPointer>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class QProcess;
 | 
				
			||||||
 | 
					class GitCommand {
 | 
				
			||||||
 | 
					    static bool initEnv;
 | 
				
			||||||
 | 
					    QString m_workingDirectory;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool exec(QStringList const &options, int start_timeout = 100000,
 | 
				
			||||||
 | 
					              int finish_timeout = 100000);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString m_commandResult{};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    GitCommand();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    void resetCommandResult() { m_commandResult.clear(); }
 | 
				
			||||||
 | 
					    QString const &commandResult() const { return m_commandResult; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool status(int start_timeout = 100000, int finish_timeout = 100000);
 | 
				
			||||||
 | 
					    bool check(int start_timeout = 100000, int finish_timeout = 100000);
 | 
				
			||||||
 | 
					    bool checkout(int start_timeout = 100000, int finish_timeout = 100000);
 | 
				
			||||||
 | 
					    bool clone(int start_timeout = 100000, int finish_timeout = 100000);
 | 
				
			||||||
 | 
					    bool pull(int start_timeout = 100000, int finish_timeout = 100000);
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // GIT_COMMAND_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										170
									
								
								Git/main.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										170
									
								
								Git/main.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,170 @@
 | 
				
			|||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#include <QCoreApplication>
 | 
				
			||||||
 | 
					#include <QByteArray>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					#include <QCommandLineParser>
 | 
				
			||||||
 | 
					#include <QStandardPaths>
 | 
				
			||||||
 | 
					#include <QSettings>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QJsonDocument>
 | 
				
			||||||
 | 
					#include <QJsonObject>
 | 
				
			||||||
 | 
					#include <QJsonValue>
 | 
				
			||||||
 | 
					#include <QRegularExpression>
 | 
				
			||||||
 | 
					#include <QFile>
 | 
				
			||||||
 | 
					#include <QTextStream>
 | 
				
			||||||
 | 
					#include <QRegularExpression>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <optional>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "message_handler.h"
 | 
				
			||||||
 | 
					#include "utils_internal.h"
 | 
				
			||||||
 | 
					#include "git_command.h"
 | 
				
			||||||
 | 
					#include "commandline_parser.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					    QByteArray const value = qgetenv("LC_ALL");
 | 
				
			||||||
 | 
					    if (value.isEmpty() || value != "C") {
 | 
				
			||||||
 | 
					        qputenv("LC_ALL", "C");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    openlog("ATB-UPDATE-GIT", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QCoreApplication a(argc, argv);
 | 
				
			||||||
 | 
					    QCoreApplication::setApplicationName("ATBUpdateGit");
 | 
				
			||||||
 | 
					    QCoreApplication::setApplicationVersion(APP_VERSION);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
 | 
				
			||||||
 | 
					        atbInstallMessageHandler(nullptr);
 | 
				
			||||||
 | 
					        //atbInstallMessageHandler(atbDebugOutput);
 | 
				
			||||||
 | 
					        setDebugLevel(LOG_NOTICE);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    CommandLineParser parser;
 | 
				
			||||||
 | 
					    parser.setApplicationDescription("git-commands for the update-system");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QCommandLineOption const checkCustomerRepositoryOption{"check"};
 | 
				
			||||||
 | 
					    QCommandLineOption const cloneCustomerRepositoryOption{"clone"};
 | 
				
			||||||
 | 
					    QCommandLineOption const pullBranchOption{"pull"};
 | 
				
			||||||
 | 
					    QCommandLineOption const checkoutBranchOption("checkout");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    parser.addOption(checkCustomerRepositoryOption);
 | 
				
			||||||
 | 
					    parser.addOption(cloneCustomerRepositoryOption);
 | 
				
			||||||
 | 
					    parser.addOption(pullBranchOption);
 | 
				
			||||||
 | 
					    parser.addOption(checkoutBranchOption);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QCommandLineOption verboseOption{parser.addVersionOption()};
 | 
				
			||||||
 | 
					    parser.process(a);
 | 
				
			||||||
 | 
					    parser.readSettings();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					    // note: also used in initEnv().
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString repositoryUrl = parser.repositoryUrl();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (repositoryUrl.endsWith('/')) {
 | 
				
			||||||
 | 
					        repositoryUrl.chop(1);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!repositoryUrl.isEmpty()) {
 | 
				
			||||||
 | 
					        qInfo() << "customer repository url" << repositoryUrl;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        qCritical() << "ERROR customer repository url empty. git commands might fail.";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (repositoryUrl.contains("ptu-config.atb-comm.de")) {
 | 
				
			||||||
 | 
					        QString gitSSHCommand("");
 | 
				
			||||||
 | 
					        QByteArray const v = qgetenv("GIT_SSH_COMMAND");
 | 
				
			||||||
 | 
					        if (v.isEmpty()) {
 | 
				
			||||||
 | 
					            QString sshKeyFile("/opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig");
 | 
				
			||||||
 | 
					            if (QFileInfo(sshKeyFile).exists()) {
 | 
				
			||||||
 | 
					                if (qgetenv("GIT_SSH_COMMAND").isNull()) {
 | 
				
			||||||
 | 
					                    gitSSHCommand = "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig";
 | 
				
			||||||
 | 
					                    if (!qputenv("GIT_SSH_COMMAND", QByteArray(gitSSHCommand.toStdString().c_str()))) {
 | 
				
			||||||
 | 
					                        qCritical() << "ERROR: GIT_SSH_COMMAND not put into env. Exiting...";
 | 
				
			||||||
 | 
					                        return -1;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                qCritical() << "ERROR ssh-key-file" << sshKeyFile << "does not exists. Exiting...";
 | 
				
			||||||
 | 
					                return -1;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            gitSSHCommand = QString(v.toStdString().c_str());
 | 
				
			||||||
 | 
					            qInfo() << "GIT_SSH_COMMAND already set in enviroment:" << gitSSHCommand;
 | 
				
			||||||
 | 
					            if (gitSSHCommand != "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig") {
 | 
				
			||||||
 | 
					                qCritical() << "ERROR" << gitSSHCommand << "wrong. Exiting...";
 | 
				
			||||||
 | 
					                return -1;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!gitSSHCommand.isEmpty()) {
 | 
				
			||||||
 | 
					            qInfo() << "GIT_SSH_COMMAND .........." << gitSSHCommand;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (parser.isSet(verboseOption)) {
 | 
				
			||||||
 | 
					        parser.showVersion();
 | 
				
			||||||
 | 
					        return 0;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    GitCommand gitCmd;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (parser.isSet(checkCustomerRepositoryOption)) {
 | 
				
			||||||
 | 
					        if (!gitCmd.check()) {
 | 
				
			||||||
 | 
					            return -1;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if (parser.isSet(checkoutBranchOption)) {
 | 
				
			||||||
 | 
					        if (!gitCmd.checkout()) {
 | 
				
			||||||
 | 
					            return -2;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if (parser.isSet(cloneCustomerRepositoryOption)) {
 | 
				
			||||||
 | 
					        if (!gitCmd.clone()) {
 | 
				
			||||||
 | 
					            return -3;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if (parser.isSet(pullBranchOption)) {
 | 
				
			||||||
 | 
					        if (!gitCmd.pull()) {
 | 
				
			||||||
 | 
					            return -4;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        if (internal::customerRepoExists()) {
 | 
				
			||||||
 | 
					            if (!gitCmd.checkout()) {
 | 
				
			||||||
 | 
					                return -2;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            if (!gitCmd.pull()) {
 | 
				
			||||||
 | 
					                return -4;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            QString const result = gitCmd.commandResult().trimmed();
 | 
				
			||||||
 | 
					            if (result.contains("Already", Qt::CaseInsensitive)
 | 
				
			||||||
 | 
					             && result.contains("up", Qt::CaseInsensitive)
 | 
				
			||||||
 | 
					             && result.contains("to", Qt::CaseInsensitive)
 | 
				
			||||||
 | 
					             && result.contains("date", Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					                qCritical() << internal::GIT_CUSTOMER_REPO_NO_UPDATE_NECESSARY;
 | 
				
			||||||
 | 
					                return internal::GIT_NOT_NECESSARY_CODE;
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if (result.contains(QRegularExpression("[Uu]pdating\\s+[a-z0-9]{6,}\\.\\.[a-z0-9]{6,}"))) {
 | 
				
			||||||
 | 
					                // Updating 49a97f5..13a0321
 | 
				
			||||||
 | 
					                qCritical() << internal::GIT_CUSTOMER_REPO_UPDATED;
 | 
				
			||||||
 | 
					                return internal::GIT_UPDATED_CODE;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            if (!gitCmd.clone()) {
 | 
				
			||||||
 | 
					                return -3;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            if (!gitCmd.checkout()) {
 | 
				
			||||||
 | 
					                return -2;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            qCritical() << internal::GIT_CUSTOMER_REPO_CLONED;
 | 
				
			||||||
 | 
					            return internal::GIT_CLONED_CODE;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										97
									
								
								Git/message_handler.cpp
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										97
									
								
								Git/message_handler.cpp
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,97 @@
 | 
				
			|||||||
 | 
					#include "message_handler.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <cstring>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QFileInfo>
 | 
				
			||||||
 | 
					#include <QMessageLogContext>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static char const *DBG_NAME[] = { "DBG  ", "WARN ", "CRIT ", "FATAL", "INFO " };
 | 
				
			||||||
 | 
					static bool installedMsgHandler = false;
 | 
				
			||||||
 | 
					static int debugLevel = LOG_NOTICE;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int getDebugLevel() { return debugLevel; }
 | 
				
			||||||
 | 
					void setDebugLevel(int newDebugLevel) {
 | 
				
			||||||
 | 
					    debugLevel = newDebugLevel;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool messageHandlerInstalled() {
 | 
				
			||||||
 | 
					    return installedMsgHandler;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
 | 
				
			||||||
 | 
					    installedMsgHandler = (handler != 0);
 | 
				
			||||||
 | 
					    static QtMessageHandler prevHandler = nullptr;
 | 
				
			||||||
 | 
					    if (handler) {
 | 
				
			||||||
 | 
					        prevHandler = qInstallMessageHandler(handler);
 | 
				
			||||||
 | 
					        return prevHandler;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        return qInstallMessageHandler(prevHandler);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					/// \brief Print message according to given debug level.
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					/// \note Install this function using qInstallMsgHandler().
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					///  int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					///     installMsgHandler(atbDebugOutput);
 | 
				
			||||||
 | 
					///     QApplication app(argc, argv);
 | 
				
			||||||
 | 
					///     ...
 | 
				
			||||||
 | 
					///     return app.exec();
 | 
				
			||||||
 | 
					///  }
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
 | 
				
			||||||
 | 
					    Q_UNUSED(context);
 | 
				
			||||||
 | 
					    QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    switch (debugLevel) {
 | 
				
			||||||
 | 
					        case LOG_DEBUG: { // debug-level message
 | 
				
			||||||
 | 
					            syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_INFO: { // informational message
 | 
				
			||||||
 | 
					            if (type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_NOTICE: { // normal, but significant, condition
 | 
				
			||||||
 | 
					            if (type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_WARNING: { // warning conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_ERR: { // error conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_CRIT: { // critical conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_ALERT: { // action must be taken immediately
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_EMERG: { // system is unusable
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        default: {
 | 
				
			||||||
 | 
					            //fprintf(stderr, "%s No ErrorLevel defined! %s\n",
 | 
				
			||||||
 | 
					            //    datetime.toStdString().c_str(), msg.toStdString().c_str());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										23
									
								
								Git/message_handler.h
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										23
									
								
								Git/message_handler.h
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,23 @@
 | 
				
			|||||||
 | 
					#ifndef MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
 | 
					#define MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#ifdef __linux__
 | 
				
			||||||
 | 
					#include <syslog.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int getDebugLevel();
 | 
				
			||||||
 | 
					void setDebugLevel(int newDebugLevel);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool messageHandlerInstalled();
 | 
				
			||||||
 | 
					QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 | 
				
			||||||
 | 
					// typedef void (*QtMessageHandler)(QtMsgType, const char *);
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const char *msg);
 | 
				
			||||||
 | 
					#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 | 
				
			||||||
 | 
					// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										85
									
								
								Opkg/Opkg.pro
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										85
									
								
								Opkg/Opkg.pro
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,85 @@
 | 
				
			|||||||
 | 
					QT += core
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TARGET = ATBUpdateOpkg
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					VERSION="1.0.0"
 | 
				
			||||||
 | 
					win32 {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date /t")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("time /t")
 | 
				
			||||||
 | 
					} else {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date +%d-%m-%y")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("date +%H:%M:%S")
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					INCLUDEPATH += \
 | 
				
			||||||
 | 
					    plugins \
 | 
				
			||||||
 | 
					    $${INCLUDEINTERFACES} \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../UpdatePTUDevCtrl \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../common/include
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CONFIG += c++17
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# keep comments, as /* fall through */
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -C
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -g
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					    CONFIG += link_pkgconfig
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
 | 
				
			||||||
 | 
					    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5_YOCTO ) {
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, DesktopLinux ) {
 | 
				
			||||||
 | 
					    # QMAKE_CC = ccache $$QMAKE_CC
 | 
				
			||||||
 | 
					    # QMAKE_CXX = ccache $$QMAKE_CXX
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
 | 
				
			||||||
 | 
					    ARCH = DesktopLinux
 | 
				
			||||||
 | 
					    DEFINES+=DesktopLinux
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					SOURCES += \
 | 
				
			||||||
 | 
					        main.cpp \
 | 
				
			||||||
 | 
					        message_handler.cpp \
 | 
				
			||||||
 | 
					        ../common/src/utils_internal.cpp \
 | 
				
			||||||
 | 
					        ../common/src/command.cpp \
 | 
				
			||||||
 | 
					        opkg_command.cpp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					HEADERS += \
 | 
				
			||||||
 | 
					        message_handler.h \
 | 
				
			||||||
 | 
					        ../common/include/utils_internal.h \
 | 
				
			||||||
 | 
					        ../common/include/command.h \
 | 
				
			||||||
 | 
					        opkg_command.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					##########################################################################################
 | 
				
			||||||
 | 
					# for running program on target through QtCreator
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					   qnx: target.path = /tmp/$${TARGET}/bin
 | 
				
			||||||
 | 
					   else: unix:!android: target.path = /opt/app/tools/atbupdate/
 | 
				
			||||||
 | 
					   !isEmpty(target.path): INSTALLS += target
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										69
									
								
								Opkg/main.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										69
									
								
								Opkg/main.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,69 @@
 | 
				
			|||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#include <QCoreApplication>
 | 
				
			||||||
 | 
					#include <QByteArray>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					#include <QCommandLineParser>
 | 
				
			||||||
 | 
					#include <QCommandLineOption>
 | 
				
			||||||
 | 
					#include <QStandardPaths>
 | 
				
			||||||
 | 
					#include <QSettings>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "message_handler.h"
 | 
				
			||||||
 | 
					#include "utils_internal.h"
 | 
				
			||||||
 | 
					#include "opkg_command.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QByteArray const value = qgetenv("LC_ALL");
 | 
				
			||||||
 | 
					    if (value.isEmpty() || value != "C") {
 | 
				
			||||||
 | 
					        qputenv("LC_ALL", "C");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    openlog("ATB-UPDATE-OPKG", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QCoreApplication a(argc, argv);
 | 
				
			||||||
 | 
					    QCoreApplication::setApplicationName("ATBUpdateOpkg");
 | 
				
			||||||
 | 
					    QCoreApplication::setApplicationVersion(APP_VERSION);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
 | 
				
			||||||
 | 
					        atbInstallMessageHandler(nullptr);
 | 
				
			||||||
 | 
					        //atbInstallMessageHandler(atbDebugOutput);
 | 
				
			||||||
 | 
					        setDebugLevel(LOG_NOTICE);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					    QString s = "<OPKG>\n\naaa<OPKG>bbb<OPKG>ccc<OPKG>\n";
 | 
				
			||||||
 | 
					    QString m_standardOutput{};
 | 
				
			||||||
 | 
					    if (!s.isEmpty()) {
 | 
				
			||||||
 | 
					        m_standardOutput += s.replace(QChar('\n'), "");
 | 
				
			||||||
 | 
					        qCritical() << m_standardOutput;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        int startIndex, endIndex{};
 | 
				
			||||||
 | 
					        while (((startIndex = m_standardOutput.indexOf("<OPKG>")) == 0) &&
 | 
				
			||||||
 | 
					               ((endIndex = m_standardOutput.indexOf("<OPKG>", 1)) != -1)) {
 | 
				
			||||||
 | 
					                QString str = m_standardOutput.mid(0, endIndex);
 | 
				
			||||||
 | 
					                qCritical() << "str" << str << str.mid(6);
 | 
				
			||||||
 | 
					                m_standardOutput = m_standardOutput.mid(endIndex);
 | 
				
			||||||
 | 
					                // qCritical() << "m" << m_standardOutput;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        qCritical() << "m" << m_standardOutput;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return 0;
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QCommandLineParser parser;
 | 
				
			||||||
 | 
					    QCommandLineOption noactionOption("noaction");
 | 
				
			||||||
 | 
					    QCommandLineOption verboseOption("verbose");
 | 
				
			||||||
 | 
					    parser.addOption(noactionOption);
 | 
				
			||||||
 | 
					    parser.addOption(verboseOption);
 | 
				
			||||||
 | 
					    parser.process(a);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool noaction = parser.isSet(noactionOption);
 | 
				
			||||||
 | 
					    OpkgCommand opkgCmd(noaction);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										97
									
								
								Opkg/message_handler.cpp
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										97
									
								
								Opkg/message_handler.cpp
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,97 @@
 | 
				
			|||||||
 | 
					#include "message_handler.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <cstring>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QFileInfo>
 | 
				
			||||||
 | 
					#include <QMessageLogContext>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static char const *DBG_NAME[] = { "DBG  ", "WARN ", "CRIT ", "FATAL", "INFO " };
 | 
				
			||||||
 | 
					static bool installedMsgHandler = false;
 | 
				
			||||||
 | 
					static int debugLevel = LOG_NOTICE;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int getDebugLevel() { return debugLevel; }
 | 
				
			||||||
 | 
					void setDebugLevel(int newDebugLevel) {
 | 
				
			||||||
 | 
					    debugLevel = newDebugLevel;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool messageHandlerInstalled() {
 | 
				
			||||||
 | 
					    return installedMsgHandler;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
 | 
				
			||||||
 | 
					    installedMsgHandler = (handler != 0);
 | 
				
			||||||
 | 
					    static QtMessageHandler prevHandler = nullptr;
 | 
				
			||||||
 | 
					    if (handler) {
 | 
				
			||||||
 | 
					        prevHandler = qInstallMessageHandler(handler);
 | 
				
			||||||
 | 
					        return prevHandler;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        return qInstallMessageHandler(prevHandler);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					/// \brief Print message according to given debug level.
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					/// \note Install this function using qInstallMsgHandler().
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					///  int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					///     installMsgHandler(atbDebugOutput);
 | 
				
			||||||
 | 
					///     QApplication app(argc, argv);
 | 
				
			||||||
 | 
					///     ...
 | 
				
			||||||
 | 
					///     return app.exec();
 | 
				
			||||||
 | 
					///  }
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
 | 
				
			||||||
 | 
					    Q_UNUSED(context);
 | 
				
			||||||
 | 
					    QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    switch (debugLevel) {
 | 
				
			||||||
 | 
					        case LOG_DEBUG: { // debug-level message
 | 
				
			||||||
 | 
					            syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_INFO: { // informational message
 | 
				
			||||||
 | 
					            if (type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_NOTICE: { // normal, but significant, condition
 | 
				
			||||||
 | 
					            if (type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_WARNING: { // warning conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_ERR: { // error conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_CRIT: { // critical conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_ALERT: { // action must be taken immediately
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_EMERG: { // system is unusable
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        default: {
 | 
				
			||||||
 | 
					            //fprintf(stderr, "%s No ErrorLevel defined! %s\n",
 | 
				
			||||||
 | 
					            //    datetime.toStdString().c_str(), msg.toStdString().c_str());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										23
									
								
								Opkg/message_handler.h
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										23
									
								
								Opkg/message_handler.h
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,23 @@
 | 
				
			|||||||
 | 
					#ifndef MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
 | 
					#define MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#ifdef __linux__
 | 
				
			||||||
 | 
					#include <syslog.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int getDebugLevel();
 | 
				
			||||||
 | 
					void setDebugLevel(int newDebugLevel);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool messageHandlerInstalled();
 | 
				
			||||||
 | 
					QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 | 
				
			||||||
 | 
					// typedef void (*QtMessageHandler)(QtMsgType, const char *);
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const char *msg);
 | 
				
			||||||
 | 
					#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 | 
				
			||||||
 | 
					// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										176
									
								
								Opkg/opkg_command.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										176
									
								
								Opkg/opkg_command.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,176 @@
 | 
				
			|||||||
 | 
					#include "opkg_command.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "command.h"
 | 
				
			||||||
 | 
					#include "utils_internal.h"
 | 
				
			||||||
 | 
					using namespace internal;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					#include <QFlags>
 | 
				
			||||||
 | 
					#include <QRegularExpression>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					OpkgCommand::OpkgCommand(bool noaction, QString const &opkg_commands_filename)
 | 
				
			||||||
 | 
					  : m_noaction(noaction)
 | 
				
			||||||
 | 
					  , m_opkg_commands_filename(opkg_commands_filename) {
 | 
				
			||||||
 | 
					    cleanUpOpkgCache();
 | 
				
			||||||
 | 
					    execCommandsInternal();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool OpkgCommand::readCommands() {
 | 
				
			||||||
 | 
					    QFile opkgFile(QDir::cleanPath(m_opkg_commands_dir + QDir::separator() + m_opkg_commands_filename));
 | 
				
			||||||
 | 
					    if (!opkgFile.exists()) {
 | 
				
			||||||
 | 
					        qCritical() << __func__ << ":" << __LINE__
 | 
				
			||||||
 | 
					                    << opkgFile.fileName() << "does not exists";
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_commands.clear();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (opkgFile.open(QIODevice::ReadOnly)) {
 | 
				
			||||||
 | 
					        QTextStream in(&opkgFile);
 | 
				
			||||||
 | 
					        while (!in.atEnd()) {
 | 
				
			||||||
 | 
					            QString line = in.readLine();
 | 
				
			||||||
 | 
					            // TODO: "^\\s*[#]{0,}$" : empty line or comment line starting with #
 | 
				
			||||||
 | 
					            static const QRegularExpression comment("^\\s*[#].*$");
 | 
				
			||||||
 | 
					            static const QRegularExpression emptyLine("^\\s*$");
 | 
				
			||||||
 | 
					            if (line.indexOf(emptyLine, 0) == -1 &&
 | 
				
			||||||
 | 
					                line.indexOf(comment, 0) == -1) {
 | 
				
			||||||
 | 
					                QString const &commandLine = line.trimmed();
 | 
				
			||||||
 | 
					                if (!commandLine.isEmpty()) {
 | 
				
			||||||
 | 
					                    m_commands << commandLine;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        qCritical() << __func__ << ":" << __LINE__
 | 
				
			||||||
 | 
					                    << "error opening" << opkgFile.fileName();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return m_commands.size() > 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool OpkgCommand::execCommandsInternal() {
 | 
				
			||||||
 | 
					    if (readCommands()) {
 | 
				
			||||||
 | 
					        // command lines are located between markers: <OPKG>...<OPKG>
 | 
				
			||||||
 | 
					        // they are later removed when used by the update-tool.
 | 
				
			||||||
 | 
					        qCritical().noquote() << "<OPKG>";
 | 
				
			||||||
 | 
					        QListIterator<QString> it(m_commands);
 | 
				
			||||||
 | 
					        while (it.hasNext()) {
 | 
				
			||||||
 | 
					            QString command = it.next();
 | 
				
			||||||
 | 
					            QStringList cmdAndOptions = command.split(u' ', QString::SkipEmptyParts);
 | 
				
			||||||
 | 
					            if (cmdAndOptions.size() > 0) {
 | 
				
			||||||
 | 
					                QString const &cmd = cmdAndOptions.takeFirst();
 | 
				
			||||||
 | 
					                if (m_noaction) {
 | 
				
			||||||
 | 
					                    if (cmd.contains("opkg")) {
 | 
				
			||||||
 | 
					                        cmdAndOptions.prepend("--noaction");
 | 
				
			||||||
 | 
					                    } else continue; // only opkg has the --noaction option
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                QStringList const &options = cmdAndOptions;
 | 
				
			||||||
 | 
					                if (exec(cmd, options)) {
 | 
				
			||||||
 | 
					                    qCritical().noquote() << cmd << options.join(" ") << "ok" << "<OPKG>";
 | 
				
			||||||
 | 
					                } else {
 | 
				
			||||||
 | 
					                    qCritical().noquote() << cmd << options.join(" ") << "FAIL" << "<OPKG>";
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool OpkgCommand::execCommands() {
 | 
				
			||||||
 | 
					    if (readCommands()) {
 | 
				
			||||||
 | 
					        QListIterator<QString> it(m_commands);
 | 
				
			||||||
 | 
					        while (it.hasNext()) {
 | 
				
			||||||
 | 
					            QString command = it.next();
 | 
				
			||||||
 | 
					            QStringList cmdAndOptions = command.split(u' ', QString::SkipEmptyParts);
 | 
				
			||||||
 | 
					            if (cmdAndOptions.size() > 0) {
 | 
				
			||||||
 | 
					                QString const &cmd = cmdAndOptions.takeFirst();
 | 
				
			||||||
 | 
					                if (m_noaction) {
 | 
				
			||||||
 | 
					                    cmdAndOptions.prepend("--noaction");
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                QStringList const &options = cmdAndOptions;
 | 
				
			||||||
 | 
					                if (exec(cmd, options)) {
 | 
				
			||||||
 | 
					                    qCritical().noquote() << cmd << options.join(" ");
 | 
				
			||||||
 | 
					                } else {
 | 
				
			||||||
 | 
					                    qCritical().noquote() << cmd << options.join(" ") << "FAIL";
 | 
				
			||||||
 | 
					                    return false;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QFile opkgFile(QDir::cleanPath(m_opkg_commands_dir + QDir::separator() + m_opkg_commands_filename));
 | 
				
			||||||
 | 
					    if (!opkgFile.exists()) {
 | 
				
			||||||
 | 
					        qCritical() << __func__ << ":" << __LINE__
 | 
				
			||||||
 | 
					                    << opkgFile.fileName() << "does not exists";
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (opkgFile.open(QIODevice::ReadOnly)) {
 | 
				
			||||||
 | 
					        QTextStream in(&opkgFile);
 | 
				
			||||||
 | 
					        while (!in.atEnd()) {
 | 
				
			||||||
 | 
					            QString line = in.readLine();
 | 
				
			||||||
 | 
					            // TODO: "^\\s*[#]{0,}$" : empty line or comment line starting with #
 | 
				
			||||||
 | 
					            static const QRegularExpression comment("^\\s*[#].*$");
 | 
				
			||||||
 | 
					            static const QRegularExpression emptyLine("^\\s*$");
 | 
				
			||||||
 | 
					            if (line.indexOf(emptyLine, 0) == -1 &&
 | 
				
			||||||
 | 
					                line.indexOf(comment, 0) == -1) {
 | 
				
			||||||
 | 
					                QString const &commandLine = line.trimmed();
 | 
				
			||||||
 | 
					                if (!commandLine.isEmpty()) {
 | 
				
			||||||
 | 
					                    QStringList cmdAndOptions = commandLine.split(u' ', QString::SkipEmptyParts);
 | 
				
			||||||
 | 
					                    if (cmdAndOptions.size() > 0) {
 | 
				
			||||||
 | 
					                        QString const &cmd = cmdAndOptions.takeFirst();
 | 
				
			||||||
 | 
					                        if (m_noaction) {
 | 
				
			||||||
 | 
					                            cmdAndOptions.prepend("--noaction");
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                        QStringList const &options = cmdAndOptions;
 | 
				
			||||||
 | 
					                        if (exec(cmd, options)) {
 | 
				
			||||||
 | 
					                            qCritical().noquote() << cmd << options.join(" ") << "ok";
 | 
				
			||||||
 | 
					                        } else {
 | 
				
			||||||
 | 
					                            qCritical().noquote() << cmd << options.join(" ") << "FAIL";
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                    } else {
 | 
				
			||||||
 | 
					                        continue;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return true;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        qCritical() << __func__ << ":" << __LINE__
 | 
				
			||||||
 | 
					                    << "error opening" << opkgFile.fileName();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool OpkgCommand::exec(QString const &cmd, QStringList const &options,
 | 
				
			||||||
 | 
					                       int start_timeout, int finish_timeout) {
 | 
				
			||||||
 | 
					    bool const verbose = false;
 | 
				
			||||||
 | 
					    return Command(cmd, options, "/tmp", verbose, start_timeout, finish_timeout).exec();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool OpkgCommand::cleanUpOpkgCache() {
 | 
				
			||||||
 | 
					    bool removedFiles = true;
 | 
				
			||||||
 | 
					    QDir dir("/var/cache/opkg/");
 | 
				
			||||||
 | 
					    if (dir.exists()) {
 | 
				
			||||||
 | 
					        dir.setNameFilters(QStringList() << ".gz" << ".ipk");
 | 
				
			||||||
 | 
					        dir.setFilter(QDir::Files);
 | 
				
			||||||
 | 
					        foreach(QString dirFile, dir.entryList()) {
 | 
				
			||||||
 | 
					            removedFiles &= dir.remove(dirFile);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (removedFiles == false) {
 | 
				
			||||||
 | 
					        qCritical() << "some errors while cleaning up opkg-cache";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return removedFiles;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										29
									
								
								Opkg/opkg_command.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								Opkg/opkg_command.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,29 @@
 | 
				
			|||||||
 | 
					#ifndef OPKG_COMMND_H_INCLUDED
 | 
				
			||||||
 | 
					#define OPKG_COMMND_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QStringList>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class OpkgCommand {
 | 
				
			||||||
 | 
					    QString const m_opkg_commands_dir{"/etc/psa_update/"};
 | 
				
			||||||
 | 
					    bool m_noaction;
 | 
				
			||||||
 | 
					    QString m_opkg_commands_filename;
 | 
				
			||||||
 | 
					    QStringList m_commands;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool execCommands();
 | 
				
			||||||
 | 
					    bool execCommandsInternal();
 | 
				
			||||||
 | 
					    bool cleanUpOpkgCache();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    OpkgCommand(bool noaction = false,
 | 
				
			||||||
 | 
					                QString const &opkg_commands_file_name="opkg_commands");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool exec(QString const &cmd, QStringList const &options,
 | 
				
			||||||
 | 
					              int start_timeout = 100000, int finish_timeout = 100000);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QStringList commands() { return m_commands; }
 | 
				
			||||||
 | 
					    QStringList const &commands() const { return m_commands; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool readCommands();
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // OPKG_COMMND_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										68
									
								
								Show/Show.pro
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										68
									
								
								Show/Show.pro
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,68 @@
 | 
				
			|||||||
 | 
					QT += core
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TARGET = ATBUpdateShow
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					VERSION="1.0.0"
 | 
				
			||||||
 | 
					win32 {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date /t")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("time /t")
 | 
				
			||||||
 | 
					} else {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date +%d-%m-%y")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("date +%H:%M:%S")
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					INCLUDEPATH += \
 | 
				
			||||||
 | 
					    plugins \
 | 
				
			||||||
 | 
					    $${INCLUDEINTERFACES} \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../common/include
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CONFIG += c++17
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# keep comments, as /* fall through */
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -C
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -g
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					    CONFIG += link_pkgconfig
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
 | 
				
			||||||
 | 
					    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5_YOCTO ) {
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, DesktopLinux ) {
 | 
				
			||||||
 | 
					    # QMAKE_CC = ccache $$QMAKE_CC
 | 
				
			||||||
 | 
					    # QMAKE_CXX = ccache $$QMAKE_CXX
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
 | 
				
			||||||
 | 
					    ARCH = DesktopLinux
 | 
				
			||||||
 | 
					    DEFINES+=DesktopLinux
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					SOURCES += \
 | 
				
			||||||
 | 
					        main.cpp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# HEADERS += \
 | 
				
			||||||
							
								
								
									
										14
									
								
								Show/main.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								Show/main.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,14 @@
 | 
				
			|||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#include <QCoreApplication>
 | 
				
			||||||
 | 
					#include <QByteArray>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					#include <QCommandLineParser>
 | 
				
			||||||
 | 
					#include <QStandardPaths>
 | 
				
			||||||
 | 
					#include <QSettings>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					    return 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										87
									
								
								Sync/Sync.pro
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										87
									
								
								Sync/Sync.pro
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,87 @@
 | 
				
			|||||||
 | 
					QT += core
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TARGET = ATBUpdateSync
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					VERSION="1.0.0"
 | 
				
			||||||
 | 
					win32 {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date /t")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("time /t")
 | 
				
			||||||
 | 
					} else {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date +%d-%m-%y")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("date +%H:%M:%S")
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					INCLUDEPATH += \
 | 
				
			||||||
 | 
					    plugins \
 | 
				
			||||||
 | 
					    $${INCLUDEINTERFACES} \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../UpdatePTUDevCtrl \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../common/include
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CONFIG += c++17
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# keep comments, as /* fall through */
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -C
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -g
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					    CONFIG += link_pkgconfig
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
 | 
				
			||||||
 | 
					    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5_YOCTO ) {
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, DesktopLinux ) {
 | 
				
			||||||
 | 
					    # QMAKE_CC = ccache $$QMAKE_CC
 | 
				
			||||||
 | 
					    # QMAKE_CXX = ccache $$QMAKE_CXX
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
 | 
				
			||||||
 | 
					    ARCH = DesktopLinux
 | 
				
			||||||
 | 
					    DEFINES+=DesktopLinux
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					SOURCES += \
 | 
				
			||||||
 | 
					        main.cpp \
 | 
				
			||||||
 | 
					        message_handler.cpp \
 | 
				
			||||||
 | 
					        ../common/src/utils_internal.cpp \
 | 
				
			||||||
 | 
					        ../common/src/command.cpp \
 | 
				
			||||||
 | 
					        sync_command.cpp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					HEADERS += \
 | 
				
			||||||
 | 
					        message_handler.h \
 | 
				
			||||||
 | 
					        ../common/include/utils_internal.h \
 | 
				
			||||||
 | 
					        ../common/include/command.h \
 | 
				
			||||||
 | 
					        sync_command.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					##########################################################################################
 | 
				
			||||||
 | 
					# for running program on target through QtCreator
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					   qnx: target.path = /tmp/$${TARGET}/bin
 | 
				
			||||||
 | 
					   else: unix:!android: target.path = /opt/app/tools/atbupdate/
 | 
				
			||||||
 | 
					   !isEmpty(target.path): INSTALLS += target
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										94
									
								
								Sync/main.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										94
									
								
								Sync/main.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,94 @@
 | 
				
			|||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#include <QCoreApplication>
 | 
				
			||||||
 | 
					#include <QByteArray>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					#include <QCommandLineParser>
 | 
				
			||||||
 | 
					#include <QStandardPaths>
 | 
				
			||||||
 | 
					#include <QSettings>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "message_handler.h"
 | 
				
			||||||
 | 
					#include "utils_internal.h"
 | 
				
			||||||
 | 
					#include "sync_command.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QByteArray const value = qgetenv("LC_ALL");
 | 
				
			||||||
 | 
					    if (value.isEmpty() || value != "C") {
 | 
				
			||||||
 | 
					        qputenv("LC_ALL", "C");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    openlog("ATB-UPDATE-SYNC", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QCoreApplication a(argc, argv);
 | 
				
			||||||
 | 
					    QCoreApplication::setApplicationName("ATBUpdateSync");
 | 
				
			||||||
 | 
					    QCoreApplication::setApplicationVersion(APP_VERSION);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QDebug debug = qCritical();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
 | 
				
			||||||
 | 
					        atbInstallMessageHandler(nullptr);
 | 
				
			||||||
 | 
					        //atbInstallMessageHandler(atbDebugOutput);
 | 
				
			||||||
 | 
					        setDebugLevel(LOG_NOTICE);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (internal::customerRepoExists() == false) {
 | 
				
			||||||
 | 
					        qCritical().noquote() << internal::NO_CUSTOMER_REPOSITORY;
 | 
				
			||||||
 | 
					        return internal::NO_CUSTOMER_REPOSITORY_CODE;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString const crd = internal::customerRepoDir();
 | 
				
			||||||
 | 
					    QString const etcInRepo = QDir::cleanPath(crd + QDir::separator() + "etc/");
 | 
				
			||||||
 | 
					    QString const optInRepo = QDir::cleanPath(crd + QDir::separator() + "opt/");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!QDir(etcInRepo).exists()) {
 | 
				
			||||||
 | 
					        qCritical().noquote() << internal::NO_ETC_CUSTOMER_REPOSITORY;
 | 
				
			||||||
 | 
					        return internal::NO_ETC_CUSTOMER_REPOSITORY_CODE;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!QDir(optInRepo).exists()) {
 | 
				
			||||||
 | 
					        qCritical().noquote() << internal::NO_OPT_CUSTOMER_REPOSITORY;
 | 
				
			||||||
 | 
					        return internal::NO_OPT_CUSTOMER_REPOSITORY_CODE;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					    error codes for rsync:
 | 
				
			||||||
 | 
					        https://stackoverflow.com/questions/20737204/comprehensive-list-of-rsync-error-codes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					     0     Success
 | 
				
			||||||
 | 
					     1     Syntax or usage error
 | 
				
			||||||
 | 
					     2     Protocol incompatibility
 | 
				
			||||||
 | 
					     3     Errors selecting input/output files, dirs
 | 
				
			||||||
 | 
					     4     Requested action not supported: an attempt was made to manipulate 64-bit
 | 
				
			||||||
 | 
					           files on a platform that cannot support them; or an option was specified
 | 
				
			||||||
 | 
					           that is supported by the client and not by the server.
 | 
				
			||||||
 | 
					     5     Error starting client-server protocol
 | 
				
			||||||
 | 
					     6     Daemon unable to append to log-file
 | 
				
			||||||
 | 
					    10     Error in socket I/O
 | 
				
			||||||
 | 
					    11     Error in file I/O
 | 
				
			||||||
 | 
					    12     Error in rsync protocol data stream
 | 
				
			||||||
 | 
					    13     Errors with program diagnostics
 | 
				
			||||||
 | 
					    14     Error in IPC code
 | 
				
			||||||
 | 
					    20     Received SIGUSR1 or SIGINT
 | 
				
			||||||
 | 
					    21     Some error returned by waitpid()
 | 
				
			||||||
 | 
					    22     Error allocating core memory buffers
 | 
				
			||||||
 | 
					    23     Partial transfer due to error
 | 
				
			||||||
 | 
					    24     Partial transfer due to vanished source files
 | 
				
			||||||
 | 
					    25     The --max-delete limit stopped deletions
 | 
				
			||||||
 | 
					    30     Timeout in data send/receive
 | 
				
			||||||
 | 
					    35     Timeout waiting for daemon connection
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QStringList options({"-v", "--recursive", "--progress", "--checksum",
 | 
				
			||||||
 | 
					                         "--exclude=.*", "--include=*.bin", "--include=*.json",
 | 
				
			||||||
 | 
					                         "--include=*.ini"});
 | 
				
			||||||
 | 
					    int ret = SyncCommand().exec("rsync", options << etcInRepo << "/etc");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (ret == 0) {
 | 
				
			||||||
 | 
					       ret = SyncCommand().exec("rsync", options << optInRepo << "/opt");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return (ret > 0) ? -ret : ret;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										97
									
								
								Sync/message_handler.cpp
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										97
									
								
								Sync/message_handler.cpp
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,97 @@
 | 
				
			|||||||
 | 
					#include "message_handler.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <cstring>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QFileInfo>
 | 
				
			||||||
 | 
					#include <QMessageLogContext>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static char const *DBG_NAME[] = { "DBG  ", "WARN ", "CRIT ", "FATAL", "INFO " };
 | 
				
			||||||
 | 
					static bool installedMsgHandler = false;
 | 
				
			||||||
 | 
					static int debugLevel = LOG_NOTICE;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int getDebugLevel() { return debugLevel; }
 | 
				
			||||||
 | 
					void setDebugLevel(int newDebugLevel) {
 | 
				
			||||||
 | 
					    debugLevel = newDebugLevel;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool messageHandlerInstalled() {
 | 
				
			||||||
 | 
					    return installedMsgHandler;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
 | 
				
			||||||
 | 
					    installedMsgHandler = (handler != 0);
 | 
				
			||||||
 | 
					    static QtMessageHandler prevHandler = nullptr;
 | 
				
			||||||
 | 
					    if (handler) {
 | 
				
			||||||
 | 
					        prevHandler = qInstallMessageHandler(handler);
 | 
				
			||||||
 | 
					        return prevHandler;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        return qInstallMessageHandler(prevHandler);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					/// \brief Print message according to given debug level.
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					/// \note Install this function using qInstallMsgHandler().
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					///  int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					///     installMsgHandler(atbDebugOutput);
 | 
				
			||||||
 | 
					///     QApplication app(argc, argv);
 | 
				
			||||||
 | 
					///     ...
 | 
				
			||||||
 | 
					///     return app.exec();
 | 
				
			||||||
 | 
					///  }
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
 | 
				
			||||||
 | 
					    Q_UNUSED(context);
 | 
				
			||||||
 | 
					    QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    switch (debugLevel) {
 | 
				
			||||||
 | 
					        case LOG_DEBUG: { // debug-level message
 | 
				
			||||||
 | 
					            syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_INFO: { // informational message
 | 
				
			||||||
 | 
					            if (type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_NOTICE: { // normal, but significant, condition
 | 
				
			||||||
 | 
					            if (type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_WARNING: { // warning conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_ERR: { // error conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_CRIT: { // critical conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_ALERT: { // action must be taken immediately
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_EMERG: { // system is unusable
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        default: {
 | 
				
			||||||
 | 
					            //fprintf(stderr, "%s No ErrorLevel defined! %s\n",
 | 
				
			||||||
 | 
					            //    datetime.toStdString().c_str(), msg.toStdString().c_str());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										23
									
								
								Sync/message_handler.h
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										23
									
								
								Sync/message_handler.h
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,23 @@
 | 
				
			|||||||
 | 
					#ifndef MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
 | 
					#define MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#ifdef __linux__
 | 
				
			||||||
 | 
					#include <syslog.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int getDebugLevel();
 | 
				
			||||||
 | 
					void setDebugLevel(int newDebugLevel);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool messageHandlerInstalled();
 | 
				
			||||||
 | 
					QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 | 
				
			||||||
 | 
					// typedef void (*QtMessageHandler)(QtMsgType, const char *);
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const char *msg);
 | 
				
			||||||
 | 
					#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 | 
				
			||||||
 | 
					// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										21
									
								
								Sync/sync_command.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								Sync/sync_command.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,21 @@
 | 
				
			|||||||
 | 
					#include "sync_command.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "command.h"
 | 
				
			||||||
 | 
					#include "utils_internal.h"
 | 
				
			||||||
 | 
					using namespace internal;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					#include <QFlags>
 | 
				
			||||||
 | 
					#include <QRegularExpression>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					SyncCommand::SyncCommand() {
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int SyncCommand::exec(QString const &cmd, QStringList const &options,
 | 
				
			||||||
 | 
					                       int start_timeout, int finish_timeout) {
 | 
				
			||||||
 | 
					    Command c(cmd, options, internal::customerRepoDir(),
 | 
				
			||||||
 | 
					              start_timeout, finish_timeout);
 | 
				
			||||||
 | 
					    c.exec();
 | 
				
			||||||
 | 
					    return c.exitCode();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										14
									
								
								Sync/sync_command.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								Sync/sync_command.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,14 @@
 | 
				
			|||||||
 | 
					#ifndef SYNC_COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					#define SYNC_COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QStringList>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class SyncCommand {
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    SyncCommand();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int exec(QString const &cmd, QStringList const &options,
 | 
				
			||||||
 | 
					              int start_timeout = 100000, int finish_timeout = 100000);
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // SYNC_COMMAND_H_INCLUDED
 | 
				
			||||||
@@ -53,7 +53,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 | 
				
			|||||||
#           local filesystem, json-files will be downloaded to firmware.
 | 
					#           local filesystem, json-files will be downloaded to firmware.
 | 
				
			||||||
#           The device-controller firmware will be handled in a later version.
 | 
					#           The device-controller firmware will be handled in a later version.
 | 
				
			||||||
# 1.3.15:   Bug fixes found during testing.
 | 
					# 1.3.15:   Bug fixes found during testing.
 | 
				
			||||||
#           Don't disable Exit-button during update-process.
 | 
					#           Do not disable Exit-button during update-process.
 | 
				
			||||||
#           Removed worker-thread with an own event-loop: only the GUI thread
 | 
					#           Removed worker-thread with an own event-loop: only the GUI thread
 | 
				
			||||||
#           has an event loop. Tested JSON-downloads several times successfully
 | 
					#           has an event loop. Tested JSON-downloads several times successfully
 | 
				
			||||||
#           (using the slave lib where the CA helper tool was active as master).
 | 
					#           (using the slave lib where the CA helper tool was active as master).
 | 
				
			||||||
@@ -65,8 +65,47 @@ DEFINES += QT_DEPRECATED_WARNINGS
 | 
				
			|||||||
# 1.3.18:   Bug fixes found during testing.
 | 
					# 1.3.18:   Bug fixes found during testing.
 | 
				
			||||||
# 1.3.19:   Bug fixes found during testing.
 | 
					# 1.3.19:   Bug fixes found during testing.
 | 
				
			||||||
# 1.3.20:   Bug fixes found during testing.
 | 
					# 1.3.20:   Bug fixes found during testing.
 | 
				
			||||||
VERSION="1.3.21"
 | 
					# 1.3.21:   Bug fixes found during testing:
 | 
				
			||||||
 | 
					#           Fix directory of ATBUpdateTool.ini to be the working directory of
 | 
				
			||||||
 | 
					#           the application rather than just ".".
 | 
				
			||||||
 | 
					#           Check existance of etc-directory inside customer repository.
 | 
				
			||||||
 | 
					#           Check for valid ISMAS trigger (button) 15x (=90s).
 | 
				
			||||||
 | 
					#           NOTE: if the customer repository is cloned (or repaired and cloned
 | 
				
			||||||
 | 
					#           again), and if the settings always-download-config=true and
 | 
				
			||||||
 | 
					#           always-download-dc=true in the ATBUpdateTool.ini file, the download
 | 
				
			||||||
 | 
					#           the printer-json files and the device controller file, even without
 | 
				
			||||||
 | 
					#           an activated ISMAS trigger (button). The tariff-files are rsynced to
 | 
				
			||||||
 | 
					#           the local filesystem for such clone.
 | 
				
			||||||
 | 
					#           Set new filename for device controller: dc2c.bin.
 | 
				
			||||||
 | 
					# 1.3.22:   Bug fixes found during testing:
 | 
				
			||||||
 | 
					#           Fix the path-names of the json-files and the device-controller.
 | 
				
			||||||
 | 
					#           Set automatic download of json-file in ATBUpdateTool.ini file for
 | 
				
			||||||
 | 
					#           a fresh clone of the repository.
 | 
				
			||||||
 | 
					# 1.3.23:   Added a 'break' to prevent a possible endless loop when checking if
 | 
				
			||||||
 | 
					#           the device is alive.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# NOTE:     The versioning info has to be shifted up by one version, i.e. what
 | 
				
			||||||
 | 
					#           happened for 1.3.23 was actually done in 1.3.24.
 | 
				
			||||||
 | 
					# 1.3.24
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# 1.3._24_: Special version for szeged using a old dc-controller (4.42):
 | 
				
			||||||
 | 
					#           Changes:
 | 
				
			||||||
 | 
					#               (1) the ini-File now uses the libCAmaster.so.
 | 
				
			||||||
 | 
					# 1.3._25_: Again special version for szeged, using interface.h, version 4.4.
 | 
				
			||||||
 | 
					# 1.4.0   : Start with version at 1.4.0 (mainly to see a difference with Szeged)
 | 
				
			||||||
 | 
					#           Set hash-value in EVENT-objects. Set location (project), version
 | 
				
			||||||
 | 
					#           and info in send-last-version.
 | 
				
			||||||
 | 
					#           If the customer repository does not exist, then do not check the
 | 
				
			||||||
 | 
					#           ISMAS trigger, but proceed with the update procedure. Otherwise,
 | 
				
			||||||
 | 
					#           check the ISMAS update-trigger as first step.
 | 
				
			||||||
 | 
					#           If the current time is between 0.00 - 4.00 o'clock, then a wrong
 | 
				
			||||||
 | 
					#           trigger-value will result in an UPDATE_STEP_NOT_NECESSARY.
 | 
				
			||||||
 | 
					#           Move final processing to subclass UpdateProcessRunning.
 | 
				
			||||||
 | 
					#           Disable EXIT-button for the whole update-process, except for the
 | 
				
			||||||
 | 
					#           checking of the ISMAS-trigger-button (aka WAIT-button).
 | 
				
			||||||
 | 
					# 1.4.1   : Sync files in the customer repository (under ./etc) as the very
 | 
				
			||||||
 | 
					#           first step
 | 
				
			||||||
 | 
					VERSION="1.4.1"
 | 
				
			||||||
# PLANNED TODOS:
 | 
					# PLANNED TODOS:
 | 
				
			||||||
#   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 | 
					#   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 | 
				
			||||||
#   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
 | 
					#   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
 | 
				
			||||||
@@ -80,7 +119,6 @@ VERSION="1.3.21"
 | 
				
			|||||||
#       ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
 | 
					#       ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
 | 
				
			||||||
#       Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
 | 
					#       Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
 | 
				
			||||||
#       ausgefuehrt.
 | 
					#       ausgefuehrt.
 | 
				
			||||||
#   4:  rsync: immer alle Dateien soiegeln (bis auf opkg-commands)
 | 
					 | 
				
			||||||
#   5:  Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
 | 
					#   5:  Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
 | 
				
			||||||
#       installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
 | 
					#       installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
 | 
				
			||||||
#   6:  rsync: explizites Binary, nicht das in busybox enthaltene.
 | 
					#   6:  rsync: explizites Binary, nicht das in busybox enthaltene.
 | 
				
			||||||
@@ -96,9 +134,32 @@ VERSION="1.3.21"
 | 
				
			|||||||
#       Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
 | 
					#       Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
 | 
				
			||||||
#       PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
 | 
					#       PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
 | 
				
			||||||
#       gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
 | 
					#       gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
 | 
				
			||||||
#  10:  Bei einer Neuinstallation (Neuhauser) immer JSON files runterladen,
 | 
					#  11:  Das Edit-Fenster teilen um die Anzeige zu verbessern.
 | 
				
			||||||
#       Tariff-Files syncen (d.h. nur wenn noch kein Repo vorhanden ist), und
 | 
					#  12:  Bei einem Update muss immer ersichtlich sein, warum es ueberhaupt
 | 
				
			||||||
#       zwar auch ohne WAIT-Button.
 | 
					#       angestossen wurde. Steht kein "WAIT" im ISMAS-Trigger, dann kann man
 | 
				
			||||||
 | 
					#       davon ausgehen, dass es sich um ein automatisches Update handelt.
 | 
				
			||||||
 | 
					#       In jedem Fall wird bei einem automatischen Update, bei dem der WAIT-
 | 
				
			||||||
 | 
					#       Button nicht gesetzt war, ein "OK" gesendet, falls sonst nichts weiter
 | 
				
			||||||
 | 
					#       zu tun ist. Beachte aber: wir haben auch noch den Fall, dass eine SD-
 | 
				
			||||||
 | 
					#       Karte gesteckt wird. In diesem Fall wird ein komplettes Update gefahren,
 | 
				
			||||||
 | 
					#       und zwar explizit auch ohne WAIT-Button.
 | 
				
			||||||
 | 
					#       Am Ende eines Updates steht im ISMAS entweder ein "OK" oder ein "FAIL".
 | 
				
			||||||
 | 
					# 13:   SendLastVersion: fuer jedes erfolgreich installierte Paket eine
 | 
				
			||||||
 | 
					#       Send-Last-Version-Nachricht an ISMAS. Dadurch entsteht im ISMAS eine
 | 
				
			||||||
 | 
					#       History (Christian darueber informieren).
 | 
				
			||||||
 | 
					# 14:   Installiert werden nur Dateien, die neu sind oder geaendert wurden.
 | 
				
			||||||
 | 
					#       Nicht etwas Dateien, die geloescht wurden: sicherstellen, dass man hier
 | 
				
			||||||
 | 
					#       immer direkt im repository arbeitet, nicht auf dem Filesystem.
 | 
				
			||||||
 | 
					#       Ferner: der DeviceController heisst dc2c.bin, auch fuer die Jsons
 | 
				
			||||||
 | 
					#       sind Dtandard-Namen vergeben. Alternativ: alle vorhandenen Jsons
 | 
				
			||||||
 | 
					#       werden runtergeladen: Thomas ist eh fuer deren Inhalte verantworlich.
 | 
				
			||||||
 | 
					#       WICHTIG: immer ueberpruefen, ob die Dateien im Customer-Repository
 | 
				
			||||||
 | 
					#       wirklich die richtigen Dateien sind.
 | 
				
			||||||
 | 
					# 15:   Der WAIT-Button laesst sich auf WAIT zuruecksetzen (etwa wenn git
 | 
				
			||||||
 | 
					#       selber Probleme hatte).
 | 
				
			||||||
 | 
					# 16:   Der Download-Thread sollte sowohl die auto-Variable auf false setzen
 | 
				
			||||||
 | 
					#       als auch den cycle-Timer stoppen, damit sichergestellt ist, dass der
 | 
				
			||||||
 | 
					#       Download des DC nicht gestoert wird.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
win32 {
 | 
					win32 {
 | 
				
			||||||
@@ -126,7 +187,7 @@ DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 | 
				
			|||||||
# keep comments, as /* fall through */
 | 
					# keep comments, as /* fall through */
 | 
				
			||||||
QMAKE_CXXFLAGS += -C
 | 
					QMAKE_CXXFLAGS += -C
 | 
				
			||||||
QMAKE_CXXFLAGS += -g
 | 
					QMAKE_CXXFLAGS += -g
 | 
				
			||||||
QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
					QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
 | 
				
			||||||
 | 
					
 | 
				
			||||||
contains( CONFIG, PTU5 ) {
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
 | 
					    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
 | 
				
			||||||
@@ -186,6 +247,7 @@ HEADERS += \
 | 
				
			|||||||
        process/command.h \
 | 
					        process/command.h \
 | 
				
			||||||
        message_handler.h \
 | 
					        message_handler.h \
 | 
				
			||||||
        worker.h \
 | 
					        worker.h \
 | 
				
			||||||
 | 
					        interfaces.h \
 | 
				
			||||||
        commandline_parser.h \
 | 
					        commandline_parser.h \
 | 
				
			||||||
        plugins/interfaces.h
 | 
					        plugins/interfaces.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										349
									
								
								UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										349
									
								
								UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,349 @@
 | 
				
			|||||||
 | 
					QT += core gui
 | 
				
			||||||
 | 
					QT += widgets serialport network
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TARGET = ATBUpdateTool
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# The following define makes your compiler emit warnings if you use
 | 
				
			||||||
 | 
					# any Qt feature that has been marked deprecated (the exact warnings
 | 
				
			||||||
 | 
					# depend on your compiler). Please consult the documentation of the
 | 
				
			||||||
 | 
					# deprecated API in order to know how to port your code away from it.
 | 
				
			||||||
 | 
					DEFINES += QT_DEPRECATED_WARNINGS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# You can also make your code fail to compile if it uses deprecated APIs.
 | 
				
			||||||
 | 
					# In order to do so, uncomment the following line.
 | 
				
			||||||
 | 
					# You can also select to disable deprecated APIs only up to a certain version of Qt.
 | 
				
			||||||
 | 
					#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# 1.3.6 :   Do not update device-controller/json files, but have the library
 | 
				
			||||||
 | 
					#           (in a later step) do that.
 | 
				
			||||||
 | 
					#           Fixed sending messages to ISMAS.
 | 
				
			||||||
 | 
					#           Always execute contents of opkg_commands-file (even if there are no
 | 
				
			||||||
 | 
					#           changes).
 | 
				
			||||||
 | 
					# 1.3.7 :   Wait forever for git-commands to finish in QProcess executing such
 | 
				
			||||||
 | 
					#           a command.
 | 
				
			||||||
 | 
					# 1.3.8 :   Remove accessing opkg_commands under file-system-path /etc/psa_update.
 | 
				
			||||||
 | 
					#           Activate download of json-configuration files.
 | 
				
			||||||
 | 
					# 1.3.9 :   Fix sendLastVersion: use configured branch and not master branch in
 | 
				
			||||||
 | 
					#               git show origin/master -s --format="c=%h m=%s d=%cI"    ==>
 | 
				
			||||||
 | 
					#               git show origin/zg1/zone1 -s --format="c=%h m=%s d=%cI"
 | 
				
			||||||
 | 
					#           Use dynamic values for os-release and apism-version when sending
 | 
				
			||||||
 | 
					#           last version info.
 | 
				
			||||||
 | 
					# 1.3.10:   Fix premature killing opkg-commands: detected timeout of 100s was
 | 
				
			||||||
 | 
					#           too small when updating apism.
 | 
				
			||||||
 | 
					#           Fix display of UPDATE_SUCCESS when opkg_command fails. Detected when
 | 
				
			||||||
 | 
					#           updating apsim failed.
 | 
				
			||||||
 | 
					# 1.3.11:   Integrate version of ATBUpdateTool in SendLastVersion-ISMAS-message.
 | 
				
			||||||
 | 
					# 1.3.12:   Add command parameters for output of yocto-infos about ATBUpdateTool.
 | 
				
			||||||
 | 
					#           Use 'git pull' instead of 'git fetch'.
 | 
				
			||||||
 | 
					#           Use 'git clone --filter=blob:none' instead of 'git clone' to speed
 | 
				
			||||||
 | 
					#           up cloning of customer repository.
 | 
				
			||||||
 | 
					# 1.3.13:   Fix: if the customer repository is corrupted, remove it and re-clone
 | 
				
			||||||
 | 
					#           the repository (without checking the ISMAS-trigger (WAIT-)button.
 | 
				
			||||||
 | 
					# 1.3.14:   Add additional check for sanity of customer repository using
 | 
				
			||||||
 | 
					#           "git fsck".
 | 
				
			||||||
 | 
					#           Stream-lined code of update process: massive refactoring.
 | 
				
			||||||
 | 
					#           Added functionality: If WAIT button is not active, then an existing
 | 
				
			||||||
 | 
					#           customer repository will be repaired, or a not existing repository
 | 
				
			||||||
 | 
					#           will be cloned. The process stops then.
 | 
				
			||||||
 | 
					#           However, if the WAIT button is active, the at least the commands in
 | 
				
			||||||
 | 
					#           opkg_commands will be executed. Changed files in the customer
 | 
				
			||||||
 | 
					#           repository will be worked on: tariff-files will be synced with the
 | 
				
			||||||
 | 
					#           local filesystem, json-files will be downloaded to firmware.
 | 
				
			||||||
 | 
					#           The device-controller firmware will be handled in a later version.
 | 
				
			||||||
 | 
					# 1.3.15:   Bug fixes found during testing.
 | 
				
			||||||
 | 
					#           Do not disable Exit-button during update-process.
 | 
				
			||||||
 | 
					#           Removed worker-thread with an own event-loop: only the GUI thread
 | 
				
			||||||
 | 
					#           has an event loop. Tested JSON-downloads several times successfully
 | 
				
			||||||
 | 
					#           (using the slave lib where the CA helper tool was active as master).
 | 
				
			||||||
 | 
					#           Turned previous worker-object into its own thread, but without any
 | 
				
			||||||
 | 
					#           own event-loop (so it cannot block anything inside the CA-plugin).
 | 
				
			||||||
 | 
					# 1.3.16:   Bug fixes found during testing.
 | 
				
			||||||
 | 
					# 1.3.17:   Add ATBUpdateTool.ini and custom command line parser. Settings
 | 
				
			||||||
 | 
					#           given in ATBUpdateTool.ini can be overwritten on the command-line.
 | 
				
			||||||
 | 
					# 1.3.18:   Bug fixes found during testing.
 | 
				
			||||||
 | 
					# 1.3.19:   Bug fixes found during testing.
 | 
				
			||||||
 | 
					# 1.3.20:   Bug fixes found during testing.
 | 
				
			||||||
 | 
					# 1.3.21:   Bug fixes found during testing:
 | 
				
			||||||
 | 
					#           Fix directory of ATBUpdateTool.ini to be the working directory of
 | 
				
			||||||
 | 
					#           the application rather than just ".".
 | 
				
			||||||
 | 
					#           Check existance of etc-directory inside customer repository.
 | 
				
			||||||
 | 
					#           Check for valid ISMAS trigger (button) 15x (=90s).
 | 
				
			||||||
 | 
					#           NOTE: if the customer repository is cloned (or repaired and cloned
 | 
				
			||||||
 | 
					#           again), and if the settings always-download-config=true and
 | 
				
			||||||
 | 
					#           always-download-dc=true in the ATBUpdateTool.ini file, the download
 | 
				
			||||||
 | 
					#           the printer-json files and the device controller file, even without
 | 
				
			||||||
 | 
					#           an activated ISMAS trigger (button). The tariff-files are rsynced to
 | 
				
			||||||
 | 
					#           the local filesystem for such clone.
 | 
				
			||||||
 | 
					#           Set new filename for device controller: dc2c.bin.
 | 
				
			||||||
 | 
					# 1.3.22:   Bug fixes found during testing:
 | 
				
			||||||
 | 
					#           Fix the path-names of the json-files and the device-controller.
 | 
				
			||||||
 | 
					#           Set automatic download of json-file in ATBUpdateTool.ini file for
 | 
				
			||||||
 | 
					#           a fresh clone of the repository.
 | 
				
			||||||
 | 
					# 1.3.23:   Added a 'break' to prevent a possible endless loop when checking if
 | 
				
			||||||
 | 
					#           the device is alive.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# NOTE:     The versioning info has to be shifted up by one version, i.e. what
 | 
				
			||||||
 | 
					#           happened for 1.3.23 was actually done in 1.3.24.
 | 
				
			||||||
 | 
					# 1.3.24
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# 1.3._24_: Special version for szeged using a old dc-controller (4.42):
 | 
				
			||||||
 | 
					#           Changes:
 | 
				
			||||||
 | 
					#               (1) the ini-File now uses the libCAmaster.so.
 | 
				
			||||||
 | 
					# 1.3._25_: Again special version for szeged, using interface.h, version 4.4.
 | 
				
			||||||
 | 
					# 1.4.0   : Start with version at 1.4.0 (mainly to see a difference with Szeged)
 | 
				
			||||||
 | 
					#           Set hash-value in EVENT-objects. Set location (project), version
 | 
				
			||||||
 | 
					#           and info in send-last-version.
 | 
				
			||||||
 | 
					#           If the customer repository does not exist, then do not check the
 | 
				
			||||||
 | 
					#           ISMAS trigger, but proceed with the update procedure. Otherwise,
 | 
				
			||||||
 | 
					#           check the ISMAS update-trigger as first step.
 | 
				
			||||||
 | 
					#           If the current time is between 0.00 - 4.00 o'clock, then a wrong
 | 
				
			||||||
 | 
					#           trigger-value will result in an UPDATE_STEP_NOT_NECESSARY.
 | 
				
			||||||
 | 
					#           Move final processing to subclass UpdateProcessRunning.
 | 
				
			||||||
 | 
					#           Disable EXIT-button for the whole update-process, except for the
 | 
				
			||||||
 | 
					#           checking of the ISMAS-trigger-button (aka WAIT-button).
 | 
				
			||||||
 | 
					# 1.4.1   : Sync files in the customer repository (under ./etc) as the very
 | 
				
			||||||
 | 
					#           first step
 | 
				
			||||||
 | 
					# 1.4.2   : Do not check if <repo_dir>/etc/psa_tariff and /etc/psa_tariff are
 | 
				
			||||||
 | 
					#           the same after an rsync. They might be noy after a change of the
 | 
				
			||||||
 | 
					#           customer-number.
 | 
				
			||||||
 | 
					# 1.4.3   : Use global directory for device-controller interfaces.h-file.
 | 
				
			||||||
 | 
					# 1.4.4   : Add additional debug messages when downloading json-files.
 | 
				
			||||||
 | 
					#           Move rsyncing of the customer-repository after the actual fetching
 | 
				
			||||||
 | 
					#           of the repository. Otherwise, the update of, for instance
 | 
				
			||||||
 | 
					#           tariff-files, would always be a step behind.
 | 
				
			||||||
 | 
					# 1.4.5   : In case a new branch has been created in a remote
 | 
				
			||||||
 | 
					#           customer-repository (e.g. origin/zg1/zone101), then fetch/pull
 | 
				
			||||||
 | 
					#           this branch before switching to this now locally existen branch.
 | 
				
			||||||
 | 
					#         : Improve output of GUI/Console and messages sent to ISMAS.
 | 
				
			||||||
 | 
					#         : Fix: do not send the json-files to dc in any case. Bug introduced
 | 
				
			||||||
 | 
					#           when pulling new branch, but branch already existed locally.
 | 
				
			||||||
 | 
					# 1.4.6   : No exit()-call if loading CA-plugin fails.
 | 
				
			||||||
 | 
					#           Check m_hw (pointer to CA-(Slave)Plugin) before its use.
 | 
				
			||||||
 | 
					#           Only exit() if firmware is configured to be possibly updated, but
 | 
				
			||||||
 | 
					#           loading the CA-plugin failed.
 | 
				
			||||||
 | 
					# 1.4.7   : Read Json-file versions of Json-files actually loaded into DC.
 | 
				
			||||||
 | 
					# 1.4.8   : Improve reading Json-file versions of Json-files actually loaded
 | 
				
			||||||
 | 
					#           in DC. If available, show version info instead of blob-info of
 | 
				
			||||||
 | 
					#           Json file.
 | 
				
			||||||
 | 
					# 1.4.9   : Improve ISMAS output: add messages for JSON downloads.
 | 
				
			||||||
 | 
					#           Do not send CHECK_ISMAS_TRIGGER_SUCCESS to ISMAS for an automatic
 | 
				
			||||||
 | 
					#           update.
 | 
				
			||||||
 | 
					#           In case there is an automatic update (00:00-04:00) use M0100 instead
 | 
				
			||||||
 | 
					#           of U0002.
 | 
				
			||||||
 | 
					# 1.4.10  : Fix: for the time being, never set the autoRequest-flag to false.
 | 
				
			||||||
 | 
					# 1.4.11  : Fix: remove hard-coded path to git-repos of gitea in mimbach. Read
 | 
				
			||||||
 | 
					#           from ATBUpdateTool.ini the url for the gitrepositories.
 | 
				
			||||||
 | 
					# 1.5.0   : Use ptu-config.atb-comm.de (given in ini-file) as new server for
 | 
				
			||||||
 | 
					#           customer repositories.
 | 
				
			||||||
 | 
					#           Fix: allow empty lines in opkg_commands.
 | 
				
			||||||
 | 
					# 1.5.1   : Fix: do not use cleanPath() on a url-address.
 | 
				
			||||||
 | 
					# 1.5.2   : Remove .ipk and .gz files in /var/cache/opkg.
 | 
				
			||||||
 | 
					# 1.5.3   : Build customer_(id) name without right justification.
 | 
				
			||||||
 | 
					# 1.5.4   : Try to run opkg-commands even under some error conditions (failure
 | 
				
			||||||
 | 
					#           of customerEnvironment(), filesToUpdate() or
 | 
				
			||||||
 | 
					#           syncCustomerRepositoryAndFS().
 | 
				
			||||||
 | 
					# 1.5.5   : Call into binary ptuPackageVersion to get installed package
 | 
				
			||||||
 | 
					#           versions.
 | 
				
			||||||
 | 
					# 1.5.6   : Show additional update progress info in status bar.
 | 
				
			||||||
 | 
					# 2.0.0   : Rewrite of UpdateTool.
 | 
				
			||||||
 | 
					VERSION="2.0.0"
 | 
				
			||||||
 | 
					# PLANNED TODOS:
 | 
				
			||||||
 | 
					#   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 | 
				
			||||||
 | 
					#   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
 | 
				
			||||||
 | 
					#       geklont), aber zusaetzlich werden alle verfuegbaren Dateien als neu
 | 
				
			||||||
 | 
					#       angesehen und die entsprechenden Aktionen durchgefuehrt: tariff-files
 | 
				
			||||||
 | 
					#       spiegeln, json-files laden und dc laden. Also VORSICHT: das repository
 | 
				
			||||||
 | 
					#       muss in diesem fall wirklich in ordnung sein.
 | 
				
			||||||
 | 
					#   3:  Wurde keine Datei geaendert, kein initiales Clone und der WAIT-button
 | 
				
			||||||
 | 
					#       nicht aktiv, so (passiert natuerlich nichts) kann man davon ausgehen,
 | 
				
			||||||
 | 
					#       dass es sich um ein automatisches Update handelt. Dann koennte man im
 | 
				
			||||||
 | 
					#       ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
 | 
				
			||||||
 | 
					#       Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
 | 
				
			||||||
 | 
					#       ausgefuehrt.
 | 
				
			||||||
 | 
					#   5:  Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
 | 
				
			||||||
 | 
					#       installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
 | 
				
			||||||
 | 
					#   6:  rsync: explizites Binary, nicht das in busybox enthaltene.
 | 
				
			||||||
 | 
					#   7:  Versionen der Json-Files lassen sich auslesen.
 | 
				
			||||||
 | 
					#       Problem: Einstellungen in den Json-Files lassen sich auch mittels
 | 
				
			||||||
 | 
					#       Funktionen in der CD-Library ueberschreiben. Damit ist dann wieder nicht
 | 
				
			||||||
 | 
					#       mehr so klar, was jetzt eigentlich aktiv ist.
 | 
				
			||||||
 | 
					#   8:  m_alwaysDownloadConfig und m_alwaysDownloadDC: vorbereitet: man koennte
 | 
				
			||||||
 | 
					#       es so arrangieren, dass der DC plus die Json-files im Repository immer
 | 
				
			||||||
 | 
					#       runtergeladen werden, obwohl sich im Repository gar nicts veraendert
 | 
				
			||||||
 | 
					#       hat. Eeventuell nuetzlich beim initialen Setuo eines PSA.
 | 
				
			||||||
 | 
					#   9:  Das Kunden-Repository sollte immer gezogen werden, unabhaengig von der
 | 
				
			||||||
 | 
					#       Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
 | 
				
			||||||
 | 
					#       PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
 | 
				
			||||||
 | 
					#       gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
 | 
				
			||||||
 | 
					#  11:  Das Edit-Fenster teilen um die Anzeige zu verbessern.
 | 
				
			||||||
 | 
					#  12:  Bei einem Update muss immer ersichtlich sein, warum es ueberhaupt
 | 
				
			||||||
 | 
					#       angestossen wurde. Steht kein "WAIT" im ISMAS-Trigger, dann kann man
 | 
				
			||||||
 | 
					#       davon ausgehen, dass es sich um ein automatisches Update handelt.
 | 
				
			||||||
 | 
					#       In jedem Fall wird bei einem automatischen Update, bei dem der WAIT-
 | 
				
			||||||
 | 
					#       Button nicht gesetzt war, ein "OK" gesendet, falls sonst nichts weiter
 | 
				
			||||||
 | 
					#       zu tun ist. Beachte aber: wir haben auch noch den Fall, dass eine SD-
 | 
				
			||||||
 | 
					#       Karte gesteckt wird. In diesem Fall wird ein komplettes Update gefahren,
 | 
				
			||||||
 | 
					#       und zwar explizit auch ohne WAIT-Button.
 | 
				
			||||||
 | 
					#       Am Ende eines Updates steht im ISMAS entweder ein "OK" oder ein "FAIL".
 | 
				
			||||||
 | 
					# 13:   SendLastVersion: fuer jedes erfolgreich installierte Paket eine
 | 
				
			||||||
 | 
					#       Send-Last-Version-Nachricht an ISMAS. Dadurch entsteht im ISMAS eine
 | 
				
			||||||
 | 
					#       History (Christian darueber informieren).
 | 
				
			||||||
 | 
					# 14:   Installiert werden nur Dateien, die neu sind oder geaendert wurden.
 | 
				
			||||||
 | 
					#       Nicht etwas Dateien, die geloescht wurden: sicherstellen, dass man hier
 | 
				
			||||||
 | 
					#       immer direkt im repository arbeitet, nicht auf dem Filesystem.
 | 
				
			||||||
 | 
					#       Ferner: der DeviceController heisst dc2c.bin, auch fuer die Jsons
 | 
				
			||||||
 | 
					#       sind Dtandard-Namen vergeben. Alternativ: alle vorhandenen Jsons
 | 
				
			||||||
 | 
					#       werden runtergeladen: Thomas ist eh fuer deren Inhalte verantworlich.
 | 
				
			||||||
 | 
					#       WICHTIG: immer ueberpruefen, ob die Dateien im Customer-Repository
 | 
				
			||||||
 | 
					#       wirklich die richtigen Dateien sind.
 | 
				
			||||||
 | 
					# 15:   Der WAIT-Button laesst sich auf WAIT zuruecksetzen (etwa wenn git
 | 
				
			||||||
 | 
					#       selber Probleme hatte).
 | 
				
			||||||
 | 
					# 16:   Der Download-Thread sollte sowohl die auto-Variable auf false setzen
 | 
				
			||||||
 | 
					#       als auch den cycle-Timer stoppen, damit sichergestellt ist, dass der
 | 
				
			||||||
 | 
					#       Download des DC nicht gestoert wird.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					win32 {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date /t")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("time /t")
 | 
				
			||||||
 | 
					} else {
 | 
				
			||||||
 | 
					    BUILD_DATE=$$system("date +%d-%m-%y")
 | 
				
			||||||
 | 
					    BUILD_TIME=$$system("date +%H:%M:%S")
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# INCLUDEPATH += plugins
 | 
				
			||||||
 | 
					INCLUDEPATH += plugins \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../common/ \
 | 
				
			||||||
 | 
					    $${_PRO_FILE_PWD_}/../common/include
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CONFIG += c++17
 | 
				
			||||||
 | 
					# CONFIG -= app_bundle
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
 | 
				
			||||||
 | 
					DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# keep comments, as /* fall through */
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -C
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -g
 | 
				
			||||||
 | 
					QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
 | 
				
			||||||
 | 
					    CONFIG += link_pkgconfig
 | 
				
			||||||
 | 
					    lessThan(QT_MAJOR_VERSION, 5):   PKGCONFIG += qextserialport
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -O2 -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
 | 
				
			||||||
 | 
					    LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5_YOCTO ) {
 | 
				
			||||||
 | 
					    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17   # for GCC >= 4.7
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					    DEFINES+=PTU5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    LIBS += -lCAslave
 | 
				
			||||||
 | 
					    LIBS += -lCAmaster
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					contains( CONFIG, DesktopLinux ) {
 | 
				
			||||||
 | 
					    greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
 | 
				
			||||||
 | 
					    lessThan(QT_MAJOR_VERSION, 5):    CONFIG += extserialport
 | 
				
			||||||
 | 
					    # QMAKE_CC = ccache $$QMAKE_CC
 | 
				
			||||||
 | 
					    # QMAKE_CXX = ccache $$QMAKE_CXX
 | 
				
			||||||
 | 
					    QMAKE_CXXFLAGS += -std=c++17
 | 
				
			||||||
 | 
					    # QMAKE_CXXFLAGS += -Wno-deprecated-copy
 | 
				
			||||||
 | 
					    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
 | 
				
			||||||
 | 
					    ARCH = DesktopLinux
 | 
				
			||||||
 | 
					    DEFINES+=DesktopLinux
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					SOURCES += \
 | 
				
			||||||
 | 
					        main.cpp \
 | 
				
			||||||
 | 
					        progress_event.cpp \
 | 
				
			||||||
 | 
					        update_dc_event.cpp \
 | 
				
			||||||
 | 
					        mainwindow.cpp \
 | 
				
			||||||
 | 
					        utils.cpp \
 | 
				
			||||||
 | 
					        update.cpp \
 | 
				
			||||||
 | 
					        git/git_client.cpp \
 | 
				
			||||||
 | 
					        ismas/ismas_client.cpp \
 | 
				
			||||||
 | 
					        process/command.cpp \
 | 
				
			||||||
 | 
					        process/update_command.cpp \
 | 
				
			||||||
 | 
					        process/update_json_command.cpp \
 | 
				
			||||||
 | 
					        process/update_filesystem_command.cpp \
 | 
				
			||||||
 | 
					        process/update_dc_command.cpp \
 | 
				
			||||||
 | 
					        process/check_ismas_connectivity_command.cpp \
 | 
				
			||||||
 | 
					        process/check_update_activation_command.cpp \
 | 
				
			||||||
 | 
					        process/check_and_fetch_customer_repository_command.cpp \
 | 
				
			||||||
 | 
					        process/exec_opkg_command.cpp \
 | 
				
			||||||
 | 
					        process/show_software_status_command.cpp \
 | 
				
			||||||
 | 
					        message_handler.cpp \
 | 
				
			||||||
 | 
					        worker.cpp \
 | 
				
			||||||
 | 
					        work_process_list.cpp \
 | 
				
			||||||
 | 
					        $${_PRO_FILE_PWD_}/../common/src/utils_internal.cpp \
 | 
				
			||||||
 | 
					        $${_PRO_FILE_PWD_}/../common/src/commandline_parser.cpp \
 | 
				
			||||||
 | 
					        $${_PRO_FILE_PWD_}/../common/ismas/ApismClient.cpp \
 | 
				
			||||||
 | 
					        $${_PRO_FILE_PWD_}/../common/ismas/ApismTcpClient.cpp \
 | 
				
			||||||
 | 
					        $${_PRO_FILE_PWD_}/../common/ismas/ApismClientForUpdate.cpp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					HEADERS += \
 | 
				
			||||||
 | 
					        update.h \
 | 
				
			||||||
 | 
					        progress_event.h \
 | 
				
			||||||
 | 
					        update_dc_event.h \
 | 
				
			||||||
 | 
					        utils.h \
 | 
				
			||||||
 | 
					        mainwindow.h \
 | 
				
			||||||
 | 
					        git/git_client.h \
 | 
				
			||||||
 | 
					        apism/ismas_data.h \
 | 
				
			||||||
 | 
					        ismas/ismas_client.h \
 | 
				
			||||||
 | 
					        process/command.h \
 | 
				
			||||||
 | 
					        process/update_command.h \
 | 
				
			||||||
 | 
					        process/update_json_command.h \
 | 
				
			||||||
 | 
					        process/update_filesystem_command.h \
 | 
				
			||||||
 | 
					        process/update_dc_command.h \
 | 
				
			||||||
 | 
					        process/check_ismas_connectivity_command.h \
 | 
				
			||||||
 | 
					        process/check_update_activation_command.h \
 | 
				
			||||||
 | 
					        process/check_and_fetch_customer_repository_command.h \
 | 
				
			||||||
 | 
					        process/exec_opkg_command.h \
 | 
				
			||||||
 | 
					        process/show_software_status_command.h \
 | 
				
			||||||
 | 
					        message_handler.h \
 | 
				
			||||||
 | 
					        worker.h \
 | 
				
			||||||
 | 
					        work_process_list.h \
 | 
				
			||||||
 | 
					        $${_PRO_FILE_PWD_}/../common/include/utils_internal.h \
 | 
				
			||||||
 | 
					        $${_PRO_FILE_PWD_}/../common/include/commandline_parser.h \
 | 
				
			||||||
 | 
					        $${_PRO_FILE_PWD_}/../common/include/log_line_entry.h \
 | 
				
			||||||
 | 
					        $${_PRO_FILE_PWD_}/../common/ismas/ApismClient.h \
 | 
				
			||||||
 | 
					        $${_PRO_FILE_PWD_}/../common/ismas/ApismTcpClient.h \
 | 
				
			||||||
 | 
					        $${_PRO_FILE_PWD_}/../common/ismas/ISMASData.h \
 | 
				
			||||||
 | 
					        $${_PRO_FILE_PWD_}/../common/ismas/ApismClientForUpdate.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					OTHER_FILES += \
 | 
				
			||||||
 | 
					    ATBUpdateTool.ini
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					FORMS += \
 | 
				
			||||||
 | 
					    mainwindow.ui
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					##########################################################################################
 | 
				
			||||||
 | 
					# for running program on target through QtCreator
 | 
				
			||||||
 | 
					contains( CONFIG, PTU5 ) {
 | 
				
			||||||
 | 
					   qnx: target.path = /tmp/$${TARGET}/bin
 | 
				
			||||||
 | 
					   else: unix:!android: target.path = /opt/app/tools/atbupdate/
 | 
				
			||||||
 | 
					   !isEmpty(target.path): INSTALLS += target
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										
											BIN
										
									
								
								UpdatePTUDevCtrl/doc/ATBUpdateTool.drawio-4.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								UpdatePTUDevCtrl/doc/ATBUpdateTool.drawio-4.pdf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								UpdatePTUDevCtrl/doc/ATBUpdateTool4.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								UpdatePTUDevCtrl/doc/ATBUpdateTool4.pdf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							@@ -2,20 +2,23 @@
 | 
				
			|||||||
#include "update.h"
 | 
					#include "update.h"
 | 
				
			||||||
#include "worker.h"
 | 
					#include "worker.h"
 | 
				
			||||||
#include "utils.h"
 | 
					#include "utils.h"
 | 
				
			||||||
 | 
					#include "process/command.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <QRegularExpression>
 | 
					#include <QRegularExpression>
 | 
				
			||||||
#include <QDebug>
 | 
					#include <QDebug>
 | 
				
			||||||
#include <QDir>
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QStringList>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GitClient::GitClient(QString const &customerNrStr,
 | 
					GitClient::GitClient(QString const &customerRepositoryPath,
 | 
				
			||||||
 | 
					                     QString const &customerNrStr,
 | 
				
			||||||
                     QString const &customerRepository,
 | 
					                     QString const &customerRepository,
 | 
				
			||||||
                     QString const &workingDirectory,
 | 
					                     QString const &workingDirectory,
 | 
				
			||||||
                     QString const &branchName,
 | 
					                     QString const &branchName,
 | 
				
			||||||
                     QObject *parent)
 | 
					                     QObject *parent)
 | 
				
			||||||
  : QObject(parent)
 | 
					  : QObject(parent)
 | 
				
			||||||
  , m_worker(qobject_cast<Worker *>(parent))
 | 
					  , m_worker(qobject_cast<Worker *>(parent))
 | 
				
			||||||
  , m_repositoryPath(QString("https://git.mimbach49.de/GerhardHoffmann/%1.git").arg(customerNrStr))
 | 
					  , m_repositoryPath(customerRepositoryPath)
 | 
				
			||||||
  , m_customerNr(customerNrStr)
 | 
					  , m_customerNr(customerNrStr)
 | 
				
			||||||
  , m_workingDirectory(workingDirectory)
 | 
					  , m_workingDirectory(workingDirectory)
 | 
				
			||||||
  , m_branchName(branchName)
 | 
					  , m_branchName(branchName)
 | 
				
			||||||
@@ -192,7 +195,7 @@ QStringList GitClient::gitShowReason(QString branchName) {
 | 
				
			|||||||
            int const m = s.indexOf("m=");
 | 
					            int const m = s.indexOf("m=");
 | 
				
			||||||
            int const d = s.indexOf("d=");
 | 
					            int const d = s.indexOf("d=");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            QString msg = IsmasClient::getReasonForLastSendVersion();
 | 
					            QString msg{""}; // IsmasClient::getReasonForLastSendVersion();
 | 
				
			||||||
            QString commit{""}, date{""};
 | 
					            QString commit{""}, date{""};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (c != -1) {
 | 
					            if (c != -1) {
 | 
				
			||||||
@@ -204,9 +207,9 @@ QStringList GitClient::gitShowReason(QString branchName) {
 | 
				
			|||||||
                    start = m + 2;
 | 
					                    start = m + 2;
 | 
				
			||||||
                    if (d >= start) {
 | 
					                    if (d >= start) {
 | 
				
			||||||
                        length = d - start;
 | 
					                        length = d - start;
 | 
				
			||||||
                        msg += " (";
 | 
					                        // msg = " (";
 | 
				
			||||||
                        msg = s.mid(start, length).trimmed();
 | 
					                        msg = s.mid(start, length).trimmed();
 | 
				
			||||||
                        msg += ")";
 | 
					                        // msg += ")";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        start = d + 2;
 | 
					                        start = d + 2;
 | 
				
			||||||
                        date = s.mid(start);
 | 
					                        date = s.mid(start);
 | 
				
			||||||
@@ -290,6 +293,100 @@ bool GitClient::gitFsck() {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
    return r;
 | 
					    return r;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool GitClient::branchExistsRemotely() {
 | 
				
			||||||
 | 
					    bool remoteBranchExists = false;
 | 
				
			||||||
 | 
					    if (QDir(m_customerRepository).exists()) {
 | 
				
			||||||
 | 
					        qInfo() << "BRANCH NAME" << m_branchName;
 | 
				
			||||||
 | 
					        QString const cmd = QString("git ls-remote --exit-code --heads origin %1").arg(m_branchName);
 | 
				
			||||||
 | 
					        Command c(cmd);
 | 
				
			||||||
 | 
					        if (c.execute(m_customerRepository)) {
 | 
				
			||||||
 | 
					            // expected result: c16c833c8778c1b3691a74afee5a469177e4e69b refs/heads/zg1/zone1000
 | 
				
			||||||
 | 
					            QString const s = c.getCommandResult().trimmed();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (!s.isEmpty()) {
 | 
				
			||||||
 | 
					                // the result is only one line
 | 
				
			||||||
 | 
					                if ((remoteBranchExists = s.contains(m_branchName)) == true) {
 | 
				
			||||||
 | 
					                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") branch"
 | 
				
			||||||
 | 
					                                << m_branchName << "EXISTS REMOTELY. (" << s << ")";
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                Utils::printCriticalErrorMsg(QString("EMPTY RESULT FOR CMD %1").arg(cmd));
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            Utils::printCriticalErrorMsg(QString("FAILED TO EXEC '%1'").arg(cmd));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return remoteBranchExists;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool GitClient::branchExistsLocally() {
 | 
				
			||||||
 | 
					    Command c("git branch -l");
 | 
				
			||||||
 | 
					    if (c.execute(m_customerRepository)) {
 | 
				
			||||||
 | 
					        QString const s = c.getCommandResult().trimmed();
 | 
				
			||||||
 | 
					        if (!s.isEmpty()) {
 | 
				
			||||||
 | 
					            QStringList lines = Update::split(s, '\n');
 | 
				
			||||||
 | 
					            if (!lines.empty()) {
 | 
				
			||||||
 | 
					                for (int i=0; i < lines.size(); ++i) {
 | 
				
			||||||
 | 
					                    QString line = lines.at(i);
 | 
				
			||||||
 | 
					                    // expected: * [new branch]      zg1/zone12 -> origin/zg1/zone12"
 | 
				
			||||||
 | 
					                    if (line.contains(m_branchName)) {
 | 
				
			||||||
 | 
					                        if (m_worker) {
 | 
				
			||||||
 | 
					                            QStringList lst(QString("BRANCH-NAME %1 CONTAINED IN RESULT %2").arg(m_branchName).arg(s));
 | 
				
			||||||
 | 
					                            m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::PULL_NEW_BRANCH;
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                        return true;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                if (m_worker) {
 | 
				
			||||||
 | 
					                    QStringList lst(QString("BRANCH-NAME %1 NOT CONTAINED IN RESULT %2").arg(m_branchName).arg(s));
 | 
				
			||||||
 | 
					                    m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::PULL_NEW_BRANCH_FAILURE;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                if (m_worker) {
 | 
				
			||||||
 | 
					                    QStringList lst(QString("'git branch -l' RETURNED NO LINES"));
 | 
				
			||||||
 | 
					                    m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::PULL_NEW_BRANCH_FAILURE;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            if (m_worker) {
 | 
				
			||||||
 | 
					                QStringList lst(QString("'git branch -l' RETURNED EMPTY RESULT"));
 | 
				
			||||||
 | 
					                m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::PULL_NEW_BRANCH_FAILURE;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        if (m_worker) {
 | 
				
			||||||
 | 
					            QStringList lst(QString("FAILED TO EXEC 'git branch -l'"));
 | 
				
			||||||
 | 
					            m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::PULL_NEW_BRANCH_FAILURE;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool GitClient::gitPullNewBranches() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (QDir(m_customerRepository).exists()) {
 | 
				
			||||||
 | 
					        Command c("git pull");
 | 
				
			||||||
 | 
					        if (c.execute(m_customerRepository)) {
 | 
				
			||||||
 | 
					            QString const s = c.getCommandResult().trimmed();
 | 
				
			||||||
 | 
					            // expected: Already up-to-date.
 | 
				
			||||||
 | 
					            if (!s.isEmpty()) {
 | 
				
			||||||
 | 
					                QStringList lst;
 | 
				
			||||||
 | 
					                QString msg(QString("GIT-PULL-NEW-BRANCH. RESULT=%1").arg(s));
 | 
				
			||||||
 | 
					                if (m_worker) {
 | 
				
			||||||
 | 
					                    m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::PULL_NEW_BRANCH;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                return true;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 Hat sich nichts geaendert, so werden auch keine Commits <>..<> angezeigt
 | 
					 Hat sich nichts geaendert, so werden auch keine Commits <>..<> angezeigt
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
@@ -297,6 +394,45 @@ std::optional<QString> GitClient::gitPull() {
 | 
				
			|||||||
    if (QDir(m_customerRepository).exists()) {
 | 
					    if (QDir(m_customerRepository).exists()) {
 | 
				
			||||||
        qInfo() << "BRANCH NAME" << m_branchName;
 | 
					        qInfo() << "BRANCH NAME" << m_branchName;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					        IMPORTANT COMMENT:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        If remote host keys are changed, then
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        export GIT_SSH_COMMAND="ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig"
 | 
				
			||||||
 | 
					        git pull
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        leads to the following warning/error message:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 | 
				
			||||||
 | 
					        @    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @
 | 
				
			||||||
 | 
					        @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 | 
				
			||||||
 | 
					        IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!
 | 
				
			||||||
 | 
					        Someone could be eavesdropping on you right now (man-in-the-middle attack)!
 | 
				
			||||||
 | 
					        It is also possible that a host key has just been changed.
 | 
				
			||||||
 | 
					        The fingerprint for the ECDSA key sent by the remote host is
 | 
				
			||||||
 | 
					        SHA256:vOD5jF2hglGktqLhK9ABxfEjwEgIK68/v9erdT05NDQ.
 | 
				
			||||||
 | 
					        Please contact your system administrator.
 | 
				
			||||||
 | 
					        Add correct host key in /home/root/.ssh/known_hosts to get rid of this message.
 | 
				
			||||||
 | 
					        Offending ECDSA key in /home/root/.ssh/known_hosts:1
 | 
				
			||||||
 | 
					        Password authentication is disabled to avoid man-in-the-middle attacks.
 | 
				
			||||||
 | 
					        Keyboard-interactive authentication is disabled to avoid man-in-the-middle attacks.
 | 
				
			||||||
 | 
					        Agent forwarding is disabled to avoid man-in-the-middle attacks.
 | 
				
			||||||
 | 
					        X11 forwarding is disabled to avoid man-in-the-middle attacks.
 | 
				
			||||||
 | 
					        Already up to date.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        This first part is from ssh itself. Only the last line is the git message.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Here an output of running ATBUpdateTool with a corrupted known-hosts-file:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        ...
 | 
				
			||||||
 | 
					        Oct 23 14:18:18 ATB_PTU5 ATBUpdateTool[2696]: ( branchExistsRemotely : 310 ) branch "zg1/zone1" EXISTS REMOTELY. ( "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\r\n@    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @\r\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\r\nIT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!\r\nSomeone could be eavesdropping on you right now (man-in-the-middle attack)!\r\nIt is also possible that a host key has just been changed.\r\nThe fingerprint for the ECDSA key sent by the remote host is\nSHA256:vOD5jF2hglGktqLhK9ABxfEjwEgIK68/v9erdT05NDQ.\r\nPlease contact your system administrator.\r\nAdd correct host key in /home/root/.ssh/known_hosts to get rid of this message.\r\nOffending ECDSA key in /home/root/.ssh/known_hosts:1\r\nPassword authentication is disabled to avoid man-in-the-middle attacks.\r\nKeyboard-interactive authentication is disabled to avoid man-in-the-middle attacks.\r\nAgent forwarding is disabled to avoid man-in-the-middle attacks.\r\nX11 forwarding is disabled to avoid man-in-the-middle attacks.\r\nbd4e8da4780b1a7d6be3d3ce8419f43ccf7e706f\trefs/heads/zg1/zone1" )
 | 
				
			||||||
 | 
					        Oct 23 14:18:18 ATB_PTU5 ATBUpdateTool[2696]: EXECUTED "git branch -l" "(runtime 16ms)" with code 0 IN "/opt/app/tools/atbupdate/customer_336"
 | 
				
			||||||
 | 
					        Oct 23 14:18:18 ATB_PTU5 ATBUpdateTool[2696]: "UPDATE_STEP::PULL_NEW_BRANCH"
 | 
				
			||||||
 | 
					        Oct 23 14:18:18 ATB_PTU5 ATBUpdateTool[2696]: "BRANCH-NAME zg1/zone1 CONTAINED IN RESULT master\n* zg1/zone1" .....
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        The download continues.
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
        Command c("git pull");
 | 
					        Command c("git pull");
 | 
				
			||||||
        if (c.execute(m_customerRepository)) {
 | 
					        if (c.execute(m_customerRepository)) {
 | 
				
			||||||
            QString const s = c.getCommandResult().trimmed();
 | 
					            QString const s = c.getCommandResult().trimmed();
 | 
				
			||||||
@@ -316,6 +452,31 @@ std::optional<QString> GitClient::gitPull() {
 | 
				
			|||||||
                        //   6ed893f..5d9882c  zg1/zone2  -> origin/zg1/zone2
 | 
					                        //   6ed893f..5d9882c  zg1/zone2  -> origin/zg1/zone2
 | 
				
			||||||
                        //   4384d17..77045d8  zg1/zone3  -> origin/zg1/zone3
 | 
					                        //   4384d17..77045d8  zg1/zone3  -> origin/zg1/zone3
 | 
				
			||||||
                        //   89d2812..36a0d74  zg1/zone5  -> origin/zg1/zone5
 | 
					                        //   89d2812..36a0d74  zg1/zone5  -> origin/zg1/zone5
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // More exactly:
 | 
				
			||||||
 | 
					                        // remote: Counting objects: 382, done.
 | 
				
			||||||
 | 
					                        // remote: Compressing objects: 100% (203/203), done.
 | 
				
			||||||
 | 
					                        // remote: Total 278 (delta 177), reused 103 (delta 59)
 | 
				
			||||||
 | 
					                        // Receiving objects: 100% (278/278), 4.89 MiB | 539 KiB/s, done.
 | 
				
			||||||
 | 
					                        // Resolving deltas: 100% (177/177), completed with 40 local objects.
 | 
				
			||||||
 | 
					                        // From ssh://longair@pacific.mpi-cbg.de/srv/git/fiji
 | 
				
			||||||
 | 
					                        // 3036acc..9eb5e40  debian-release-20081030 -> origin/debian-release-20081030
 | 
				
			||||||
 | 
					                        // * [new branch]      debian-release-20081112 -> origin/debian-release-20081112
 | 
				
			||||||
 | 
					                        // * [new branch]      debian-release-20081112.1 -> origin/debian-release-20081112.1
 | 
				
			||||||
 | 
					                        // 3d619e7..6260626  master     -> origin/master
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // The most important bits here are the lines like these:
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        //     3036acc..9eb5e40  debian-release-20081030 -> origin/debian-release-20081030
 | 
				
			||||||
 | 
					                        //   * [new branch]      debian-release-20081112 -> origin/debian-release-20081112
 | 
				
			||||||
 | 
					                        //
 | 
				
			||||||
 | 
					                        // The first line of these two shows that your remote-tracking branch
 | 
				
			||||||
 | 
					                        // origin/debian-release-20081030 has been advanced from the commit 3036acc to 9eb5e40.
 | 
				
			||||||
 | 
					                        // The bit before the arrow is the name of the branch in the remote repository.
 | 
				
			||||||
 | 
					                        // The second line similarly show that since we last did this, a new remote tracking
 | 
				
			||||||
 | 
					                        // branch has been created. (git fetch may also fetch new tags if they have appeared
 | 
				
			||||||
 | 
					                        // in the remote repository.)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        bool found = false;
 | 
					                        bool found = false;
 | 
				
			||||||
                        for (int i=0; i < lines.size(); ++i) {
 | 
					                        for (int i=0; i < lines.size(); ++i) {
 | 
				
			||||||
                            if (lines.at(i).contains(m_branchName)) {
 | 
					                            if (lines.at(i).contains(m_branchName)) {
 | 
				
			||||||
@@ -4,8 +4,8 @@
 | 
				
			|||||||
#include <QObject>
 | 
					#include <QObject>
 | 
				
			||||||
#include <QStringList>
 | 
					#include <QStringList>
 | 
				
			||||||
#include <optional>
 | 
					#include <optional>
 | 
				
			||||||
 | 
					#include <QCoreApplication>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "process/command.h"
 | 
					 | 
				
			||||||
#include "ismas/ismas_client.h"
 | 
					#include "ismas/ismas_client.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Worker;
 | 
					class Worker;
 | 
				
			||||||
@@ -22,7 +22,8 @@ class GitClient : public QObject {
 | 
				
			|||||||
    bool copyGitConfigFromMaster();
 | 
					    bool copyGitConfigFromMaster();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  public:
 | 
					  public:
 | 
				
			||||||
    explicit GitClient(QString const &customerNrStr,
 | 
					    explicit GitClient(QString const &customerRepositoryUrl,
 | 
				
			||||||
 | 
					                       QString const &customerNrStr,
 | 
				
			||||||
                       QString const &repositoryPath,
 | 
					                       QString const &repositoryPath,
 | 
				
			||||||
                       QString const &workingDirectory = QCoreApplication::applicationDirPath(),
 | 
					                       QString const &workingDirectory = QCoreApplication::applicationDirPath(),
 | 
				
			||||||
                       QString const &branchName = "master",
 | 
					                       QString const &branchName = "master",
 | 
				
			||||||
@@ -57,6 +58,10 @@ class GitClient : public QObject {
 | 
				
			|||||||
    static QString gitBlob(QString fileName);
 | 
					    static QString gitBlob(QString fileName);
 | 
				
			||||||
    QString gitCommitForBlob(QString blob);
 | 
					    QString gitCommitForBlob(QString blob);
 | 
				
			||||||
    bool gitIsFileTracked(QString file2name);
 | 
					    bool gitIsFileTracked(QString file2name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool branchExistsRemotely();
 | 
				
			||||||
 | 
					    bool branchExistsLocally();
 | 
				
			||||||
 | 
					    bool gitPullNewBranches();
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // GIT_CLIENT_H_INCLUDED
 | 
					#endif // GIT_CLIENT_H_INCLUDED
 | 
				
			||||||
@@ -21,6 +21,7 @@
 | 
				
			|||||||
#include <QThread>
 | 
					#include <QThread>
 | 
				
			||||||
#include <QJsonDocument>
 | 
					#include <QJsonDocument>
 | 
				
			||||||
#include <QJsonObject>
 | 
					#include <QJsonObject>
 | 
				
			||||||
 | 
					#include <QCoreApplication>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if 0
 | 
					#if 0
 | 
				
			||||||
########################
 | 
					########################
 | 
				
			||||||
@@ -342,8 +343,11 @@ IsmasClient::sendRequestReceiveResponse(int port, QString const &request) {
 | 
				
			|||||||
                return std::nullopt;
 | 
					                return std::nullopt;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
 | 
					            if (!response.contains("RECORD")) {
 | 
				
			||||||
 | 
					                // maybe APISM does not send valid JSON: "RECORD SAVED" etc.
 | 
				
			||||||
                printDebugMessage(port, clientIP, clientPort,
 | 
					                printDebugMessage(port, clientIP, clientPort,
 | 
				
			||||||
                    QString("PARSE ERROR ") + response + " " + parseError.errorString());
 | 
					                    QString("PARSE ERROR ") + response + " " + parseError.errorString());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
            ::close(sockfd);
 | 
					            ::close(sockfd);
 | 
				
			||||||
            return std::nullopt;
 | 
					            return std::nullopt;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
@@ -360,12 +364,24 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
 | 
				
			|||||||
    char buf[1024];
 | 
					    char buf[1024];
 | 
				
			||||||
    memset(buf, 0, sizeof(buf));
 | 
					    memset(buf, 0, sizeof(buf));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    QString const ts = QDateTime::currentDateTime().toString(Qt::ISODateWithMs);
 | 
					    QDateTime const local(QDateTime::currentDateTime());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QDateTime utc(local);
 | 
				
			||||||
 | 
					    utc.setTimeSpec(Qt::UTC);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int const diff = (int)local.secsTo(utc); // diff between UTC and local time
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QTime t(0, 0, 0);
 | 
				
			||||||
 | 
					    t = t.addSecs((uint)diff);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString const st(QString("%1%2").arg(diff < 0 ? "-" : "+").arg(t.toString("hh:mm")));
 | 
				
			||||||
 | 
					    QString const ts(local.toString(Qt::ISODateWithMs) + st);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    snprintf(buf, sizeof(buf)-1,
 | 
					    snprintf(buf, sizeof(buf)-1,
 | 
				
			||||||
        "{"
 | 
					        "{"
 | 
				
			||||||
            "\"REASON\":\"SW_UP\","
 | 
					            "\"REASON\":\"SW_UP\","
 | 
				
			||||||
            "\"TIMESTAMP\":\"%s\","
 | 
					            "\"TIMESTAMP\":\"%s\","
 | 
				
			||||||
            "\"EVENT_ID\":\"0\","
 | 
					            "\"EVENT_ID\":\"%d\","
 | 
				
			||||||
            "\"EVENT\":\"%s\","
 | 
					            "\"EVENT\":\"%s\","
 | 
				
			||||||
            "\"EVENTSTATE\":1,"
 | 
					            "\"EVENTSTATE\":1,"
 | 
				
			||||||
            "\"PARAMETER\": {"
 | 
					            "\"PARAMETER\": {"
 | 
				
			||||||
@@ -375,7 +391,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
 | 
				
			|||||||
                "\"STEP_RESULT\" : \"%s\","
 | 
					                "\"STEP_RESULT\" : \"%s\","
 | 
				
			||||||
                "\"VERSION\" : \"%s\""
 | 
					                "\"VERSION\" : \"%s\""
 | 
				
			||||||
            "}"
 | 
					            "}"
 | 
				
			||||||
        "}", ts.toStdString().c_str(), event, percent, resultCode,
 | 
					        "}", ts.toStdString().c_str(), static_cast<int>(QCoreApplication::applicationPid()), event, percent, resultCode,
 | 
				
			||||||
             step, step_result, version);
 | 
					             step, step_result, version);
 | 
				
			||||||
    return buf;
 | 
					    return buf;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -384,7 +400,7 @@ QString IsmasClient::errorBackendNotConnected(QString const &info,
 | 
				
			|||||||
                                              QString const &version) {
 | 
					                                              QString const &version) {
 | 
				
			||||||
    return updateNewsToIsmas("U0003",
 | 
					    return updateNewsToIsmas("U0003",
 | 
				
			||||||
                             m_progressInPercent,
 | 
					                             m_progressInPercent,
 | 
				
			||||||
                             RESULT_CODE::INSTALL_ERROR,
 | 
					                             RESULT_CODE::ISMAS_NO_CONNECTION_ERROR,
 | 
				
			||||||
                             "CHECK BACKEND CONNECTIVITY",
 | 
					                             "CHECK BACKEND CONNECTIVITY",
 | 
				
			||||||
                             info.toStdString().c_str(),
 | 
					                             info.toStdString().c_str(),
 | 
				
			||||||
                             version.toStdString().c_str());
 | 
					                             version.toStdString().c_str());
 | 
				
			||||||
@@ -394,7 +410,7 @@ QString IsmasClient::errorGitClone(QString const &info,
 | 
				
			|||||||
                                   QString const &version) {
 | 
					                                   QString const &version) {
 | 
				
			||||||
    return updateNewsToIsmas("U0003",
 | 
					    return updateNewsToIsmas("U0003",
 | 
				
			||||||
                             m_progressInPercent,
 | 
					                             m_progressInPercent,
 | 
				
			||||||
                             RESULT_CODE::INSTALL_ERROR,
 | 
					                             RESULT_CODE::GIT_CLONE_ERROR,
 | 
				
			||||||
                             "CLONE CUSTOMER REPOSITORY FAILED",
 | 
					                             "CLONE CUSTOMER REPOSITORY FAILED",
 | 
				
			||||||
                             info.toStdString().c_str(),
 | 
					                             info.toStdString().c_str(),
 | 
				
			||||||
                             version.toStdString().c_str());
 | 
					                             version.toStdString().c_str());
 | 
				
			||||||
@@ -442,7 +458,7 @@ QString IsmasClient::updateTriggerSet(QString const &info, QString const &versio
 | 
				
			|||||||
QString IsmasClient::errorUpdateTrigger(QString const &info, QString const &version) {
 | 
					QString IsmasClient::errorUpdateTrigger(QString const &info, QString const &version) {
 | 
				
			||||||
    return updateNewsToIsmas("U0003",
 | 
					    return updateNewsToIsmas("U0003",
 | 
				
			||||||
                             m_progressInPercent,
 | 
					                             m_progressInPercent,
 | 
				
			||||||
                             RESULT_CODE::INSTALL_ERROR,
 | 
					                             RESULT_CODE::ISMAS_TRIGGER_ERROR,
 | 
				
			||||||
                             "CHECK UPDATE TRIGGER",
 | 
					                             "CHECK UPDATE TRIGGER",
 | 
				
			||||||
                             info.toStdString().c_str(),
 | 
					                             info.toStdString().c_str(),
 | 
				
			||||||
                             version.toStdString().c_str());
 | 
					                             version.toStdString().c_str());
 | 
				
			||||||
@@ -675,7 +691,8 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
 | 
				
			|||||||
                "\"libTCP_ZVT_CCPlugin.so\" : {"
 | 
					                "\"libTCP_ZVT_CCPlugin.so\" : {"
 | 
				
			||||||
                    "\"VERSION\" : \"%s\""
 | 
					                    "\"VERSION\" : \"%s\""
 | 
				
			||||||
                "}"
 | 
					                "}"
 | 
				
			||||||
            "}"
 | 
					            "},"
 | 
				
			||||||
 | 
					             "\"PTU-PACKAGE-VERSIONS\" : %s"
 | 
				
			||||||
        "}",
 | 
					        "}",
 | 
				
			||||||
        psa.versionInfo.reason.toStdString().c_str(),
 | 
					        psa.versionInfo.reason.toStdString().c_str(),
 | 
				
			||||||
        psa.versionInfo.created.toStdString().c_str(),
 | 
					        psa.versionInfo.created.toStdString().c_str(),
 | 
				
			||||||
@@ -786,13 +803,161 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
 | 
				
			|||||||
        psa.pluginVersion.mobilisisCalculatePriceConfigUi.toStdString().c_str(),
 | 
					        psa.pluginVersion.mobilisisCalculatePriceConfigUi.toStdString().c_str(),
 | 
				
			||||||
        psa.pluginVersion.prmCalculatePrice.toStdString().c_str(),
 | 
					        psa.pluginVersion.prmCalculatePrice.toStdString().c_str(),
 | 
				
			||||||
        psa.pluginVersion.prmCalculatePriceConfigUi.toStdString().c_str(),
 | 
					        psa.pluginVersion.prmCalculatePriceConfigUi.toStdString().c_str(),
 | 
				
			||||||
        psa.pluginVersion.tcpZVT.toStdString().c_str());
 | 
					        psa.pluginVersion.tcpZVT.toStdString().c_str(),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        psa.ptuPackageVersion.toStdString().c_str());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        qInfo() << buf;
 | 
					        qInfo() << buf;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return buf;
 | 
					    return buf;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					// prepare
 | 
				
			||||||
 | 
					QString IsmasClient::sendLastVersion(UPDATE_COMPONENT updateComponent,
 | 
				
			||||||
 | 
					                                     PSAInstalled const &psa) {
 | 
				
			||||||
 | 
					    static char buf[4096*2];
 | 
				
			||||||
 | 
					    memset(buf, 0, sizeof(buf));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    switch (updateComponent) {
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::TARIFF:
 | 
				
			||||||
 | 
					    snprintf(buf, sizeof(buf)-1,
 | 
				
			||||||
 | 
					        "{"
 | 
				
			||||||
 | 
					            "\"VERSION_INFO\" : {"
 | 
				
			||||||
 | 
					                "\"UPDATE_REASON\":\"%s\","
 | 
				
			||||||
 | 
					                "\"CREATED\":\"%s\","
 | 
				
			||||||
 | 
					                "\"GIT_COMMIT\":\"%s\""
 | 
				
			||||||
 | 
					            "},"
 | 
				
			||||||
 | 
					            "\"TARIFF\" : {"
 | 
				
			||||||
 | 
					                "\"VERSION\" : \"%s\","
 | 
				
			||||||
 | 
					                "\"PROJECT\" : \"%s\","
 | 
				
			||||||
 | 
					                "\"ZONE\" : %d,"
 | 
				
			||||||
 | 
					                "\"INFO\" : \"%s\","
 | 
				
			||||||
 | 
					                "\"SIZE\" : %d\""
 | 
				
			||||||
 | 
					            "},"
 | 
				
			||||||
 | 
					        "}",
 | 
				
			||||||
 | 
					        psa.tariff.versionInfo.reason.toStdString().c_str(),
 | 
				
			||||||
 | 
					        psa.tariff.versionInfo.created.toStdString().c_str(),
 | 
				
			||||||
 | 
					        psa.tariff.versionInfo.lastCommit.toStdString().c_str(),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        psa.tariff.version.toStdString().c_str(),
 | 
				
			||||||
 | 
					        psa.tariff.project.toStdString().c_str(),
 | 
				
			||||||
 | 
					        psa.tariff.zone,
 | 
				
			||||||
 | 
					        psa.tariff.info.toStdString().c_str(),
 | 
				
			||||||
 | 
					        psa.tariff.size);
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::SOFTWARE_ATBQT:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::SOFTWARE_APISM:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::SOFTWARE_ATB_UPDATE_TOOL:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::CONFIG_PTU5_CPU_SERIAL:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::CONFIG_DEVICE_CONTROLLER:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::CONFIG_PRINTER:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::CONFIG_BNA:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::PLUGIN_ATB_DEVICE_CONTROLLER:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::PLUGIN_INGENICO_CC:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::PLUGIN_MOBILISIS_CALC_PRICE:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::PLUGIN_MOBILISIS_CALC_PRICE_UI:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::PLUGIN_PRM_CALC_PRICE:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::PLUGIN_PRM_CALC_PRICE_UI:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::PLUGIN_TCP_ZVT_CC:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::OPKG_COMMANDS:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::HARDWARE_DEVICES:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::OS:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_CASH_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_CONF_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_DEVICE_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT01_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT02_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT03_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT04_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT05_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT06_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT07_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT08_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT09_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT10_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT11_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT12_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT13_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT14_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT15_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT16_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT17_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT18_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT19_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT20_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT21_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT22_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT23_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT24_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT25_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT26_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT27_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT28_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT29_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT30_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT31_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    case UPDATE_COMPONENT::DC2C_PRINT32_JSON:
 | 
				
			||||||
 | 
					    break;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qInfo() << buf;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return buf;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QString IsmasClient::updateOfPSAContinues(QString currentStage,
 | 
					QString IsmasClient::updateOfPSAContinues(QString currentStage,
 | 
				
			||||||
                                          QString currentStageInfo,
 | 
					                                          QString currentStageInfo,
 | 
				
			||||||
                                          QString const &version) {
 | 
					                                          QString const &version) {
 | 
				
			||||||
							
								
								
									
										1107
									
								
								UpdatePTUDevCtrl/ismas/ismas_client.cpp.master
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1107
									
								
								UpdatePTUDevCtrl/ismas/ismas_client.cpp.master
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -14,6 +14,7 @@ struct PSAInstalled {
 | 
				
			|||||||
    } versionInfo;
 | 
					    } versionInfo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    struct Tariff {
 | 
					    struct Tariff {
 | 
				
			||||||
 | 
					        // VersionInfo versionInfo;
 | 
				
			||||||
        QString name;
 | 
					        QString name;
 | 
				
			||||||
        QString version;
 | 
					        QString version;
 | 
				
			||||||
        QString project;
 | 
					        QString project;
 | 
				
			||||||
@@ -31,6 +32,7 @@ struct PSAInstalled {
 | 
				
			|||||||
    } hw;
 | 
					    } hw;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    struct Opkg {
 | 
					    struct Opkg {
 | 
				
			||||||
 | 
					        // VersionInfo versionInfo;
 | 
				
			||||||
        int size;
 | 
					        int size;
 | 
				
			||||||
        QString blob;
 | 
					        QString blob;
 | 
				
			||||||
        QString lastCommit;
 | 
					        QString lastCommit;
 | 
				
			||||||
@@ -38,6 +40,7 @@ struct PSAInstalled {
 | 
				
			|||||||
    } opkg;
 | 
					    } opkg;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    struct DC {
 | 
					    struct DC {
 | 
				
			||||||
 | 
					        // VersionInfo versionInfo;
 | 
				
			||||||
        QString versionHW;
 | 
					        QString versionHW;
 | 
				
			||||||
        QString versionSW;
 | 
					        QString versionSW;
 | 
				
			||||||
        QString gitBlob;
 | 
					        QString gitBlob;
 | 
				
			||||||
@@ -62,6 +65,7 @@ struct PSAInstalled {
 | 
				
			|||||||
    } pluginVersion;
 | 
					    } pluginVersion;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    struct DC2C {
 | 
					    struct DC2C {
 | 
				
			||||||
 | 
					        // VersionInfo versionInfo;
 | 
				
			||||||
        QString name;
 | 
					        QString name;
 | 
				
			||||||
        QString blob;
 | 
					        QString blob;
 | 
				
			||||||
        int size;
 | 
					        int size;
 | 
				
			||||||
@@ -73,6 +77,8 @@ struct PSAInstalled {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    DC2C print[32];
 | 
					    DC2C print[32];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString ptuPackageVersion;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    explicit PSAInstalled() {
 | 
					    explicit PSAInstalled() {
 | 
				
			||||||
        tariff.name = "N/A";
 | 
					        tariff.name = "N/A";
 | 
				
			||||||
        tariff.version = "N/A";
 | 
					        tariff.version = "N/A";
 | 
				
			||||||
@@ -141,13 +147,47 @@ public:
 | 
				
			|||||||
        DIRECT_PORT = 7778
 | 
					        DIRECT_PORT = 7778
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
    enum RESULT_CODE {
 | 
					    enum RESULT_CODE {
 | 
				
			||||||
        SUCCESS=0,
 | 
					        SUCCESS=0,
 | 
				
			||||||
 | 
					        // if between 00:00 - 04:00 Wait-button state not WAIT, then we assume
 | 
				
			||||||
 | 
					        // that's an automatic nightly (not-necessary) update
 | 
				
			||||||
        NO_UPDATE_NECESSARY=1,
 | 
					        NO_UPDATE_NECESSARY=1,
 | 
				
			||||||
        BACKUP_FAILED=2,
 | 
					        // if APISM reports the ISMAS is not available (15x, 6s delay each)
 | 
				
			||||||
        WRONG_PACKAGE=3,
 | 
					        ISMAS_NO_CONNECTION_ERROR=2,
 | 
				
			||||||
        INSTALL_ERROR=4};
 | 
					        // if not within 00:00-04:00 and WAIT-button was not in state WAIT
 | 
				
			||||||
 | 
					        ISMAS_TRIGGER_ERROR=3,
 | 
				
			||||||
 | 
					        // cloning git repo. not possible
 | 
				
			||||||
 | 
					        GIT_CLONE_ERROR=4,
 | 
				
			||||||
 | 
					        // pulling from remote git server not possible
 | 
				
			||||||
 | 
					        GIT_PULL_ERROR=5,
 | 
				
			||||||
 | 
					        // fetching from remote git server not possible
 | 
				
			||||||
 | 
					        GIT_FETCH_ERROR=6,
 | 
				
			||||||
 | 
					        // merging fetched data not possible
 | 
				
			||||||
 | 
					        GIT_MERGE_ERROR=7,
 | 
				
			||||||
 | 
					        // check sanity of local customer-repository failed
 | 
				
			||||||
 | 
					        GIT_CHECK_REPOSITORY_ERROR=8,
 | 
				
			||||||
 | 
					        // switch/checkout of branch (i.e. zone) on error
 | 
				
			||||||
 | 
					        GIT_SWITCH_BRANCH_ERROR=9,
 | 
				
			||||||
 | 
					        // fetch/pull of new branch failed. the new branch was not available
 | 
				
			||||||
 | 
					        // when installing via SD-card followed by intial clone during the
 | 
				
			||||||
 | 
					        // update process.
 | 
				
			||||||
 | 
					        GIT_FETCH_NEW_BRANCH_ERROR=10,
 | 
				
			||||||
 | 
					        // error computing git-blob hash-value
 | 
				
			||||||
 | 
					        GIT_HASH_ERROR=11,
 | 
				
			||||||
 | 
					        // update for general json files failed.
 | 
				
			||||||
 | 
					        JSON_FILES_UPDATE_ERROR=12,
 | 
				
			||||||
 | 
					        // error downloading config-json-files to device controller
 | 
				
			||||||
 | 
					        JSON_FILES_DOWNLOAD_ERROR=13,
 | 
				
			||||||
 | 
					        // error downloading device-controller
 | 
				
			||||||
 | 
					        DC_DOWNLOAD_ERROR=14,
 | 
				
			||||||
 | 
					        // error rsyncing json/ini-files to local filesystem
 | 
				
			||||||
 | 
					        RSYN_ERROR=15,
 | 
				
			||||||
 | 
					        // HASH_VALUE_ERROR=14,
 | 
				
			||||||
 | 
					        // HW_COMPATIBILITY_ERROR=15,
 | 
				
			||||||
 | 
					        OPKG_COMMANDS_ERROR=16,
 | 
				
			||||||
 | 
					        // CLEANUP_ERROR=18,
 | 
				
			||||||
 | 
					        UPDATE_IN_ERROR_STATE=99
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    enum REASON {
 | 
					    enum REASON {
 | 
				
			||||||
        TIME_TRIGGERED = 0,
 | 
					        TIME_TRIGGERED = 0,
 | 
				
			||||||
@@ -194,8 +234,68 @@ public:
 | 
				
			|||||||
    QString jsonParseFailed(int resultCode, QString reason, QString const &version = QString());
 | 
					    QString jsonParseFailed(int resultCode, QString reason, QString const &version = QString());
 | 
				
			||||||
    std::optional<QString> finalResult(int resultCode, QString reason, QString const &version = QString());
 | 
					    std::optional<QString> finalResult(int resultCode, QString reason, QString const &version = QString());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // legacy
 | 
				
			||||||
    QString updateOfPSASendVersion(PSAInstalled const &psa);
 | 
					    QString updateOfPSASendVersion(PSAInstalled const &psa);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					    enum class UPDATE_COMPONENT {
 | 
				
			||||||
 | 
					        TARIFF,
 | 
				
			||||||
 | 
					        SOFTWARE_ATBQT,
 | 
				
			||||||
 | 
					        SOFTWARE_APISM,
 | 
				
			||||||
 | 
					        SOFTWARE_ATB_UPDATE_TOOL,
 | 
				
			||||||
 | 
					        CONFIG_PTU5_CPU_SERIAL,
 | 
				
			||||||
 | 
					        CONFIG_DEVICE_CONTROLLER,
 | 
				
			||||||
 | 
					        CONFIG_PRINTER,
 | 
				
			||||||
 | 
					        CONFIG_BNA,
 | 
				
			||||||
 | 
					        PLUGIN_ATB_DEVICE_CONTROLLER,
 | 
				
			||||||
 | 
					        PLUGIN_INGENICO_CC,
 | 
				
			||||||
 | 
					        PLUGIN_MOBILISIS_CALC_PRICE,
 | 
				
			||||||
 | 
					        PLUGIN_MOBILISIS_CALC_PRICE_UI,
 | 
				
			||||||
 | 
					        PLUGIN_PRM_CALC_PRICE,
 | 
				
			||||||
 | 
					        PLUGIN_PRM_CALC_PRICE_UI,
 | 
				
			||||||
 | 
					        PLUGIN_TCP_ZVT_CC,
 | 
				
			||||||
 | 
					        OPKG_COMMANDS,
 | 
				
			||||||
 | 
					        HARDWARE_DEVICES,
 | 
				
			||||||
 | 
					        OS,
 | 
				
			||||||
 | 
					        DC2C_CASH_JSON,
 | 
				
			||||||
 | 
					        DC2C_CONF_JSON,
 | 
				
			||||||
 | 
					        DC2C_DEVICE_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT01_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT02_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT03_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT04_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT05_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT06_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT07_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT08_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT09_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT10_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT11_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT12_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT13_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT14_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT15_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT16_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT17_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT18_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT19_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT20_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT21_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT22_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT23_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT24_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT25_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT26_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT27_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT28_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT29_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT30_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT31_JSON,
 | 
				
			||||||
 | 
					        DC2C_PRINT32_JSON,
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					    QString sendLastVersion(UPDATE_COMPONENT comp, PSAInstalled const &psa);
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  private:
 | 
					  private:
 | 
				
			||||||
    static void printDebugMessage(int port, QString const &clientIP, int clientPort,
 | 
					    static void printDebugMessage(int port, QString const &clientIP, int clientPort,
 | 
				
			||||||
                                  QString const &message);
 | 
					                                  QString const &message);
 | 
				
			||||||
@@ -9,7 +9,7 @@
 | 
				
			|||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "message_handler.h"
 | 
					#include "message_handler.h"
 | 
				
			||||||
#include "plugins/interfaces.h"
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
#include "commandline_parser.h"
 | 
					#include "commandline_parser.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <unistd.h>
 | 
					#include <unistd.h>
 | 
				
			||||||
@@ -31,10 +31,12 @@
 | 
				
			|||||||
#include "worker.h"
 | 
					#include "worker.h"
 | 
				
			||||||
#include "mainwindow.h"
 | 
					#include "mainwindow.h"
 | 
				
			||||||
#include "utils.h"
 | 
					#include "utils.h"
 | 
				
			||||||
 | 
					// #include "process/command.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <QThread>
 | 
					#include <QThread>
 | 
				
			||||||
#include <QtWidgets>
 | 
					#include <QtWidgets>
 | 
				
			||||||
#include <QScopedPointer>
 | 
					#include <QScopedPointer>
 | 
				
			||||||
 | 
					#include <QScreen>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
 | 
					#if defined (Q_OS_UNIX) || defined (Q_OS_LINUX)
 | 
				
			||||||
#include <unistd.h>
 | 
					#include <unistd.h>
 | 
				
			||||||
@@ -47,12 +49,44 @@
 | 
				
			|||||||
#define SERIAL_PORT "ttyUSB0"
 | 
					#define SERIAL_PORT "ttyUSB0"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * @mainpage ATB-Update-Tool Documentation
 | 
				
			||||||
 | 
					 * \section intro_sec Introduction
 | 
				
			||||||
 | 
					 *  The ATB update tool consistes of several binaries, which are executed in
 | 
				
			||||||
 | 
					 *  order:
 | 
				
			||||||
 | 
					 *  * \ref ATBUpdateTool
 | 
				
			||||||
 | 
					 *  * \ref ATBUpdateCheck
 | 
				
			||||||
 | 
					 *  * \ref ATBUpdateGit
 | 
				
			||||||
 | 
					 *  * \ref ATBUpdateSync
 | 
				
			||||||
 | 
					 *  * \ref ATBUpdateOpkg
 | 
				
			||||||
 | 
					 *  * \ref ATBUpdateDC
 | 
				
			||||||
 | 
					 *  * \ref ATBUpdateJsonFiles
 | 
				
			||||||
 | 
					 *  * \ref ATBUpdateShow
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  The binaries are started synchonously as child processes of \ref ATBUpdateTool:
 | 
				
			||||||
 | 
					 *  each binary will finish before the next one is started.
 | 
				
			||||||
 | 
					 *  The output for the child process is captured in \ref ATBUpdateTool, and
 | 
				
			||||||
 | 
					 *  optionally shown in the GUI presemted to the user.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * - \page ATBUpdateTool
 | 
				
			||||||
 | 
					 * - \page ATBUpdateCheck
 | 
				
			||||||
 | 
					 * - \page ATBUpdateGit
 | 
				
			||||||
 | 
					 * - \page ATBUpdateSync
 | 
				
			||||||
 | 
					 * - \page ATBUpdateOpkg
 | 
				
			||||||
 | 
					 * - \page ATBUpdateDC
 | 
				
			||||||
 | 
					 *      Typical call: ./ATBUpdateDC --dc-directory /etc/dc/ --debug true
 | 
				
			||||||
 | 
					 * - \page ATBUpdateJsonFiles
 | 
				
			||||||
 | 
					 * - \page ATBUpdateShow
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// argv[1]: file to send to dc
 | 
					// argv[1]: file to send to dc
 | 
				
			||||||
int main(int argc, char *argv[]) {
 | 
					int main(int argc, char *argv[]) {
 | 
				
			||||||
    QByteArray const value = qgetenv("LC_ALL");
 | 
					    QByteArray const value = qgetenv("LC_ALL");
 | 
				
			||||||
    if (value != "C") {
 | 
					    if (value.isEmpty() || value != "C") {
 | 
				
			||||||
        qputenv("LC_ALL", "C");
 | 
					        qputenv("LC_ALL", "C");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // qputenv("XDG_RUNTIME_DIR", "/var/run/user/0");
 | 
					    // qputenv("XDG_RUNTIME_DIR", "/var/run/user/0");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    openlog("ATB-UPDATE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 | 
					    openlog("ATB-UPDATE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 | 
				
			||||||
@@ -62,7 +96,8 @@ int main(int argc, char *argv[]) {
 | 
				
			|||||||
    QApplication::setApplicationVersion(APP_VERSION);
 | 
					    QApplication::setApplicationVersion(APP_VERSION);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
 | 
					    if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
 | 
				
			||||||
        atbInstallMessageHandler(atbDebugOutput);
 | 
					        atbInstallMessageHandler(nullptr);
 | 
				
			||||||
 | 
					        //atbInstallMessageHandler(atbDebugOutput);
 | 
				
			||||||
        setDebugLevel(LOG_NOTICE);
 | 
					        setDebugLevel(LOG_NOTICE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -71,6 +106,40 @@ int main(int argc, char *argv[]) {
 | 
				
			|||||||
    parser.readSettings();
 | 
					    parser.readSettings();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    QString repositoryUrl = parser.repositoryUrl();
 | 
					    QString repositoryUrl = parser.repositoryUrl();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (repositoryUrl.endsWith('/')) {
 | 
				
			||||||
 | 
					        repositoryUrl.chop(1);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString gitSSHCommand("");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (repositoryUrl.contains("ptu-config.atb-comm.de")) {
 | 
				
			||||||
 | 
					        QByteArray const v = qgetenv("GIT_SSH_COMMAND");
 | 
				
			||||||
 | 
					        if (v.isEmpty()) {
 | 
				
			||||||
 | 
					            QString sshKeyFile("/opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig");
 | 
				
			||||||
 | 
					            if (QFileInfo(sshKeyFile).exists()) {
 | 
				
			||||||
 | 
					                if (qgetenv("GIT_SSH_COMMAND").isNull()) {
 | 
				
			||||||
 | 
					                    gitSSHCommand = "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig";
 | 
				
			||||||
 | 
					                    if (!qputenv("GIT_SSH_COMMAND", QByteArray(gitSSHCommand.toStdString().c_str()))) {
 | 
				
			||||||
 | 
					                        qCritical() << "ERROR: GIT_SSH_COMMAND not put into env. Exiting...";
 | 
				
			||||||
 | 
					                        return -1;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                qCritical() << "ERROR ssh-key-file" << sshKeyFile << "does not exists. Exiting...";
 | 
				
			||||||
 | 
					                return -1;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            gitSSHCommand = QString(v.toStdString().c_str());
 | 
				
			||||||
 | 
					            qCritical() << "WARNING GIT_SSH_COMMAND already set in enviroment:"
 | 
				
			||||||
 | 
					                        << gitSSHCommand;
 | 
				
			||||||
 | 
					            if (gitSSHCommand != "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig") {
 | 
				
			||||||
 | 
					                qCritical() << "ERROR" << gitSSHCommand << "wrong. Exiting...";
 | 
				
			||||||
 | 
					                return -1;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    QString plugInDir = parser.plugInDir();
 | 
					    QString plugInDir = parser.plugInDir();
 | 
				
			||||||
    QString plugInName = parser.plugInName();
 | 
					    QString plugInName = parser.plugInName();
 | 
				
			||||||
    QString workingDir = parser.workingDir();
 | 
					    QString workingDir = parser.workingDir();
 | 
				
			||||||
@@ -93,6 +162,9 @@ int main(int argc, char *argv[]) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    qInfo() << "pwd ......................" << rtPath;
 | 
					    qInfo() << "pwd ......................" << rtPath;
 | 
				
			||||||
    qInfo() << "repositoryUrl ............" << repositoryUrl;
 | 
					    qInfo() << "repositoryUrl ............" << repositoryUrl;
 | 
				
			||||||
 | 
					    if (!gitSSHCommand.isEmpty()) {
 | 
				
			||||||
 | 
					        qInfo() << "GIT_SSH_COMMAND .........." << gitSSHCommand;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    qInfo() << "plugInDir ................" << plugInDir;
 | 
					    qInfo() << "plugInDir ................" << plugInDir;
 | 
				
			||||||
    qInfo() << "plugInName ..............." << plugInName;
 | 
					    qInfo() << "plugInName ..............." << plugInName;
 | 
				
			||||||
    qInfo() << "workingDir ..............." << workingDir;
 | 
					    qInfo() << "workingDir ..............." << workingDir;
 | 
				
			||||||
@@ -130,8 +202,10 @@ int main(int argc, char *argv[]) {
 | 
				
			|||||||
    if (!QDir(plugInDir).exists()) {
 | 
					    if (!QDir(plugInDir).exists()) {
 | 
				
			||||||
        qCritical() << plugInDir
 | 
					        qCritical() << plugInDir
 | 
				
			||||||
                    << "does not exists, but has to contain dc-library";
 | 
					                    << "does not exists, but has to contain dc-library";
 | 
				
			||||||
 | 
					        if (noUpdatePsaHardware == false) {
 | 
				
			||||||
            exit(-1);
 | 
					            exit(-1);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // before loading the library, delete all possible shared memory segments
 | 
					    // before loading the library, delete all possible shared memory segments
 | 
				
			||||||
#if defined Q_OS_LINUX || defined Q_OS_UNIX
 | 
					#if defined Q_OS_LINUX || defined Q_OS_UNIX
 | 
				
			||||||
@@ -159,5 +233,10 @@ int main(int argc, char *argv[]) {
 | 
				
			|||||||
    mw.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
 | 
					    mw.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
 | 
				
			||||||
    mw.showFullScreen();
 | 
					    mw.showFullScreen();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // test
 | 
				
			||||||
 | 
					    //worker.jsUpdate();
 | 
				
			||||||
 | 
					    worker.workList().exec();
 | 
				
			||||||
 | 
					    // worker.summary();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return a.exec();
 | 
					    return a.exec();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
							
								
								
									
										887
									
								
								UpdatePTUDevCtrl/mainwindow.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										887
									
								
								UpdatePTUDevCtrl/mainwindow.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,887 @@
 | 
				
			|||||||
 | 
					#include "mainwindow.h"
 | 
				
			||||||
 | 
					#include "ui_mainwindow.h"
 | 
				
			||||||
 | 
					#include "worker.h"
 | 
				
			||||||
 | 
					#include "utils.h"
 | 
				
			||||||
 | 
					#include "utils_internal.h"
 | 
				
			||||||
 | 
					#include "log_line_entry.h"
 | 
				
			||||||
 | 
					#include "progress_event.h"
 | 
				
			||||||
 | 
					#include "update_dc_event.h"
 | 
				
			||||||
 | 
					#include "process/update_command.h"
 | 
				
			||||||
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <QMessageBox>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					#include <QScrollBar>
 | 
				
			||||||
 | 
					#include <QEvent>
 | 
				
			||||||
 | 
					#include <QColor>
 | 
				
			||||||
 | 
					#include <QColorDialog>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define CHECK_BACKEND_CONNECTION    0
 | 
				
			||||||
 | 
					#define CHECK_UPDATE_REQUEST        1
 | 
				
			||||||
 | 
					#define UPDATE_CUSTOMER_REPOSITORY  2
 | 
				
			||||||
 | 
					#define INSTALL_SW_PACKETS_DRY_RUN  3
 | 
				
			||||||
 | 
					#define INSTALL_SW_PACKETS          4
 | 
				
			||||||
 | 
					#define UPDATE_DC                   5
 | 
				
			||||||
 | 
					#define SYNCHRONIZE_REPOSITORY      6
 | 
				
			||||||
 | 
					#define INSTALL_DC_CONFIGURATION    7
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define CHECK_ISMAS_CONNECT_PERCENT_START   ( 1)
 | 
				
			||||||
 | 
					#define CHECK_ISMAS_CONNECT_PERCENT_END     (10)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define CHECK_UPDATE_REQUEST_PERCENT_START  (10)
 | 
				
			||||||
 | 
					#define CHECK_UPDATE_REQUEST_PERCENT_END    (20)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define UPDATE_GIT_PERCENT_START            (20)
 | 
				
			||||||
 | 
					#define UPDATE_GIT_PERCENT_END              (21)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define UPDATE_OPKG_NOACTION_PERCENT_START  (21)
 | 
				
			||||||
 | 
					#define UPDATE_OPKG_NOACTION_PERCENT_END    (25)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define UPDATE_OPKG_PERCENT_START           (25)
 | 
				
			||||||
 | 
					#define UPDATE_OPKG_PERCENT_END             (40)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define UPDATE_DOWNLOAD_DC_START            (41)
 | 
				
			||||||
 | 
					#define UPDATE_DOWNLOAD_DC_END              (80)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define UPDATE_SYNC_START                   (81)
 | 
				
			||||||
 | 
					#define UPDATE_SYNC_END                     (90)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define UPDATE_DOWNLOAD_JSON_START          (91)
 | 
				
			||||||
 | 
					#define UPDATE_DOWNLOAD_JSON_END            (100)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onFileChanged(QString const& /*f*/) {
 | 
				
			||||||
 | 
					    static int i = 30;
 | 
				
			||||||
 | 
					    ui->updateProgress->setValue(++i);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // TODO: daten an ISMAS senden
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QProgressBar *MainWindow::progressBar() {
 | 
				
			||||||
 | 
					    return ui ? ui->updateProgress : nullptr;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					MainWindow::MainWindow(Worker *worker, QWidget *parent)
 | 
				
			||||||
 | 
					    : QMainWindow(parent)
 | 
				
			||||||
 | 
					    , ui(new Ui::MainWindow)
 | 
				
			||||||
 | 
					    , m_worker(worker)
 | 
				
			||||||
 | 
					    , m_width(60)
 | 
				
			||||||
 | 
					    , m_progressRunning(false)
 | 
				
			||||||
 | 
					    , m_updateStep(UpdateDcEvent::UpdateStep::NONE)
 | 
				
			||||||
 | 
					    , m_updateLog("/opt/app/tools/atbupdate/update.log") { // TODO: in ini-file eintragen
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ui->setupUi(this);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!m_updateLog.open(QIODevice::ReadWrite | QIODevice::Unbuffered)) {
 | 
				
			||||||
 | 
					        qCritical() << "ERROR can not open" << m_updateLog.fileName();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_updateSteps.resize(8);
 | 
				
			||||||
 | 
					    m_updateSteps[CHECK_BACKEND_CONNECTION] = "Check backend connection (ISMAS) ";
 | 
				
			||||||
 | 
					    m_updateSteps[CHECK_UPDATE_REQUEST] = "Check update request ";
 | 
				
			||||||
 | 
					    m_updateSteps[UPDATE_CUSTOMER_REPOSITORY] = "Update customer repository ";
 | 
				
			||||||
 | 
					    m_updateSteps[INSTALL_SW_PACKETS_DRY_RUN] = "Install SW packets (dry run) ";
 | 
				
			||||||
 | 
					    m_updateSteps[INSTALL_SW_PACKETS] = "Install SW packets ";
 | 
				
			||||||
 | 
					    m_updateSteps[UPDATE_DC] = "Update DC ";
 | 
				
			||||||
 | 
					    m_updateSteps[SYNCHRONIZE_REPOSITORY] = "Synchronize repository/filesystem ";
 | 
				
			||||||
 | 
					    m_updateSteps[INSTALL_DC_CONFIGURATION] = "Install DC configuration ";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString text{};
 | 
				
			||||||
 | 
					    for (int i = 0; i < m_updateSteps.size(); ++i) {
 | 
				
			||||||
 | 
					        QString &tmp = m_updateSteps[i];
 | 
				
			||||||
 | 
					        int len = m_showLineLength - tmp.length();
 | 
				
			||||||
 | 
					        while (--len > 0) {
 | 
				
			||||||
 | 
					           tmp += " ";
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        m_updateSteps[i] = tmp;
 | 
				
			||||||
 | 
					        text += m_updateSteps[i];
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    ui->stepLabel->setTextFormat(Qt::RichText);
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(text);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    this->setStatusBar(new QStatusBar(this));
 | 
				
			||||||
 | 
					    QFont f;
 | 
				
			||||||
 | 
					    f.setStyleHint(QFont::Monospace);
 | 
				
			||||||
 | 
					    f.setWeight(QFont::Bold);
 | 
				
			||||||
 | 
					    f.setFamily("Misc Fixed");
 | 
				
			||||||
 | 
					    f.setPointSize(11);
 | 
				
			||||||
 | 
					    this->statusBar()->setFont(f);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ui->updateProgress->setRange(0, 100);
 | 
				
			||||||
 | 
					    ui->updateProgress->reset();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QStringList lst;
 | 
				
			||||||
 | 
					    QString start = QDateTime::currentDateTime().toString(Qt::ISODate);
 | 
				
			||||||
 | 
					    lst << QString("Start: ") + start.leftJustified(m_width-10);
 | 
				
			||||||
 | 
					    lst << QString("").leftJustified(m_width-3, '=');
 | 
				
			||||||
 | 
					    lst << QString("Update tool version     : %1 - %2 %3").arg(APP_VERSION).arg(APP_BUILD_DATE).arg(APP_BUILD_TIME).leftJustified(m_width-3);
 | 
				
			||||||
 | 
					    lst << QString("Machine number          : %1 ").arg(m_worker->machineNr()).leftJustified(m_width-3);
 | 
				
			||||||
 | 
					    lst << QString("Customer number         : %1 ").arg(m_worker->customerNr()).leftJustified(m_width-3);
 | 
				
			||||||
 | 
					    lst << QString("Zone number             : %1 ").arg(m_worker->zoneNr()).leftJustified(m_width-3);
 | 
				
			||||||
 | 
					    lst << QString("APISM version           : %1").arg(m_worker->apismVersion()).leftJustified(m_width-3);
 | 
				
			||||||
 | 
					    lst << QString("").leftJustified(m_width-3, '=');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ui->updateLabel->setText(lst.join('\n'));
 | 
				
			||||||
 | 
					    ui->updateLabel->setEnabled(true);
 | 
				
			||||||
 | 
					    // ui->updateStatus->installEventFilter(this);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_startTimer = new QTimer(this);
 | 
				
			||||||
 | 
					    connect(m_startTimer, SIGNAL(timeout()), m_worker, SLOT(start()));
 | 
				
			||||||
 | 
					    m_startTimer->setSingleShot(true);
 | 
				
			||||||
 | 
					    m_startTimer->start(1000);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_exitTimer = new QTimer(this);
 | 
				
			||||||
 | 
					    connect(m_exitTimer, SIGNAL(timeout()), ui->exit, SLOT(click()));
 | 
				
			||||||
 | 
					    m_exitTimer->setSingleShot(true);
 | 
				
			||||||
 | 
					    m_exitTimer->start(1800 * 1000);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_statusTimer = new QTimer(this);
 | 
				
			||||||
 | 
					    if (m_statusTimer) {
 | 
				
			||||||
 | 
					        connect(m_statusTimer, &QTimer::timeout, [this]() {
 | 
				
			||||||
 | 
					            static QString p(".");
 | 
				
			||||||
 | 
					            QTime const &t = QDateTime::currentDateTime().time();
 | 
				
			||||||
 | 
					            QString s = t.toString(Qt::ISODate);
 | 
				
			||||||
 | 
					            s += ": Update might take several minutes " + p;
 | 
				
			||||||
 | 
					            if (p.length() >= 5) {
 | 
				
			||||||
 | 
					                p = ".";
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                p += ".";
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            this->statusBar()->showMessage(s);
 | 
				
			||||||
 | 
					        });
 | 
				
			||||||
 | 
					        m_statusTimer->setSingleShot(false);
 | 
				
			||||||
 | 
					        m_statusTimer->start(1000);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    connect(m_worker->summaryTimer(), SIGNAL(timeout()), this, SLOT(onSummary()));
 | 
				
			||||||
 | 
					    m_worker->summaryTimer()->setSingleShot(true);
 | 
				
			||||||
 | 
					    m_worker->summaryTimer()->setInterval(5000);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    connect(ui->exit, SIGNAL(clicked()),this,SLOT(onQuit()));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(summary()),this,SLOT(onSummary()));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showSummary(QString)),this,SLOT(onShowSummary(QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showDcDownload(QString)),this,SLOT(onShowDcDownload(QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showJsonDownload(QString)),this,SLOT(onShowJsonDownload(QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showTariffUpdate(QString)),this,SLOT(onShowTariffUpdate(QString)));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // deprecated
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showISMASChecks(QString)),this,SLOT(onShowISMASChecks(QString)));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showISMASConnectivity(QString)),this,SLOT(onShowISMASConnectivity(QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showUpdateRequest(QString)),this,SLOT(onShowUpdateRequest(QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showCustRepoStatus(QString)),this,SLOT(onShowCustRepoStatus(QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showExecOpkgStatus(QString)),this,SLOT(onShowExecOpkgStatus(QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showExecOpkgCommand(QString)),this,SLOT(onShowExecOpkgCommand(QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showExecOpkgOverallResult(QString, bool)),this,SLOT(onShowExecOpkgOverallResult(QString,bool)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showDownloadDCJsonFilesStatus(QString)),this,SLOT(onShowDownloadDCJsonFilesStatus(QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showSyncCustRepoStatus(QString)),this,SLOT(onShowSyncCustRepoStatus(QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showUpdateDCFirmware(QString)),this,SLOT(onShowUpdateDCFirmware(QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(setDcDownloadProgress(int)),this,SLOT(onSetDcDownloadProgress(int)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(stopStartTimer()),this,SLOT(onStopStartTimer()));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(restartExitTimer()),this,SLOT(onRestartExitTimer()));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(appendText(QString,QString)),this,SLOT(onAppendText(QString,QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(insertText(QString)),this,SLOT(onInsertText(QString)), Qt::DirectConnection);
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showErrorMessage(QString,QString)),this, SLOT(onShowErrorMessage(QString,QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showStatusMessage(QString,QString)),this, SLOT(onShowStatusMessage(QString,QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showErrorMessage(QStringList)),this, SLOT(onShowErrorMessage(QStringList)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(showStatusMessage(QString,QString)),this, SLOT(onShowStatusMessage(QString,QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(replaceLast(QString,QString)),this,SLOT(onReplaceLast(QString,QString)));
 | 
				
			||||||
 | 
					    connect(m_worker, SIGNAL(replaceLast(QStringList,QString)),this, SLOT(onReplaceLast(QStringList,QString)));
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onSummary() {
 | 
				
			||||||
 | 
					    QThread::sleep(3);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString summary, first, second, line, tmp;
 | 
				
			||||||
 | 
					    QVector<QPair<QString, QString>> vec = Utils::installedPackages();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (m_worker) {
 | 
				
			||||||
 | 
					        vec.append(Utils::installedTariffFiles(m_worker, m_worker->customerRepository()));
 | 
				
			||||||
 | 
					        vec.append(Utils::installedJsonFiles(m_worker, m_worker->customerRepository()));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    int max_first = 0, max_second = 0;
 | 
				
			||||||
 | 
					    for (int i = 0; i < vec.size(); ++i) {
 | 
				
			||||||
 | 
					        max_first = std::max(max_first, vec[i].first.length());
 | 
				
			||||||
 | 
					        max_second = std::max(max_second, vec[i].second.length());
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    max_first += 5;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    summary = "UPDATE SUMMARY\n\n";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (m_worker) {
 | 
				
			||||||
 | 
					        first = QString("%1").arg("start", max_first, QChar(' '));
 | 
				
			||||||
 | 
					        tmp = QString("%1").arg(m_worker->start().toString(Qt::ISODate));
 | 
				
			||||||
 | 
					        second = QString("%1").arg(tmp, -max_second, QChar(' '));
 | 
				
			||||||
 | 
					        line = first + ": " + second;
 | 
				
			||||||
 | 
					        summary += line + "\n";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    first = QString("%1").arg("update tool version", max_first, QChar(' '));
 | 
				
			||||||
 | 
					    tmp = QString("%1 - %2 %3").arg(APP_VERSION).arg(APP_BUILD_DATE).arg(APP_BUILD_TIME);
 | 
				
			||||||
 | 
					    second = QString("%1").arg(tmp, -max_second, QChar(' '));
 | 
				
			||||||
 | 
					    line = first + ": " + second;
 | 
				
			||||||
 | 
					    summary += line + "\n";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (m_worker) {
 | 
				
			||||||
 | 
					        first = QString("%1").arg("machine number", max_first, QChar(' '));
 | 
				
			||||||
 | 
					        tmp = QString("%1").arg(m_worker->machineNr());
 | 
				
			||||||
 | 
					        second = QString("%1").arg(tmp, -max_second, QChar(' '));
 | 
				
			||||||
 | 
					        line = first + ": " + second;
 | 
				
			||||||
 | 
					        summary += line + "\n";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        first = QString("%1").arg("customer number", max_first, QChar(' '));
 | 
				
			||||||
 | 
					        tmp = QString("%1").arg(m_worker->customerNr());
 | 
				
			||||||
 | 
					        second = QString("%1").arg(tmp, -max_second, QChar(' '));
 | 
				
			||||||
 | 
					        line = first + ": " + second;
 | 
				
			||||||
 | 
					        summary += line + "\n";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        first = QString("%1").arg("zone number", max_first, QChar(' '));
 | 
				
			||||||
 | 
					        tmp = QString("%1").arg(m_worker->zoneNr());
 | 
				
			||||||
 | 
					        second = QString("%1").arg(tmp, -max_second, QChar(' '));
 | 
				
			||||||
 | 
					        line = first + ": " + second;
 | 
				
			||||||
 | 
					        summary += line + "\n";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    tmp = targetDcVersion();
 | 
				
			||||||
 | 
					    if (!tmp.isEmpty()) {
 | 
				
			||||||
 | 
					        first = QString("%1").arg("target device controller", max_first, QChar(' '));
 | 
				
			||||||
 | 
					        second = QString("%1").arg(tmp, -max_second, QChar(' '));
 | 
				
			||||||
 | 
					        line = first + ": " + second;
 | 
				
			||||||
 | 
					        summary += line + "\n";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (m_worker) {
 | 
				
			||||||
 | 
					        first = QString("%1").arg("apism", max_first, QChar(' '));
 | 
				
			||||||
 | 
					        tmp = QString("%1").arg(m_worker->apismVersion());
 | 
				
			||||||
 | 
					        second = QString("%1").arg(tmp, -max_second, QChar(' '));
 | 
				
			||||||
 | 
					        line = first + ": " + second;
 | 
				
			||||||
 | 
					        summary += line + "\n";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    for (int i = 0; i < vec.size(); ++i) {
 | 
				
			||||||
 | 
					        first = QString("%1").arg(vec[i].first, max_first, QChar(' '));
 | 
				
			||||||
 | 
					        second = QString("%1").arg(vec[i].second, -max_second, QChar(' '));
 | 
				
			||||||
 | 
					        line = first + ": " + second;
 | 
				
			||||||
 | 
					        summary += line + "\n";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (m_worker) {
 | 
				
			||||||
 | 
					        emit m_worker->showSummary(summary);
 | 
				
			||||||
 | 
					        emit m_worker->enableExit();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowSummary(QString text) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // QString s = ui->updateLabel->text();
 | 
				
			||||||
 | 
					    QString s("\n");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ui->updateLabel->setText(s);
 | 
				
			||||||
 | 
					    ui->updateLabel->hide();
 | 
				
			||||||
 | 
					    ui->stepLabel->hide();
 | 
				
			||||||
 | 
					    ui->updateProgress->hide();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    s += text;
 | 
				
			||||||
 | 
					    ui->updateStatus->setText(s);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onSetDcDownloadProgress(int v) {
 | 
				
			||||||
 | 
					    ui->updateProgress->setValue(v);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowTariffUpdate(QString) {
 | 
				
			||||||
 | 
					    return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ui->exit->setEnabled(false);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString s = ui->stepLabel->text();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString tmp("Install tariff files ");
 | 
				
			||||||
 | 
					    int len = m_showLineLength - tmp.length();
 | 
				
			||||||
 | 
					    while (--len > 0) {
 | 
				
			||||||
 | 
					       tmp += " ";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    s += QString("%1 <font color='Green'>[OK  ]</font><br />").arg(tmp);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(s);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowISMASConnectivity(QString status) {
 | 
				
			||||||
 | 
					    // qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString stepResult;
 | 
				
			||||||
 | 
					    QString s = m_updateSteps[CHECK_BACKEND_CONNECTION].trimmed();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool const custRepoExists = internal::customerRepoExists();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (status.contains(UpdateCommand::ISMAS_CONNECTED, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        if (custRepoExists) {
 | 
				
			||||||
 | 
					            s += " <font color='Green'>connected</font>";
 | 
				
			||||||
 | 
					            stepResult = "ISMAS connected";
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            s += " <font color='Green'>connected (initial configuration)</font>";
 | 
				
			||||||
 | 
					            stepResult = "ISMAS connected (initial configuration)";
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if (status.contains(UpdateCommand::NO_CUSTOMER_REPOSITORY, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += " <font color='Blue'>NOT CONNECTED</font>";
 | 
				
			||||||
 | 
					        stepResult = "ISMAS not connected";
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if (status.contains(UpdateCommand::ISMAS_CONNECTION_IN_PROGRESS, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += " <font color='Green'>connecting</font>";
 | 
				
			||||||
 | 
					        stepResult = "connecting ISMAS";
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if (status.contains(UpdateCommand::ISMAS_NOT_CONNECTED, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        if (custRepoExists) {
 | 
				
			||||||
 | 
					            s += " <font color='Red'>NOT CONNECTED. STOP</font>";
 | 
				
			||||||
 | 
					            stepResult = "ISMAS not connected";
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            s += " <font color='Red'>not connected. (initial configuration)</font>";
 | 
				
			||||||
 | 
					            stepResult = "ISMAS not connected (initial configuration)";
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        s += " <font color='Red'>UNKNOWN STATUS</font>";
 | 
				
			||||||
 | 
					        stepResult = "unknown status";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    struct LogLineEntry logLine =
 | 
				
			||||||
 | 
					        initLogLineEntry(1, // receiver
 | 
				
			||||||
 | 
					                         QDateTime::currentDateTime().toString(Qt::ISODate).toUtf8().constData(),
 | 
				
			||||||
 | 
					                         _ISMAS_CONTINUE,
 | 
				
			||||||
 | 
					                         0, // eventState
 | 
				
			||||||
 | 
					                         CHECK_ISMAS_CONNECT_PERCENT_START,
 | 
				
			||||||
 | 
					                         ISMAS::RESULT_CODE::E_SUCCESS,
 | 
				
			||||||
 | 
					                         "show ISMAS connectivity", // step
 | 
				
			||||||
 | 
					                         stepResult.toUtf8().constData()); // stepResult
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int w = 0;
 | 
				
			||||||
 | 
					    if ((w = m_updateLog.write((char *)(&logLine), sizeof(logLine))) != sizeof(logLine)) {
 | 
				
			||||||
 | 
					        qCritical() << __func__ << ":" << __LINE__ << "ERROR only" << w << "bytes written";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_updateSteps[CHECK_BACKEND_CONNECTION] = s;
 | 
				
			||||||
 | 
					    s.clear();
 | 
				
			||||||
 | 
					    for (int i = 0; i < m_updateSteps.size(); ++i) {
 | 
				
			||||||
 | 
					        s += m_updateSteps[i] + "<br />";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(s);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    logLine =
 | 
				
			||||||
 | 
					        initLogLineEntry(1, // receiver
 | 
				
			||||||
 | 
					                         QDateTime::currentDateTime().toString(Qt::ISODate).toUtf8().constData(),
 | 
				
			||||||
 | 
					                         _ISMAS_CONTINUE,
 | 
				
			||||||
 | 
					                         0, // eventState
 | 
				
			||||||
 | 
					                         CHECK_ISMAS_CONNECT_PERCENT_END,
 | 
				
			||||||
 | 
					                         ISMAS::RESULT_CODE::E_SUCCESS,
 | 
				
			||||||
 | 
					                         "show ISMAS connectivity", // step
 | 
				
			||||||
 | 
					                         stepResult.toUtf8().constData()); // stepResult
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if ((w = m_updateLog.write((char *)(&logLine), sizeof(logLine))) != sizeof(logLine)) {
 | 
				
			||||||
 | 
					        qCritical() << __func__ << ":" << __LINE__ << "ERROR only" << w << "bytes written";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowCustRepoStatus(QString status) {
 | 
				
			||||||
 | 
					    // qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString s = m_updateSteps[UPDATE_CUSTOMER_REPOSITORY].trimmed();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (status.contains(internal::GIT_CUSTOMER_REPO_UP_TO_DATE, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += QString(" <font color='Green'>%1</font>").arg(internal::GIT_CUSTOMER_REPO_UP_TO_DATE);
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if (status.contains(internal::GIT_CUSTOMER_REPO_NOT_NECESSARY, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += QString(" <font color='Green'>%1</font>").arg(internal::GIT_CUSTOMER_REPO_NOT_NECESSARY);
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        s += " <font color='Red'>UNKNOWN STATUS</font>";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_updateSteps[UPDATE_CUSTOMER_REPOSITORY] = s;
 | 
				
			||||||
 | 
					    s.clear();
 | 
				
			||||||
 | 
					    for (int i = 0; i < m_updateSteps.size(); ++i) {
 | 
				
			||||||
 | 
					        s += m_updateSteps[i] + "<br />";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(s);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowExecOpkgStatus(QString status) {
 | 
				
			||||||
 | 
					    qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 | 
				
			||||||
 | 
					    return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString s = ui->stepLabel->text();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString tmp = "execute opkg commands ";
 | 
				
			||||||
 | 
					    int len = m_showLineLength - tmp.length();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    while (--len > 0) {
 | 
				
			||||||
 | 
					       tmp += " ";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (status.contains(UpdateCommand::EXEC_OPKG_COMMANDS_SUCCESS, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += QString("%1 <font color='Green'>success</font><br />").arg(tmp);
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        s += QString(  "%1 <font color='Red'>UNKNOWN STATUS</font><br />").arg(tmp);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(s);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowExecOpkgCommand(QString cmd) {
 | 
				
			||||||
 | 
					    qCritical() << __func__ << ":" << __LINE__ << "cmd" << cmd;
 | 
				
			||||||
 | 
					    return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (cmd.back() != QChar('\n')) {
 | 
				
			||||||
 | 
					        cmd += "\n";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    onInsertText(cmd);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowExecOpkgOverallResult(QString status, bool noaction) {
 | 
				
			||||||
 | 
					    //qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString s = noaction ?
 | 
				
			||||||
 | 
					        m_updateSteps[INSTALL_SW_PACKETS_DRY_RUN].trimmed() :
 | 
				
			||||||
 | 
					        m_updateSteps[INSTALL_SW_PACKETS].trimmed();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (status.contains(internal::EXEC_OPKG_COMMANDS_SUCCESS, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += " <font color='Green'>success</font>";
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if (status.contains(internal::EXEC_OPKG_COMMANDS_FAIL, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += QString(" <font color='Red'>%1</font>").arg(internal::EXEC_OPKG_COMMANDS_FAIL);
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        s += " <font color='Red'>UNKNOWN STATUS</font>";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (noaction) {
 | 
				
			||||||
 | 
					        m_updateSteps[INSTALL_SW_PACKETS_DRY_RUN] = s;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        m_updateSteps[INSTALL_SW_PACKETS] = s;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    s.clear();
 | 
				
			||||||
 | 
					    for (int i = 0; i < m_updateSteps.size(); ++i) {
 | 
				
			||||||
 | 
					        s += m_updateSteps[i] + "<br />";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(s);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowDownloadDCJsonFilesStatus(QString status) {
 | 
				
			||||||
 | 
					    //qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString s = m_updateSteps[INSTALL_DC_CONFIGURATION].trimmed();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (status.contains(UpdateCommand::UPDATE_DC_JSON_FILES_SUCCESS, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += " <font color='Green'>success</font>";
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        s += " <font color='Red'>UNKNOWN STATUS</font>";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_updateSteps[INSTALL_DC_CONFIGURATION] = s;
 | 
				
			||||||
 | 
					    s.clear();
 | 
				
			||||||
 | 
					    for (int i = 0; i < m_updateSteps.size(); ++i) {
 | 
				
			||||||
 | 
					        s += m_updateSteps[i] + "<br />";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(s);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowSyncCustRepoStatus(QString status) {
 | 
				
			||||||
 | 
					    //qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString s = m_updateSteps[SYNCHRONIZE_REPOSITORY].trimmed();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (status.contains(UpdateCommand::SYNC_CUSTOMER_REPO_FILES_SUCCESS, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += " <font color='Green'>success</font>";
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        s += " <font color='Red'>UNKNOWN STATUS</font>";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_updateSteps[SYNCHRONIZE_REPOSITORY] = s;
 | 
				
			||||||
 | 
					    s.clear();
 | 
				
			||||||
 | 
					    for (int i = 0; i < m_updateSteps.size(); ++i) {
 | 
				
			||||||
 | 
					        s += m_updateSteps[i] + "<br />";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(s);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowUpdateDCFirmware(QString status) {
 | 
				
			||||||
 | 
					    // qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString s = m_updateSteps[UPDATE_DC].trimmed();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (status.contains(internal::UPDATE_DC_FIRMARE_SUCCESS, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += " <font color='Green'>success</font>";
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        s += " <font color='Red'>UNKNOWN STATUS</font>";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    s.clear();
 | 
				
			||||||
 | 
					    for (int i = 0; i < m_updateSteps.size(); ++i) {
 | 
				
			||||||
 | 
					        if (i != UPDATE_DC) {
 | 
				
			||||||
 | 
					            s += m_updateSteps[i] + "<br />";
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            s += m_updateSteps[i];
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(s);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowUpdateRequest(QString status) {
 | 
				
			||||||
 | 
					    // qCritical() << __func__ << ":" << __LINE__ << "status" << status;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    //ui->updateProgress->setValue(CHECK_UPDATE_REQUEST_PERCENT_START);
 | 
				
			||||||
 | 
					    QString s = m_updateSteps[CHECK_UPDATE_REQUEST].trimmed();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool const custRepoExists = internal::customerRepoExists();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (status.contains(UpdateCommand::UPDATE_NOT_REQUESTED, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        if (custRepoExists) {
 | 
				
			||||||
 | 
					            s += " <font color='Red'>NOT REQUESTED. STOP.</font>";
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            s += " <font color='Blue'>not requested (initial configuration)</font>";
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if (status.contains(internal::UPDATE_REQUESTED, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        if (custRepoExists) {
 | 
				
			||||||
 | 
					            s += " <font color='Green'>requested</font>";
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            s += " <font color='Blue'>requested (initial configuration)</font>";
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if (status.contains(internal::UPDATE_INITIAL, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += " <font color='Green'>requested (initial configuration)</font>";
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if (status.contains(internal::UPDATE_NOT_NECESSARY, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += " <font color='Green'>not necessary</font>";
 | 
				
			||||||
 | 
					    } else
 | 
				
			||||||
 | 
					    if (status.contains(internal::NO_CUSTOMER_REPOSITORY, Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					        s += " <font color='Blue'>UNKNOWN (ISMAS not connected)</font>";
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        s += " <font color='Red'>UNKNOWN</font>";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_updateSteps[CHECK_UPDATE_REQUEST] = s;
 | 
				
			||||||
 | 
					    s.clear();
 | 
				
			||||||
 | 
					    for (int i = 0; i < m_updateSteps.size(); ++i) {
 | 
				
			||||||
 | 
					        s += m_updateSteps[i] + "<br />";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(s);
 | 
				
			||||||
 | 
					    //ui->updateProgress->setValue(CHECK_UPDATE_REQUEST_PERCENT_END);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowISMASChecks(QString) {
 | 
				
			||||||
 | 
					    // deprecated
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString s = ui->stepLabel->text();
 | 
				
			||||||
 | 
					    return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString tmp("Check ISMAS connectivity ");
 | 
				
			||||||
 | 
					    int len = m_showLineLength - tmp.length();
 | 
				
			||||||
 | 
					    while (--len > 0) {
 | 
				
			||||||
 | 
					       tmp += " ";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    s += QString("%1 <font color='Green'>[OK  ]</font><br />").arg(tmp);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    tmp = "Check update activation ";
 | 
				
			||||||
 | 
					    len = m_showLineLength - tmp.length();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    while (--len > 0) {
 | 
				
			||||||
 | 
					       tmp += " ";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    s += QString("%1 <font color='Green'>[OK  ]</font><br />").arg(tmp);
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(s);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowJsonDownload(QString) {
 | 
				
			||||||
 | 
					    ui->exit->setEnabled(false);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString s = ui->stepLabel->text();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString tmp("Send json files to dc-hardware ");
 | 
				
			||||||
 | 
					    int len = m_showLineLength - tmp.length();
 | 
				
			||||||
 | 
					    while (--len > 0) {
 | 
				
			||||||
 | 
					       tmp += " ";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    s += QString("%1 <font color='Green'>[OK  ]</font><br />").arg(tmp);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(s);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowDcDownload(QString version) {
 | 
				
			||||||
 | 
					    return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_targetDcVersion = version;
 | 
				
			||||||
 | 
					    ui->exit->setEnabled(false);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // test
 | 
				
			||||||
 | 
					    // onShowISMASChecks("");
 | 
				
			||||||
 | 
					    onShowISMASConnectivity("connected");
 | 
				
			||||||
 | 
					    onShowUpdateRequest("activated");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    onShowTariffUpdate("");
 | 
				
			||||||
 | 
					    onShowJsonDownload("");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString s = ui->stepLabel->text();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString tmp("Send dc-firmware to dc-hardware ");
 | 
				
			||||||
 | 
					    int len = m_showLineLength - tmp.length();
 | 
				
			||||||
 | 
					    while (--len > 0) {
 | 
				
			||||||
 | 
					       tmp += " ";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    s += QString("%1 <font color='#33FF50'>[OK  ]</font> (%2)").arg(tmp).arg(version);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ui->stepLabel->setText(s);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					MainWindow::~MainWindow() {
 | 
				
			||||||
 | 
					    delete m_startTimer;
 | 
				
			||||||
 | 
					    delete m_exitTimer;
 | 
				
			||||||
 | 
					    delete m_statusTimer;
 | 
				
			||||||
 | 
					    delete ui;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::customEvent(QEvent *event) {
 | 
				
			||||||
 | 
					    if (event->type() == ProgressEvent::type()) {
 | 
				
			||||||
 | 
					        ProgressEvent *pevent = (ProgressEvent *)event;
 | 
				
			||||||
 | 
					        int const progress = pevent->progressPercent();
 | 
				
			||||||
 | 
					        QObject const *sender = pevent->sender();
 | 
				
			||||||
 | 
					        if (sender == this) {
 | 
				
			||||||
 | 
					            switch(progress) {
 | 
				
			||||||
 | 
					            case 0: {
 | 
				
			||||||
 | 
					                ui->updateProgress->reset();
 | 
				
			||||||
 | 
					            } break;
 | 
				
			||||||
 | 
					            case START_PROGRESS_LOOP: {
 | 
				
			||||||
 | 
					                m_progressRunning = true;
 | 
				
			||||||
 | 
					                ui->updateProgress->reset();
 | 
				
			||||||
 | 
					                // m_progressValue = 10;
 | 
				
			||||||
 | 
					                QApplication::postEvent(this, new ProgressEvent(this, 1));
 | 
				
			||||||
 | 
					            } break;
 | 
				
			||||||
 | 
					            case STOP_PROGRESS_LOOP: {
 | 
				
			||||||
 | 
					                m_progressRunning = false;
 | 
				
			||||||
 | 
					                // m_progressValue -= 10;
 | 
				
			||||||
 | 
					                // m_worker->setProgress(m_progressValue/10);
 | 
				
			||||||
 | 
					            } break;
 | 
				
			||||||
 | 
					            default: {
 | 
				
			||||||
 | 
					                if (m_progressRunning) {
 | 
				
			||||||
 | 
					                    // m_progressValue = progress;
 | 
				
			||||||
 | 
					                    ui->updateProgress->setValue(progress);
 | 
				
			||||||
 | 
					                    // ueberpruefen: hauptfenster schickt sich selber ein event
 | 
				
			||||||
 | 
					                    // QApplication::postEvent(this, new ProgressEvent(this, progress));
 | 
				
			||||||
 | 
					                    // QThread::msleep(500);
 | 
				
			||||||
 | 
					                }}
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else
 | 
				
			||||||
 | 
					        if (sender == m_worker) {
 | 
				
			||||||
 | 
					            switch(progress) {
 | 
				
			||||||
 | 
					            case 0: {
 | 
				
			||||||
 | 
					                ui->updateProgress->reset();
 | 
				
			||||||
 | 
					            } break;
 | 
				
			||||||
 | 
					            case START_PROGRESS_LOOP: {
 | 
				
			||||||
 | 
					                QApplication::postEvent(this, new ProgressEvent(this, START_PROGRESS_LOOP));
 | 
				
			||||||
 | 
					            } break;
 | 
				
			||||||
 | 
					            case STOP_PROGRESS_LOOP: {
 | 
				
			||||||
 | 
					                QApplication::postEvent(this, new ProgressEvent(this, STOP_PROGRESS_LOOP));
 | 
				
			||||||
 | 
					            } break;
 | 
				
			||||||
 | 
					            default:{
 | 
				
			||||||
 | 
					                ui->updateProgress->setValue(progress);
 | 
				
			||||||
 | 
					            }}
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            qCritical() << "!!! UNKNOWN SENDER !!!";
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QThread::yieldCurrentThread();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onStopStartTimer() {
 | 
				
			||||||
 | 
					    m_startTimer->stop();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onDisableExit() {
 | 
				
			||||||
 | 
					   ui->exit->setEnabled(false);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onEnableExit() {
 | 
				
			||||||
 | 
					   ui->exit->setEnabled(true);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onRestartExitTimer() {
 | 
				
			||||||
 | 
					    m_exitTimer->stop();
 | 
				
			||||||
 | 
					    m_exitTimer->start(5 * 1000);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    scrollDownTextEdit();
 | 
				
			||||||
 | 
					    ui->updateStatus->setEnabled(false);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onQuit() {
 | 
				
			||||||
 | 
					    m_exitTimer->stop();
 | 
				
			||||||
 | 
					    int errorCode = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qCritical()
 | 
				
			||||||
 | 
					        << QString("ON QUIT: CURRENT STEP %1")
 | 
				
			||||||
 | 
					            .arg(m_worker->getSmap()[m_worker->currentStep()]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // TODO: replace SEND_LAST_VERSION with UPDATE_SUCCEEDED
 | 
				
			||||||
 | 
					    if (m_worker->currentStep() != Worker::UPDATE_STEP::SEND_LAST_VERSION) {
 | 
				
			||||||
 | 
					        errorCode = -1;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    qCritical() << QString("ON QUIT: EXIT CODE %1").arg(errorCode);
 | 
				
			||||||
 | 
					    qApp->exit(errorCode);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::scrollDownTextEdit() {
 | 
				
			||||||
 | 
					    // Utils::printInfoMsg(QString("SCROLL-DOWN-TEXT_EDIT CALLED AT ")
 | 
				
			||||||
 | 
					    //    + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ui->updateStatus->setEnabled(true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QTextCursor tmpCursor = ui->updateStatus->textCursor();
 | 
				
			||||||
 | 
					    tmpCursor.movePosition(QTextCursor::End);
 | 
				
			||||||
 | 
					    ui->updateStatus->setTextCursor(tmpCursor);
 | 
				
			||||||
 | 
					    ui->updateStatus->ensureCursorVisible();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onInsertText(QString text) {
 | 
				
			||||||
 | 
					    scrollDownTextEdit();
 | 
				
			||||||
 | 
					    ui->updateStatus->textCursor().insertText(text);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onAppendText(QString text, QString suffix) {
 | 
				
			||||||
 | 
					    // Utils::printInfoMsg(QString("ON APPEND CALLED AT ")
 | 
				
			||||||
 | 
					    //    + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString editText = ui->updateStatus->toPlainText();
 | 
				
			||||||
 | 
					    scrollDownTextEdit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!suffix.isNull() && suffix.size() > 0) {
 | 
				
			||||||
 | 
					        //qInfo() << "TEXT" << text << "SUFFIX" << suffix;
 | 
				
			||||||
 | 
					        if (suffix == Worker::UPDATE_STEP_SUCCESS || suffix == Worker::UPDATE_STEP_FAIL) {
 | 
				
			||||||
 | 
					            ui->updateStatus->insertPlainText(QString("\n").leftJustified(m_width-3, '=') + " ");
 | 
				
			||||||
 | 
					            // editText += QString("\n").leftJustified(m_width-3, '=');
 | 
				
			||||||
 | 
					            // editText += " ";
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        QString const &add = (QString("\n") + text).leftJustified(m_width - (2 + suffix.size())) + suffix;
 | 
				
			||||||
 | 
					        ui->updateStatus->insertPlainText(add);
 | 
				
			||||||
 | 
					        // editText += add;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        QString const &add = text.leftJustified(m_width-9);
 | 
				
			||||||
 | 
					        ui->updateStatus->insertPlainText(add);
 | 
				
			||||||
 | 
					        //editText += add;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // debug
 | 
				
			||||||
 | 
					    // QString editText = ui->updateStatus->toPlainText();
 | 
				
			||||||
 | 
					    // Utils::printLineEditInfo(editText.split('\n', QString::SplitBehavior::SkipEmptyParts));
 | 
				
			||||||
 | 
					    // ui->updateStatus->setText(editText.trimmed());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    scrollDownTextEdit();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onReplaceLast(QStringList newTextLines, QString suffix) {
 | 
				
			||||||
 | 
					    // Utils::printInfoMsg(QString("ON REPLACE LAST (LIST) CALLED AT ")
 | 
				
			||||||
 | 
					    //    + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
 | 
				
			||||||
 | 
					    int const s = newTextLines.size();
 | 
				
			||||||
 | 
					    if (s > 0) {
 | 
				
			||||||
 | 
					        QString editText = ui->updateStatus->toPlainText();
 | 
				
			||||||
 | 
					        QStringList lines = editText.split('\n', QString::SplitBehavior::SkipEmptyParts);
 | 
				
			||||||
 | 
					        QString newText;
 | 
				
			||||||
 | 
					        if (lines.size() >= s) {
 | 
				
			||||||
 | 
					            for (int i = 0; i < s; ++i) {
 | 
				
			||||||
 | 
					                lines.removeLast();
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            if (lines.size() > 0) {
 | 
				
			||||||
 | 
					                newText = lines.join('\n');
 | 
				
			||||||
 | 
					                newText += '\n';
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            QStringList newLines;
 | 
				
			||||||
 | 
					            for (int i = 0; i < s; ++i) {
 | 
				
			||||||
 | 
					                if (i == 0 && !suffix.isNull() && suffix.size() > 0 && suffix != "\n") {
 | 
				
			||||||
 | 
					                    newLines += Utils::rstrip(newTextLines.at(i).leftJustified(m_width-10) + suffix);
 | 
				
			||||||
 | 
					                } else {
 | 
				
			||||||
 | 
					                    newLines += Utils::rstrip(newTextLines.at(i).leftJustified(m_width-10));
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            lines += newLines;
 | 
				
			||||||
 | 
					            newText += newLines.join(' ');
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        ui->updateStatus->setText(newText);
 | 
				
			||||||
 | 
					        Utils::printLineEditInfo(lines);
 | 
				
			||||||
 | 
					        scrollDownTextEdit();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onReplaceLast(QString text, QString suffix) {
 | 
				
			||||||
 | 
					    // Utils::printInfoMsg(QString("ON REPLACE LAST (TEXT) CALLED AT ")
 | 
				
			||||||
 | 
					    //    + QDateTime::currentDateTime().toString(Qt::ISODateWithMs));
 | 
				
			||||||
 | 
					    QString editText = ui->updateStatus->toPlainText();
 | 
				
			||||||
 | 
					    QStringList lines = editText.split('\n', QString::SplitBehavior::SkipEmptyParts);
 | 
				
			||||||
 | 
					    if (lines.size() > 0) {
 | 
				
			||||||
 | 
					        // removing the last line is really meant for refreshing the last line
 | 
				
			||||||
 | 
					        // with a string very similar than the original one, typically only
 | 
				
			||||||
 | 
					        // followed by a suffix.
 | 
				
			||||||
 | 
					        if (lines.last().contains(text)) {
 | 
				
			||||||
 | 
					            lines.removeLast();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        if (!suffix.isNull() && suffix.size() > 0 && suffix != "\n") {
 | 
				
			||||||
 | 
					            QString const add = text.leftJustified(m_width-10) + suffix;
 | 
				
			||||||
 | 
					            if (!add.isEmpty()) {
 | 
				
			||||||
 | 
					                lines += text.leftJustified(m_width-10) + suffix;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            QString const add = text.leftJustified(m_width-10);
 | 
				
			||||||
 | 
					            if (!add.isEmpty()) {
 | 
				
			||||||
 | 
					                lines += text.leftJustified(m_width-10);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Utils::printLineEditInfo(lines);
 | 
				
			||||||
 | 
					    ui->updateStatus->setText(lines.join('\n').trimmed());
 | 
				
			||||||
 | 
					    scrollDownTextEdit();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowMessage(QString title, QString text) {
 | 
				
			||||||
 | 
					    this->statusBar()->clearMessage();
 | 
				
			||||||
 | 
					    this->statusBar()->showMessage( // timeout: 10000
 | 
				
			||||||
 | 
					        QString(title + " " + text).leftJustified(80, ' '), 10000);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowErrorMessage(QString title, QString text) {
 | 
				
			||||||
 | 
					    onShowMessage(title, text);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowStatusMessage(QString title, QString text) {
 | 
				
			||||||
 | 
					    onShowMessage(title, text);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowErrorMessage(QStringList lst) {
 | 
				
			||||||
 | 
					    if (lst.size() >= 2) {
 | 
				
			||||||
 | 
					        onShowMessage(lst.at(0), lst.at(1));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (lst.size() == 1) {
 | 
				
			||||||
 | 
					        onShowMessage(lst.at(0), "");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void MainWindow::onShowStatusMessage(QStringList lst) {
 | 
				
			||||||
 | 
					    if (lst.size() >= 2) {
 | 
				
			||||||
 | 
					        onShowMessage(lst.at(0), lst.at(1));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (lst.size() == 1) {
 | 
				
			||||||
 | 
					        onShowMessage(lst.at(0), "");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -4,6 +4,9 @@
 | 
				
			|||||||
#include <QMainWindow>
 | 
					#include <QMainWindow>
 | 
				
			||||||
#include <QTimer>
 | 
					#include <QTimer>
 | 
				
			||||||
#include <QStatusBar>
 | 
					#include <QStatusBar>
 | 
				
			||||||
 | 
					#include <QVector>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QProgressBar>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QT_BEGIN_NAMESPACE
 | 
					QT_BEGIN_NAMESPACE
 | 
				
			||||||
namespace Ui { class MainWindow; }
 | 
					namespace Ui { class MainWindow; }
 | 
				
			||||||
@@ -36,8 +39,12 @@ public:
 | 
				
			|||||||
    UpdateDcEvent::UpdateStep updateStep() const { return m_updateStep; }
 | 
					    UpdateDcEvent::UpdateStep updateStep() const { return m_updateStep; }
 | 
				
			||||||
    void setUpdateStep(UpdateDcEvent::UpdateStep updateStep) { m_updateStep = updateStep; }
 | 
					    void setUpdateStep(UpdateDcEvent::UpdateStep updateStep) { m_updateStep = updateStep; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString targetDcVersion() {return  m_targetDcVersion; }
 | 
				
			||||||
 | 
					    QProgressBar *progressBar();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public slots:
 | 
					public slots:
 | 
				
			||||||
    void onAppendText(QString, QString suffix = "");
 | 
					    void onAppendText(QString, QString suffix = "");
 | 
				
			||||||
 | 
					    void onInsertText(QString);
 | 
				
			||||||
    void onReplaceLast(QStringList, QString suffix = "");
 | 
					    void onReplaceLast(QStringList, QString suffix = "");
 | 
				
			||||||
    void onReplaceLast(QString, QString suffix = "");
 | 
					    void onReplaceLast(QString, QString suffix = "");
 | 
				
			||||||
    void onShowErrorMessage(QString, QString);
 | 
					    void onShowErrorMessage(QString, QString);
 | 
				
			||||||
@@ -48,6 +55,23 @@ public slots:
 | 
				
			|||||||
    void onRestartExitTimer();
 | 
					    void onRestartExitTimer();
 | 
				
			||||||
    void onEnableExit();
 | 
					    void onEnableExit();
 | 
				
			||||||
    void onDisableExit();
 | 
					    void onDisableExit();
 | 
				
			||||||
 | 
					    void onShowDcDownload(QString);
 | 
				
			||||||
 | 
					    void onShowJsonDownload(QString);
 | 
				
			||||||
 | 
					    void onShowTariffUpdate(QString);
 | 
				
			||||||
 | 
					    void onShowISMASChecks(QString);
 | 
				
			||||||
 | 
					    void onShowISMASConnectivity(QString);
 | 
				
			||||||
 | 
					    void onShowUpdateRequest(QString);
 | 
				
			||||||
 | 
					    void onShowCustRepoStatus(QString);
 | 
				
			||||||
 | 
					    void onShowExecOpkgStatus(QString);
 | 
				
			||||||
 | 
					    void onShowExecOpkgCommand(QString);
 | 
				
			||||||
 | 
					    void onShowExecOpkgOverallResult(QString,bool);
 | 
				
			||||||
 | 
					    void onShowDownloadDCJsonFilesStatus(QString);
 | 
				
			||||||
 | 
					    void onShowSyncCustRepoStatus(QString);
 | 
				
			||||||
 | 
					    void onShowUpdateDCFirmware(QString);
 | 
				
			||||||
 | 
					    void onSetDcDownloadProgress(int);
 | 
				
			||||||
 | 
					    void onShowSummary(QString);
 | 
				
			||||||
 | 
					    void onSummary();
 | 
				
			||||||
 | 
					    void onFileChanged(QString const&);
 | 
				
			||||||
#if EMERGENCY_LEAVE_BL==1
 | 
					#if EMERGENCY_LEAVE_BL==1
 | 
				
			||||||
    void emergencyLeaveBL();
 | 
					    void emergencyLeaveBL();
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
@@ -62,6 +86,9 @@ private slots:
 | 
				
			|||||||
    void onQuit();
 | 
					    void onQuit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
private:
 | 
					private:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int const m_showLineLength = 37;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    void scrollDownTextEdit();
 | 
					    void scrollDownTextEdit();
 | 
				
			||||||
    void onShowMessage(QString, QString);
 | 
					    void onShowMessage(QString, QString);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -73,5 +100,12 @@ private:
 | 
				
			|||||||
    bool m_progressRunning;
 | 
					    bool m_progressRunning;
 | 
				
			||||||
    //int m_progressValue;
 | 
					    //int m_progressValue;
 | 
				
			||||||
    UpdateDcEvent::UpdateStep m_updateStep;
 | 
					    UpdateDcEvent::UpdateStep m_updateStep;
 | 
				
			||||||
 | 
					    QTimer *m_statusTimer;
 | 
				
			||||||
 | 
					    QString m_targetDcVersion;
 | 
				
			||||||
 | 
					    int m_stepLabelChopCount{};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QVector<QString> m_updateSteps{};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QFile m_updateLog;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
#endif // MAINWINDOW_H
 | 
					#endif // MAINWINDOW_H
 | 
				
			||||||
							
								
								
									
										133
									
								
								UpdatePTUDevCtrl/mainwindow.ui
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										133
									
								
								UpdatePTUDevCtrl/mainwindow.ui
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,133 @@
 | 
				
			|||||||
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
 | 
					<ui version="4.0">
 | 
				
			||||||
 | 
					 <class>MainWindow</class>
 | 
				
			||||||
 | 
					 <widget class="QMainWindow" name="MainWindow">
 | 
				
			||||||
 | 
					  <property name="geometry">
 | 
				
			||||||
 | 
					   <rect>
 | 
				
			||||||
 | 
					    <x>0</x>
 | 
				
			||||||
 | 
					    <y>0</y>
 | 
				
			||||||
 | 
					    <width>800</width>
 | 
				
			||||||
 | 
					    <height>480</height>
 | 
				
			||||||
 | 
					   </rect>
 | 
				
			||||||
 | 
					  </property>
 | 
				
			||||||
 | 
					  <property name="font">
 | 
				
			||||||
 | 
					   <font>
 | 
				
			||||||
 | 
					    <family>Misc Fixed</family>
 | 
				
			||||||
 | 
					    <pointsize>11</pointsize>
 | 
				
			||||||
 | 
					    <weight>75</weight>
 | 
				
			||||||
 | 
					    <bold>true</bold>
 | 
				
			||||||
 | 
					   </font>
 | 
				
			||||||
 | 
					  </property>
 | 
				
			||||||
 | 
					  <property name="windowTitle">
 | 
				
			||||||
 | 
					   <string>MainWindow</string>
 | 
				
			||||||
 | 
					  </property>
 | 
				
			||||||
 | 
					  <widget class="QWidget" name="centralwidget">
 | 
				
			||||||
 | 
					   <widget class="QWidget" name="layoutWidget">
 | 
				
			||||||
 | 
					    <property name="geometry">
 | 
				
			||||||
 | 
					     <rect>
 | 
				
			||||||
 | 
					      <x>10</x>
 | 
				
			||||||
 | 
					      <y>10</y>
 | 
				
			||||||
 | 
					      <width>781</width>
 | 
				
			||||||
 | 
					      <height>441</height>
 | 
				
			||||||
 | 
					     </rect>
 | 
				
			||||||
 | 
					    </property>
 | 
				
			||||||
 | 
					    <layout class="QGridLayout" name="gridLayout">
 | 
				
			||||||
 | 
					     <item row="2" column="0" colspan="3">
 | 
				
			||||||
 | 
					      <widget class="QLabel" name="stepLabel">
 | 
				
			||||||
 | 
					       <property name="minimumSize">
 | 
				
			||||||
 | 
					        <size>
 | 
				
			||||||
 | 
					         <width>0</width>
 | 
				
			||||||
 | 
					         <height>18</height>
 | 
				
			||||||
 | 
					        </size>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					       <property name="font">
 | 
				
			||||||
 | 
					        <font>
 | 
				
			||||||
 | 
					         <family>Misc Fixed</family>
 | 
				
			||||||
 | 
					         <pointsize>11</pointsize>
 | 
				
			||||||
 | 
					         <weight>75</weight>
 | 
				
			||||||
 | 
					         <bold>true</bold>
 | 
				
			||||||
 | 
					        </font>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					       <property name="text">
 | 
				
			||||||
 | 
					        <string/>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					       <property name="textFormat">
 | 
				
			||||||
 | 
					        <enum>Qt::RichText</enum>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					      </widget>
 | 
				
			||||||
 | 
					     </item>
 | 
				
			||||||
 | 
					     <item row="3" column="0" colspan="3">
 | 
				
			||||||
 | 
					      <widget class="QTextEdit" name="updateStatus">
 | 
				
			||||||
 | 
					       <property name="enabled">
 | 
				
			||||||
 | 
					        <bool>true</bool>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					       <property name="font">
 | 
				
			||||||
 | 
					        <font>
 | 
				
			||||||
 | 
					         <family>Misc Fixed</family>
 | 
				
			||||||
 | 
					         <pointsize>11</pointsize>
 | 
				
			||||||
 | 
					         <weight>75</weight>
 | 
				
			||||||
 | 
					         <bold>true</bold>
 | 
				
			||||||
 | 
					        </font>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					       <property name="focusPolicy">
 | 
				
			||||||
 | 
					        <enum>Qt::NoFocus</enum>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					       <property name="frameShape">
 | 
				
			||||||
 | 
					        <enum>QFrame::WinPanel</enum>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					       <property name="verticalScrollBarPolicy">
 | 
				
			||||||
 | 
					        <enum>Qt::ScrollBarAsNeeded</enum>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					       <property name="horizontalScrollBarPolicy">
 | 
				
			||||||
 | 
					        <enum>Qt::ScrollBarAsNeeded</enum>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					       <property name="sizeAdjustPolicy">
 | 
				
			||||||
 | 
					        <enum>QAbstractScrollArea::AdjustToContents</enum>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					       <property name="undoRedoEnabled">
 | 
				
			||||||
 | 
					        <bool>false</bool>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					      </widget>
 | 
				
			||||||
 | 
					     </item>
 | 
				
			||||||
 | 
					     <item row="0" column="0" rowspan="2" colspan="3">
 | 
				
			||||||
 | 
					      <widget class="QLabel" name="updateLabel">
 | 
				
			||||||
 | 
					       <property name="minimumSize">
 | 
				
			||||||
 | 
					        <size>
 | 
				
			||||||
 | 
					         <width>0</width>
 | 
				
			||||||
 | 
					         <height>100</height>
 | 
				
			||||||
 | 
					        </size>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					       <property name="font">
 | 
				
			||||||
 | 
					        <font>
 | 
				
			||||||
 | 
					         <family>Misc Fixed</family>
 | 
				
			||||||
 | 
					         <pointsize>11</pointsize>
 | 
				
			||||||
 | 
					         <weight>75</weight>
 | 
				
			||||||
 | 
					         <bold>true</bold>
 | 
				
			||||||
 | 
					        </font>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					       <property name="text">
 | 
				
			||||||
 | 
					        <string/>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					      </widget>
 | 
				
			||||||
 | 
					     </item>
 | 
				
			||||||
 | 
					     <item row="4" column="0" colspan="2">
 | 
				
			||||||
 | 
					      <widget class="QProgressBar" name="updateProgress">
 | 
				
			||||||
 | 
					       <property name="value">
 | 
				
			||||||
 | 
					        <number>1</number>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					      </widget>
 | 
				
			||||||
 | 
					     </item>
 | 
				
			||||||
 | 
					     <item row="4" column="2">
 | 
				
			||||||
 | 
					      <widget class="QPushButton" name="exit">
 | 
				
			||||||
 | 
					       <property name="text">
 | 
				
			||||||
 | 
					        <string>Exit</string>
 | 
				
			||||||
 | 
					       </property>
 | 
				
			||||||
 | 
					      </widget>
 | 
				
			||||||
 | 
					     </item>
 | 
				
			||||||
 | 
					    </layout>
 | 
				
			||||||
 | 
					   </widget>
 | 
				
			||||||
 | 
					  </widget>
 | 
				
			||||||
 | 
					 </widget>
 | 
				
			||||||
 | 
					 <resources/>
 | 
				
			||||||
 | 
					 <connections/>
 | 
				
			||||||
 | 
					</ui>
 | 
				
			||||||
							
								
								
									
										97
									
								
								UpdatePTUDevCtrl/message_handler.cpp
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										97
									
								
								UpdatePTUDevCtrl/message_handler.cpp
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,97 @@
 | 
				
			|||||||
 | 
					#include "message_handler.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <cstring>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QFileInfo>
 | 
				
			||||||
 | 
					#include <QMessageLogContext>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static char const *DBG_NAME[] = { "DBG  ", "WARN ", "CRIT ", "FATAL", "INFO " };
 | 
				
			||||||
 | 
					static bool installedMsgHandler = false;
 | 
				
			||||||
 | 
					static int debugLevel = LOG_NOTICE;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int getDebugLevel() { return debugLevel; }
 | 
				
			||||||
 | 
					void setDebugLevel(int newDebugLevel) {
 | 
				
			||||||
 | 
					    debugLevel = newDebugLevel;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool messageHandlerInstalled() {
 | 
				
			||||||
 | 
					    return installedMsgHandler;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
 | 
				
			||||||
 | 
					    installedMsgHandler = (handler != 0);
 | 
				
			||||||
 | 
					    static QtMessageHandler prevHandler = nullptr;
 | 
				
			||||||
 | 
					    if (handler) {
 | 
				
			||||||
 | 
					        prevHandler = qInstallMessageHandler(handler);
 | 
				
			||||||
 | 
					        return prevHandler;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        return qInstallMessageHandler(prevHandler);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					/// \brief Print message according to given debug level.
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					/// \note Install this function using qInstallMsgHandler().
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					///  int main(int argc, char **argv) {
 | 
				
			||||||
 | 
					///     installMsgHandler(atbDebugOutput);
 | 
				
			||||||
 | 
					///     QApplication app(argc, argv);
 | 
				
			||||||
 | 
					///     ...
 | 
				
			||||||
 | 
					///     return app.exec();
 | 
				
			||||||
 | 
					///  }
 | 
				
			||||||
 | 
					///
 | 
				
			||||||
 | 
					#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
 | 
				
			||||||
 | 
					    Q_UNUSED(context);
 | 
				
			||||||
 | 
					    QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    switch (debugLevel) {
 | 
				
			||||||
 | 
					        case LOG_DEBUG: { // debug-level message
 | 
				
			||||||
 | 
					            syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_INFO: { // informational message
 | 
				
			||||||
 | 
					            if (type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_NOTICE: { // normal, but significant, condition
 | 
				
			||||||
 | 
					            if (type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_WARNING: { // warning conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_ERR: { // error conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_CRIT: { // critical conditions
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_ALERT: { // action must be taken immediately
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        case LOG_EMERG: { // system is unusable
 | 
				
			||||||
 | 
					            if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
 | 
				
			||||||
 | 
					                syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } break;
 | 
				
			||||||
 | 
					        default: {
 | 
				
			||||||
 | 
					            //fprintf(stderr, "%s No ErrorLevel defined! %s\n",
 | 
				
			||||||
 | 
					            //    datetime.toStdString().c_str(), msg.toStdString().c_str());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
							
								
								
									
										23
									
								
								UpdatePTUDevCtrl/message_handler.h
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										23
									
								
								UpdatePTUDevCtrl/message_handler.h
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,23 @@
 | 
				
			|||||||
 | 
					#ifndef MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
 | 
					#define MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QtGlobal>
 | 
				
			||||||
 | 
					#ifdef __linux__
 | 
				
			||||||
 | 
					#include <syslog.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int getDebugLevel();
 | 
				
			||||||
 | 
					void setDebugLevel(int newDebugLevel);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool messageHandlerInstalled();
 | 
				
			||||||
 | 
					QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 | 
				
			||||||
 | 
					// typedef void (*QtMessageHandler)(QtMsgType, const char *);
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const char *msg);
 | 
				
			||||||
 | 
					#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 | 
				
			||||||
 | 
					// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
 | 
				
			||||||
 | 
					void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // MESSAGE_HANDLER_H_INCLUDED
 | 
				
			||||||
@@ -0,0 +1,63 @@
 | 
				
			|||||||
 | 
					#include "process/check_and_fetch_customer_repository_command.h"
 | 
				
			||||||
 | 
					#include "worker.h"
 | 
				
			||||||
 | 
					#include "utils_internal.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CheckAndFetchCustomerRepositoryCommand::CheckAndFetchCustomerRepositoryCommand(
 | 
				
			||||||
 | 
					    QString const &command, Worker *worker, int nextCommandIndex,
 | 
				
			||||||
 | 
					        int start_timeout, int finish_timeout)
 | 
				
			||||||
 | 
					  : UpdateCommand(command, worker, nextCommandIndex, start_timeout, finish_timeout) {
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void CheckAndFetchCustomerRepositoryCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
 | 
				
			||||||
 | 
					    qCritical() << __func__ << ":" << __LINE__ << command() << exitCode << exitStatus;
 | 
				
			||||||
 | 
					    Worker *w = worker();
 | 
				
			||||||
 | 
					    if (w) {
 | 
				
			||||||
 | 
					        switch (exitCode) {
 | 
				
			||||||
 | 
					        case internal::GIT_CHECKOUT_ERROR_CODE:
 | 
				
			||||||
 | 
					            emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_CHECKOUT_ERROR);
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case internal::GIT_PULL_ERROR_CODE:
 | 
				
			||||||
 | 
					            emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_PULL_ERROR);
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case internal::GIT_NOT_NECESSARY_CODE:
 | 
				
			||||||
 | 
					            emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_NOT_NECESSARY);
 | 
				
			||||||
 | 
					            exitCode = 0;
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case internal::GIT_UPDATED_CODE:
 | 
				
			||||||
 | 
					            emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_UPDATED);
 | 
				
			||||||
 | 
					            exitCode = 0;
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case 0:
 | 
				
			||||||
 | 
					            emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_UP_TO_DATE);
 | 
				
			||||||
 | 
					        default:;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return UpdateCommand::finished(exitCode, exitStatus);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void CheckAndFetchCustomerRepositoryCommand::readyReadStandardOutput() {
 | 
				
			||||||
 | 
					    QProcess *p = (QProcess *)sender();
 | 
				
			||||||
 | 
					    if (p) {
 | 
				
			||||||
 | 
					        Worker *w = worker();
 | 
				
			||||||
 | 
					        if (w) {
 | 
				
			||||||
 | 
					            QString s = p->readAllStandardOutput().trimmed();
 | 
				
			||||||
 | 
					            m_commandResult += s;
 | 
				
			||||||
 | 
					            if (m_commandResult.contains(internal::GIT_CUSTOMER_REPO_NO_UPDATE_NECESSARY)) {
 | 
				
			||||||
 | 
					                //emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_NOT_NECESSARY);
 | 
				
			||||||
 | 
					                m_commandResult.clear();
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if (m_commandResult.contains(internal::GIT_CUSTOMER_REPO_UPDATED)) {
 | 
				
			||||||
 | 
					                //emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_UPDATED);
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if (m_commandResult.contains(internal::GIT_CUSTOMER_REPO_CLONED)) {
 | 
				
			||||||
 | 
					                //emit w->showCustRepoStatus(internal::GIT_CUSTOMER_REPO_CLONED);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // static constexpr const char *GIT_CUSTOMER_REPO_UP_TO_DATE{"up to date"};
 | 
				
			||||||
 | 
					    //        emit w->showCustRepoStatus(UpdateCommand::GIT_CUSTOMER_REPO_UP_TO_DATE);
 | 
				
			||||||
 | 
					    //    }
 | 
				
			||||||
 | 
					    //}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -0,0 +1,19 @@
 | 
				
			|||||||
 | 
					#ifndef CHECK_AND_FETCH_CUSTOMER_REPOSITORY_COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					#define CHECK_AND_FETCH_CUSTOMER_REPOSITORY_COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "update_command.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class CheckAndFetchCustomerRepositoryCommand : public UpdateCommand {
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    explicit CheckAndFetchCustomerRepositoryCommand(QString const &command,
 | 
				
			||||||
 | 
					                                                    Worker *worker,
 | 
				
			||||||
 | 
					                                                    int nextCommandIndex,
 | 
				
			||||||
 | 
					                                                    int start_timeout = 100000,
 | 
				
			||||||
 | 
					                                                    int finish_timeout = 100000);
 | 
				
			||||||
 | 
					    QString m_commandResult{};
 | 
				
			||||||
 | 
					public slots:
 | 
				
			||||||
 | 
					    virtual void readyReadStandardOutput() override;
 | 
				
			||||||
 | 
					    virtual void finished(int exitCode, QProcess::ExitStatus exitStatus) override;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // CHECK_AND_FETCH_CUSTOMER_REPOSITORY_COMMAND_H_INCLUDED
 | 
				
			||||||
@@ -0,0 +1,38 @@
 | 
				
			|||||||
 | 
					#include "process/check_ismas_connectivity_command.h"
 | 
				
			||||||
 | 
					#include "worker.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CheckIsmasConnectivityCommand::CheckIsmasConnectivityCommand(QString const &command,
 | 
				
			||||||
 | 
					                                                             Worker *worker,
 | 
				
			||||||
 | 
					                                                             int nextCommandIndex,
 | 
				
			||||||
 | 
					                                                             int start_timeout,
 | 
				
			||||||
 | 
					                                                             int finish_timeout)
 | 
				
			||||||
 | 
					  : UpdateCommand(command, worker, nextCommandIndex, start_timeout, finish_timeout) {
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void CheckIsmasConnectivityCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
 | 
				
			||||||
 | 
					    return UpdateCommand::finished(exitCode, exitStatus);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void CheckIsmasConnectivityCommand::readyReadStandardOutput() {
 | 
				
			||||||
 | 
					    QProcess *p = (QProcess *)sender();
 | 
				
			||||||
 | 
					    if (p) {
 | 
				
			||||||
 | 
					        Worker *w = worker();
 | 
				
			||||||
 | 
					        if (w) {
 | 
				
			||||||
 | 
					            QString s = p->readAllStandardOutput().trimmed();
 | 
				
			||||||
 | 
					            if (s == UpdateCommand::ISMAS_CONNECTED) {
 | 
				
			||||||
 | 
					                emit w->showISMASConnectivity(UpdateCommand::ISMAS_CONNECTED);
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if (s == UpdateCommand::NO_CUSTOMER_REPOSITORY) {
 | 
				
			||||||
 | 
					                emit w->showISMASConnectivity(UpdateCommand::NO_CUSTOMER_REPOSITORY);
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if (s == UpdateCommand::ISMAS_NOT_CONNECTED) {
 | 
				
			||||||
 | 
					                emit w->showISMASConnectivity(UpdateCommand::ISMAS_NOT_CONNECTED);
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if (s == UpdateCommand::ISMAS_CONNECTION_IN_PROGRESS) {
 | 
				
			||||||
 | 
					                emit w->showISMASConnectivity(UpdateCommand::ISMAS_CONNECTION_IN_PROGRESS);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										18
									
								
								UpdatePTUDevCtrl/process/check_ismas_connectivity_command.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								UpdatePTUDevCtrl/process/check_ismas_connectivity_command.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,18 @@
 | 
				
			|||||||
 | 
					#ifndef CHECK_ISMAS_CONNECTIVITY_COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					#define CHECK_ISMAS_CONNECTIVITY_COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "update_command.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class CheckIsmasConnectivityCommand : public UpdateCommand {
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    explicit CheckIsmasConnectivityCommand(QString const &command,
 | 
				
			||||||
 | 
					                                           Worker *worker,
 | 
				
			||||||
 | 
					                                           int nextCommandIndex,
 | 
				
			||||||
 | 
					                                           int start_timeout = 100000,
 | 
				
			||||||
 | 
					                                           int finish_timeout = 100000);
 | 
				
			||||||
 | 
					public slots:
 | 
				
			||||||
 | 
					    virtual void readyReadStandardOutput() override;
 | 
				
			||||||
 | 
					    virtual void finished(int exitCode, QProcess::ExitStatus exitStatus) override;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // CHECK_ISMAS_CONNECTIVITY_COMMAND_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										43
									
								
								UpdatePTUDevCtrl/process/check_update_activation_command.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										43
									
								
								UpdatePTUDevCtrl/process/check_update_activation_command.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,43 @@
 | 
				
			|||||||
 | 
					#include "process/check_update_activation_command.h"
 | 
				
			||||||
 | 
					#include "worker.h"
 | 
				
			||||||
 | 
					#include "utils_internal.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CheckUpdateActivationCommand::CheckUpdateActivationCommand(QString const &command,
 | 
				
			||||||
 | 
					                                                           Worker *worker,
 | 
				
			||||||
 | 
					                                                           int nextCommandIndex,
 | 
				
			||||||
 | 
					                                                           int start_timeout,
 | 
				
			||||||
 | 
					                                                           int finish_timeout)
 | 
				
			||||||
 | 
					  : UpdateCommand(command, worker, nextCommandIndex, start_timeout, finish_timeout) {
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void CheckUpdateActivationCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
 | 
				
			||||||
 | 
					    qCritical() << __func__ << ":" << __LINE__ << command() << exitCode << exitStatus;
 | 
				
			||||||
 | 
					    return UpdateCommand::finished(exitCode, exitStatus);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void CheckUpdateActivationCommand::readyReadStandardOutput() {
 | 
				
			||||||
 | 
					    QProcess *p = (QProcess *)sender();
 | 
				
			||||||
 | 
					    if (p) {
 | 
				
			||||||
 | 
					        Worker *w = worker();
 | 
				
			||||||
 | 
					        if (w) {
 | 
				
			||||||
 | 
					            QString s = p->readAllStandardOutput().trimmed();
 | 
				
			||||||
 | 
					            if (s == internal::UPDATE_REQUESTED) {
 | 
				
			||||||
 | 
					                emit w->showUpdateRequest(internal::UPDATE_REQUESTED);
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if (s == internal::UPDATE_NOT_NECESSARY) {
 | 
				
			||||||
 | 
					                emit w->showUpdateRequest(internal::UPDATE_NOT_NECESSARY);
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if (s == internal::UPDATE_NOT_REQUESTED) {
 | 
				
			||||||
 | 
					                emit w->showUpdateRequest(internal::UPDATE_NOT_REQUESTED);
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if (s == internal::NO_CUSTOMER_REPOSITORY) {
 | 
				
			||||||
 | 
					                emit w->showUpdateRequest(internal::NO_CUSTOMER_REPOSITORY);
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if (s == internal::UPDATE_INITIAL) {
 | 
				
			||||||
 | 
					                emit w->showUpdateRequest(internal::UPDATE_INITIAL);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										18
									
								
								UpdatePTUDevCtrl/process/check_update_activation_command.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								UpdatePTUDevCtrl/process/check_update_activation_command.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,18 @@
 | 
				
			|||||||
 | 
					#ifndef CHECK_UPDATE_ACTIVATION_COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					#define CHECK_UPDATE_ACTIVATION_COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "update_command.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class CheckUpdateActivationCommand : public UpdateCommand {
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    explicit CheckUpdateActivationCommand(QString const &command,
 | 
				
			||||||
 | 
					                                          Worker *worker,
 | 
				
			||||||
 | 
					                                          int nextCommandIndex,
 | 
				
			||||||
 | 
					                                          int start_timeout = 100000,
 | 
				
			||||||
 | 
					                                          int finish_timeout = 100000);
 | 
				
			||||||
 | 
					public slots:
 | 
				
			||||||
 | 
					    virtual void readyReadStandardOutput() override;
 | 
				
			||||||
 | 
					    virtual void finished(int exitCode, QProcess::ExitStatus exitStatus) override;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // CHECK_UPDATE_ACTIVATION_COMMAND_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										226
									
								
								UpdatePTUDevCtrl/process/command.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										226
									
								
								UpdatePTUDevCtrl/process/command.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,226 @@
 | 
				
			|||||||
 | 
					#include "command.h"
 | 
				
			||||||
 | 
					#include "worker.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QRegularExpression>
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <QMutexLocker>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Command::Command(QString const &command, int start_timeout, int finish_timeout)
 | 
				
			||||||
 | 
					    : m_command(command.trimmed())
 | 
				
			||||||
 | 
					    , m_commandResult("")
 | 
				
			||||||
 | 
					    , m_waitForStartTimeout(start_timeout)
 | 
				
			||||||
 | 
					    , m_waitForFinishTimeout(finish_timeout)
 | 
				
			||||||
 | 
					    , m_exitCode(-1)
 | 
				
			||||||
 | 
					    , m_p(nullptr)
 | 
				
			||||||
 | 
					    , m_worker(nullptr) {
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QString Command::getCommandResult(bool reset) const {
 | 
				
			||||||
 | 
					    QMutexLocker locker(&m_mtx);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (reset == false) {
 | 
				
			||||||
 | 
					        return m_commandResult;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString commandResult = m_commandResult;
 | 
				
			||||||
 | 
					    m_commandResult.clear();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return commandResult;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void Command::readyReadStandardOutput() {
 | 
				
			||||||
 | 
					    QMutexLocker locker(&m_mtx);
 | 
				
			||||||
 | 
					    QProcess *p = (QProcess *)sender();
 | 
				
			||||||
 | 
					    if (p) {
 | 
				
			||||||
 | 
					        QString s = p->readAllStandardOutput();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // qCritical() << __func__ << ":" << __LINE__ << s;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (m_worker) {
 | 
				
			||||||
 | 
					            int i = -1;
 | 
				
			||||||
 | 
					            if ((i = s.indexOf("<DC-VERSION>")) != -1) {
 | 
				
			||||||
 | 
					                s = s.mid(i+12).trimmed();
 | 
				
			||||||
 | 
					                if ((i = s.indexOf("\"")) != -1) {
 | 
				
			||||||
 | 
					                    s = s.mid(i+1);
 | 
				
			||||||
 | 
					                    if ((i = s.indexOf("\"")) != -1) {
 | 
				
			||||||
 | 
					                        s = s.mid(0, i).trimmed();
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                // emit m_worker->showDcDownload(s);
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if ((i = s.indexOf("<DC-PROGRESS>")) != -1) {
 | 
				
			||||||
 | 
					                bool ok;
 | 
				
			||||||
 | 
					                int v = s.mid(i+13).trimmed().toInt(&ok);
 | 
				
			||||||
 | 
					                if (ok) {
 | 
				
			||||||
 | 
					                    emit m_worker->setDcDownloadProgress(v);
 | 
				
			||||||
 | 
					                    emit m_worker->insertText(s.mid(0,i) + "\n");
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if ((i = s.indexOf("<DC-UPDATE-FINISH>")) != -1) {
 | 
				
			||||||
 | 
					                emit m_worker->summary();
 | 
				
			||||||
 | 
					                // qApp->exit(0);
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if ((i = s.indexOf("<DC-UPDATE-SUCCESS>")) != -1) {
 | 
				
			||||||
 | 
					                // TODO
 | 
				
			||||||
 | 
					                emit m_worker->summary();
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if ((i = s.indexOf("<DC-UPDATE-FAILURE>")) != -1) {
 | 
				
			||||||
 | 
					                emit m_worker->summary();
 | 
				
			||||||
 | 
					                //qApp->exit(-1);
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if ((i = s.indexOf("<JS-PROGRESS>")) != -1) {
 | 
				
			||||||
 | 
					                bool ok;
 | 
				
			||||||
 | 
					                int v = s.mid(i+13).trimmed().toInt(&ok);
 | 
				
			||||||
 | 
					                if (ok) {
 | 
				
			||||||
 | 
					                    emit m_worker->setDcDownloadProgress(v);
 | 
				
			||||||
 | 
					                    emit m_worker->insertText(s.mid(0,i) + "\n");
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                emit m_worker->insertText(s);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        m_commandResult += s;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void Command::readyReadStandardError() {
 | 
				
			||||||
 | 
					    QProcess *p = (QProcess *)sender();
 | 
				
			||||||
 | 
					    if (p) {
 | 
				
			||||||
 | 
					        QByteArray buf = p->readAllStandardError();
 | 
				
			||||||
 | 
					        qCritical() << buf;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// TODO: nach UpdateCommands ziehen
 | 
				
			||||||
 | 
					void Command::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
 | 
				
			||||||
 | 
					    QProcess *p = (QProcess *)sender();
 | 
				
			||||||
 | 
					    // read all remaining data sent to the process, just in case
 | 
				
			||||||
 | 
					    QString d = p->readAllStandardOutput();
 | 
				
			||||||
 | 
					    if (!d.isEmpty()) {
 | 
				
			||||||
 | 
					        QMutexLocker locker(&m_mtx);
 | 
				
			||||||
 | 
					        m_commandResult += d;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardOutput()));
 | 
				
			||||||
 | 
					    disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardError()));
 | 
				
			||||||
 | 
					    disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(finished(int,QProcess::ExitStatus)));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    //if (m_command.contains("ATBDownloadDCJsonFiles")) {
 | 
				
			||||||
 | 
					    //    m_worker->dcUpdate();
 | 
				
			||||||
 | 
					    //}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// TODO: nach UpdateCommand ziehen
 | 
				
			||||||
 | 
					bool Command::start(QString workingDirectory, QStringList args) {
 | 
				
			||||||
 | 
					    if (!QDir::setCurrent(workingDirectory)) {
 | 
				
			||||||
 | 
					        qCritical() << "SET WORKING_DIRECTORY" << workingDirectory
 | 
				
			||||||
 | 
					                    << "FAILED FOR" << m_command;
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (m_p != nullptr) {
 | 
				
			||||||
 | 
					        delete m_p;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qCritical() << "COMMAND" << m_command << workingDirectory << args;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    m_p = new QProcess(this);
 | 
				
			||||||
 | 
					    m_p->setWorkingDirectory(workingDirectory);
 | 
				
			||||||
 | 
					    m_p->setProcessChannelMode(QProcess::MergedChannels);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    connect(m_p, SIGNAL(readyReadStandardOutput()), this, SLOT(readyReadStandardOutput()));
 | 
				
			||||||
 | 
					    connect(m_p, SIGNAL(readyReadStandardError()), this, SLOT(readyReadStandardError()));
 | 
				
			||||||
 | 
					    connect(m_p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(finished(int,QProcess::ExitStatus)));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!args.isEmpty()) {
 | 
				
			||||||
 | 
					        m_p->start(m_command, args);
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        m_p->start(m_command);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return m_p->waitForStarted(m_waitForStartTimeout);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Command::execute(QString workingDirectory, QStringList args) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!QDir::setCurrent(workingDirectory)) {
 | 
				
			||||||
 | 
					        qCritical() << "SET WORKING_DIRECTORY" << workingDirectory
 | 
				
			||||||
 | 
					                    << "FAILED FOR" << m_command;
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QScopedPointer<QProcess> p(new QProcess(this));
 | 
				
			||||||
 | 
					    p->setWorkingDirectory(workingDirectory);
 | 
				
			||||||
 | 
					    p->setProcessChannelMode(QProcess::MergedChannels);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    connect(&(*p), SIGNAL(readyReadStandardOutput()), this, SLOT(readyReadStandardOutput()));
 | 
				
			||||||
 | 
					    connect(&(*p), SIGNAL(readyReadStandardError()), this, SLOT(readyReadStandardError()));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!args.isEmpty()) {
 | 
				
			||||||
 | 
					        //qDebug() << "START COMMAND" << m_command << "WITH ARGS" << args
 | 
				
			||||||
 | 
					        //         << "IN" << p->workingDirectory();
 | 
				
			||||||
 | 
					        p->start(m_command, args);
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        //qDebug() << "START COMMAND" << m_command
 | 
				
			||||||
 | 
					        //         << "IN" << p->workingDirectory();
 | 
				
			||||||
 | 
					        p->start(m_command);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qint64 const start = QDateTime::currentDateTime().toMSecsSinceEpoch();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (p->waitForStarted(m_waitForStartTimeout)) {
 | 
				
			||||||
 | 
					        // qDebug() << "PROCESS" << m_command << "STARTED IN" << p->workingDirectory();
 | 
				
			||||||
 | 
					        if (p->state() == QProcess::ProcessState::Running) {
 | 
				
			||||||
 | 
					            // qDebug() << "PROCESS" << m_command << "RUNNING IN" << p->workingDirectory();
 | 
				
			||||||
 | 
					            // wait forever for git/opkg-commands to finish
 | 
				
			||||||
 | 
					            int wait = m_waitForFinishTimeout;
 | 
				
			||||||
 | 
					            if (m_command.trimmed().startsWith("git", Qt::CaseInsensitive) ||
 | 
				
			||||||
 | 
					                m_command.trimmed().startsWith("opkg", Qt::CaseInsensitive)) {
 | 
				
			||||||
 | 
					                wait = -1;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            bool const no_timeout = p->waitForFinished(wait);
 | 
				
			||||||
 | 
					            if (no_timeout) {
 | 
				
			||||||
 | 
					                // qDebug() << "PROCESS" << m_command << "FINISHED IN" << p->workingDirectory();
 | 
				
			||||||
 | 
					                if (p->exitStatus() == QProcess::NormalExit) {
 | 
				
			||||||
 | 
					                    if ((m_exitCode = p->exitCode()) == 0) {
 | 
				
			||||||
 | 
					                        qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
 | 
				
			||||||
 | 
					                        qDebug() << "EXECUTED" << m_command
 | 
				
			||||||
 | 
					                                 << QString("(runtime %1ms)").arg(end-start)
 | 
				
			||||||
 | 
					                                 << "with code" << m_exitCode
 | 
				
			||||||
 | 
					                                 << "IN" << p->workingDirectory();
 | 
				
			||||||
 | 
					                        return true;
 | 
				
			||||||
 | 
					                    } else {
 | 
				
			||||||
 | 
					                        qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
 | 
				
			||||||
 | 
					                        qCritical() << "EXECUTED" << m_command
 | 
				
			||||||
 | 
					                                    << QString("(runtime %1ms)").arg(end-start)
 | 
				
			||||||
 | 
					                                    << "with code" << m_exitCode
 | 
				
			||||||
 | 
					                                    << "IN" << p->workingDirectory();
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                } else {
 | 
				
			||||||
 | 
					                    qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
 | 
				
			||||||
 | 
					                    qCritical() << "PROCESS" << m_command << "CRASHED with code"
 | 
				
			||||||
 | 
					                                << p->exitCode()
 | 
				
			||||||
 | 
					                                << QString("(after %1ms)").arg(end-start)
 | 
				
			||||||
 | 
					                                << "IN" << p->workingDirectory();
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
 | 
				
			||||||
 | 
					                qCritical() << "PROCESS" << m_command
 | 
				
			||||||
 | 
					                            << "DID NOT FINISH WITH" << wait
 | 
				
			||||||
 | 
					                            << "MS IN" << p->workingDirectory()
 | 
				
			||||||
 | 
					                            << QString("(runtime %1ms)").arg(end-start);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            qCritical() << "WRONG PROCESS STATE" << p->state()
 | 
				
			||||||
 | 
					                        << "IN" << p->workingDirectory();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
 | 
				
			||||||
 | 
					        qCritical() << "PROCESS" << m_command << "TIMEOUT AT START"
 | 
				
			||||||
 | 
					                    << QString("(runtime %1ms)").arg(end-start)
 | 
				
			||||||
 | 
					                    << "IN" << p->workingDirectory();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										55
									
								
								UpdatePTUDevCtrl/process/command.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										55
									
								
								UpdatePTUDevCtrl/process/command.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,55 @@
 | 
				
			|||||||
 | 
					#ifndef COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					#define COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QObject>
 | 
				
			||||||
 | 
					#include <QCoreApplication>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QStringList>
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					#include <QMutex>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class Worker;
 | 
				
			||||||
 | 
					class Command : public QObject {
 | 
				
			||||||
 | 
					    Q_OBJECT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					protected:
 | 
				
			||||||
 | 
					    QString m_command;
 | 
				
			||||||
 | 
					    mutable QString m_commandResult;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private:
 | 
				
			||||||
 | 
					    int m_waitForStartTimeout;
 | 
				
			||||||
 | 
					    int m_waitForFinishTimeout;
 | 
				
			||||||
 | 
					    int m_exitCode;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					protected:
 | 
				
			||||||
 | 
					    mutable QMutex m_mtx;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private:
 | 
				
			||||||
 | 
					    QProcess *m_p;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					protected:
 | 
				
			||||||
 | 
					    Worker *m_worker;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    explicit Command(QString const &command,
 | 
				
			||||||
 | 
					                     int start_timeout = 100000,
 | 
				
			||||||
 | 
					                     int finish_timeout = 100000);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString getCommandResult(bool reset = false) const;
 | 
				
			||||||
 | 
					    QString command() const { return m_command; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool execute(QString workingDirectory, QStringList args = QStringList());
 | 
				
			||||||
 | 
					    bool start(QString workingDirectory, QStringList args = QStringList());
 | 
				
			||||||
 | 
					    int exitCode() const { return m_exitCode; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    void setWorker(Worker *worker) {m_worker = worker; }
 | 
				
			||||||
 | 
					    Worker const *worker() const { return m_worker; }
 | 
				
			||||||
 | 
					    Worker *worker() { return m_worker; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					protected slots:
 | 
				
			||||||
 | 
					    virtual void readyReadStandardOutput();
 | 
				
			||||||
 | 
					    virtual void readyReadStandardError();
 | 
				
			||||||
 | 
					    virtual void finished(int exitCode, QProcess::ExitStatus exitStatus);
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // COMMAND_H_INCLUDED
 | 
				
			||||||
							
								
								
									
										85
									
								
								UpdatePTUDevCtrl/process/exec_opkg_command.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										85
									
								
								UpdatePTUDevCtrl/process/exec_opkg_command.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,85 @@
 | 
				
			|||||||
 | 
					#include "process/exec_opkg_command.h"
 | 
				
			||||||
 | 
					#include "worker.h"
 | 
				
			||||||
 | 
					#include "utils_internal.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QStringList>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ExecOpkgCommand::ExecOpkgCommand(QString const &command,
 | 
				
			||||||
 | 
					                                 Worker *worker,
 | 
				
			||||||
 | 
					                                 int nextCommandIndex,
 | 
				
			||||||
 | 
					                                 bool noaction,
 | 
				
			||||||
 | 
					                                 int start_timeout,
 | 
				
			||||||
 | 
					                                 int finish_timeout)
 | 
				
			||||||
 | 
					  : UpdateCommand(command, worker, nextCommandIndex, start_timeout, finish_timeout)
 | 
				
			||||||
 | 
					  , m_noaction(noaction)
 | 
				
			||||||
 | 
					  , m_ok_count{0}
 | 
				
			||||||
 | 
					  , m_fail_count{0} {
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void ExecOpkgCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
 | 
				
			||||||
 | 
					    QProcess *p = (QProcess *)sender();
 | 
				
			||||||
 | 
					    if (p) {
 | 
				
			||||||
 | 
					        Worker *w = worker();
 | 
				
			||||||
 | 
					        if (w) {
 | 
				
			||||||
 | 
					            if (m_fail_count == 0 && m_ok_count > 0) {
 | 
				
			||||||
 | 
					                emit w->showExecOpkgOverallResult(internal::EXEC_OPKG_COMMANDS_SUCCESS, m_noaction);
 | 
				
			||||||
 | 
					            } else
 | 
				
			||||||
 | 
					            if (m_ok_count == 0 && m_fail_count > 0) {
 | 
				
			||||||
 | 
					                emit w->showExecOpkgOverallResult(internal::EXEC_OPKG_COMMANDS_FAIL, m_noaction);
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                // TODO
 | 
				
			||||||
 | 
					                emit w->showExecOpkgOverallResult(internal::EXEC_OPKG_COMMANDS_SUCCESS, m_noaction);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return UpdateCommand::finished(exitCode, exitStatus);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void ExecOpkgCommand::readyReadStandardOutput() {
 | 
				
			||||||
 | 
					    QProcess *p = (QProcess *)sender();
 | 
				
			||||||
 | 
					    if (p) {
 | 
				
			||||||
 | 
					        Worker *w = worker();
 | 
				
			||||||
 | 
					        if (w) {
 | 
				
			||||||
 | 
					            QString s = p->readAllStandardOutput().trimmed();
 | 
				
			||||||
 | 
					            if (!s.isEmpty()) {
 | 
				
			||||||
 | 
					                m_standardOutput += s.replace(QChar('\n'), "");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                // the command lines in etc/psa_update/opkg_commands are
 | 
				
			||||||
 | 
					                // separated by "<OPKG>" markers. Note that the file opkg_commands
 | 
				
			||||||
 | 
					                // itself is *not* changed, of course.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                int startIndex, endIndex{};
 | 
				
			||||||
 | 
					                while (((startIndex = m_standardOutput.indexOf(internal::OPKG_MARKER)) == 0) &&
 | 
				
			||||||
 | 
					                       ((endIndex = m_standardOutput.indexOf(internal::OPKG_MARKER, 1)) != -1)) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                    QString result = m_standardOutput.mid(0, endIndex).mid(6);
 | 
				
			||||||
 | 
					                    m_standardOutput = m_standardOutput.mid(endIndex);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                    if (!s.isEmpty()) {
 | 
				
			||||||
 | 
					                        QStringList const lst = result.split(u' ', QString::SkipEmptyParts);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                        if (lst.size() >= 2) {
 | 
				
			||||||
 | 
					                            if (lst.last() == "ok") {
 | 
				
			||||||
 | 
					                                m_ok_count += 1;
 | 
				
			||||||
 | 
					                                if (lst.contains("noaction")) {
 | 
				
			||||||
 | 
					                                    emit w->showExecOpkgCommand(result);
 | 
				
			||||||
 | 
					                                } else {
 | 
				
			||||||
 | 
					                                    emit w->showExecOpkgCommand(result);
 | 
				
			||||||
 | 
					                                }
 | 
				
			||||||
 | 
					                            } else {
 | 
				
			||||||
 | 
					                                m_fail_count += 1;
 | 
				
			||||||
 | 
					                                if (lst.contains("noaction")) {
 | 
				
			||||||
 | 
					                                    emit w->showExecOpkgCommand(result);
 | 
				
			||||||
 | 
					                                } else {
 | 
				
			||||||
 | 
					                                    emit w->showExecOpkgCommand(result);
 | 
				
			||||||
 | 
					                                }
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                        } else {
 | 
				
			||||||
 | 
					                            emit w->showExecOpkgCommand(result);
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										24
									
								
								UpdatePTUDevCtrl/process/exec_opkg_command.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								UpdatePTUDevCtrl/process/exec_opkg_command.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,24 @@
 | 
				
			|||||||
 | 
					#ifndef EXEC_OPKG_COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					#define EXEC_OPKG_COMMAND_H_INCLUDED
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "update_command.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class ExecOpkgCommand : public UpdateCommand {
 | 
				
			||||||
 | 
					    bool m_noaction{false};
 | 
				
			||||||
 | 
					    QString m_standardOutput{};
 | 
				
			||||||
 | 
					    int m_ok_count{};
 | 
				
			||||||
 | 
					    int m_fail_count{};
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    explicit ExecOpkgCommand(QString const &command,
 | 
				
			||||||
 | 
					                             Worker *worker,
 | 
				
			||||||
 | 
					                             int nextCommandIndex,
 | 
				
			||||||
 | 
					                             bool noaction,
 | 
				
			||||||
 | 
					                             int start_timeout = 100000,
 | 
				
			||||||
 | 
					                             int finish_timeout = 100000);
 | 
				
			||||||
 | 
					public slots:
 | 
				
			||||||
 | 
					    virtual void readyReadStandardOutput() override;
 | 
				
			||||||
 | 
					    virtual void finished(int exitCode, QProcess::ExitStatus exitStatus) override;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // EXEC_OPKG_COMMAND_H_INCLUDED
 | 
				
			||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user