mirror of
				https://github.com/AlexandreRouma/SDRPlusPlus.git
				synced 2025-10-31 00:48:11 +01:00 
			
		
		
		
	Show RTL-SDR dongle manufacturer and model name instead of generic name
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				Build Binaries / build_debian_buster_amd64 (push) Failing after 5s
				
			
		
			
				
	
				Build Binaries / build_debian_bullseye_amd64 (push) Failing after 4s
				
			
		
			
				
	
				Build Binaries / build_debian_bookworm_amd64 (push) Failing after 4s
				
			
		
			
				
	
				Build Binaries / build_ubuntu_jammy_amd64 (push) Failing after 4s
				
			
		
			
				
	
				Build Binaries / build_ubuntu_oracular_amd64 (push) Failing after 3s
				
			
		
			
				
	
				Build Binaries / check_formatting (push) Successful in 3s
				
			
		
			
				
	
				Build Binaries / build_debian_sid_amd64 (push) Failing after 3s
				
			
		
			
				
	
				Build Binaries / build_ubuntu_focal_amd64 (push) Failing after 3s
				
			
		
			
				
	
				Build Binaries / build_ubuntu_noble_amd64 (push) Failing after 3s
				
			
		
			
				
	
				Build Binaries / build_android (push) Failing after 4s
				
			
		
			
				
	
				Build Binaries / check_spelling (push) Failing after 3s
				
			
		
			
				
	
				Build Binaries / build_windows (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / build_macos_intel (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / build_macos_arm (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / build_debian_buster_aarch64 (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / build_debian_bullseye_aarch64 (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / build_debian_bookworm_aarch64 (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / build_debian_sid_aarch64 (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / build_ubuntu_focal_aarch64 (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / build_ubuntu_jammy_aarch64 (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / build_ubuntu_noble_aarch64 (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / build_ubuntu_oracular_aarch64 (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / build_raspios_bullseye_armhf (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / create_full_archive (push) Has been cancelled
				
			
		
			
				
	
				Build Binaries / update_nightly_release (push) Has been cancelled
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	Build Binaries / build_debian_buster_amd64 (push) Failing after 5s
				
			Build Binaries / build_debian_bullseye_amd64 (push) Failing after 4s
				
			Build Binaries / build_debian_bookworm_amd64 (push) Failing after 4s
				
			Build Binaries / build_ubuntu_jammy_amd64 (push) Failing after 4s
				
			Build Binaries / build_ubuntu_oracular_amd64 (push) Failing after 3s
				
			Build Binaries / check_formatting (push) Successful in 3s
				
			Build Binaries / build_debian_sid_amd64 (push) Failing after 3s
				
			Build Binaries / build_ubuntu_focal_amd64 (push) Failing after 3s
				
			Build Binaries / build_ubuntu_noble_amd64 (push) Failing after 3s
				
			Build Binaries / build_android (push) Failing after 4s
				
			Build Binaries / check_spelling (push) Failing after 3s
				
			Build Binaries / build_windows (push) Has been cancelled
				
			Build Binaries / build_macos_intel (push) Has been cancelled
				
			Build Binaries / build_macos_arm (push) Has been cancelled
				
			Build Binaries / build_debian_buster_aarch64 (push) Has been cancelled
				
			Build Binaries / build_debian_bullseye_aarch64 (push) Has been cancelled
				
			Build Binaries / build_debian_bookworm_aarch64 (push) Has been cancelled
				
			Build Binaries / build_debian_sid_aarch64 (push) Has been cancelled
				
			Build Binaries / build_ubuntu_focal_aarch64 (push) Has been cancelled
				
			Build Binaries / build_ubuntu_jammy_aarch64 (push) Has been cancelled
				
			Build Binaries / build_ubuntu_noble_aarch64 (push) Has been cancelled
				
			Build Binaries / build_ubuntu_oracular_aarch64 (push) Has been cancelled
				
			Build Binaries / build_raspios_bullseye_armhf (push) Has been cancelled
				
			Build Binaries / create_full_archive (push) Has been cancelled
				
			Build Binaries / update_nightly_release (push) Has been cancelled
				
			This commit is contained in:
		| @@ -121,14 +121,23 @@ public: | ||||
| #ifndef __ANDROID__ | ||||
|         devCount = rtlsdr_get_device_count(); | ||||
|         char buf[1024]; | ||||
|         char snBuf[1024]; | ||||
|         char venBuf[256]; | ||||
|         char prodBuf[256]; | ||||
|         char snBuf[256]; | ||||
|         for (int i = 0; i < devCount; i++) { | ||||
|             // Gather device info | ||||
|             const char* devName = rtlsdr_get_device_name(i); | ||||
|             int snErr = rtlsdr_get_device_usb_strings(i, NULL, NULL, snBuf); | ||||
|             int snErr = rtlsdr_get_device_usb_strings(i, venBuf, prodBuf, snBuf); | ||||
|  | ||||
|             // Build name | ||||
|             sprintf(buf, "[%s] %s##%d", (!snErr && snBuf[0]) ? snBuf : "No Serial", devName, i); | ||||
|             if (venBuf[0] && prodBuf[0]) { | ||||
|                 sprintf(buf, "%s %s [%s]##%d", venBuf, prodBuf, (!snErr && snBuf[0]) ? snBuf : "No Serial", i); | ||||
|             } | ||||
|             else { | ||||
|                 sprintf(buf, "%s [%s]##%d", devName, (!snErr && snBuf[0]) ? snBuf : "No Serial", i); | ||||
|             } | ||||
|  | ||||
|             // Add device to list | ||||
|             devNames.push_back(buf); | ||||
|             devListTxt += buf; | ||||
|             devListTxt += '\0'; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user