R&S RTB2000 oscilloscope driver - USBTMC ‘ReadRawData()’

[dreisiebner]

The ‘ReadRawData()’ procedure in the ‘SCPITMCTransport’ class has been extended so that multiple packets can be read from the RTB2000.
Otherwise, only the first packet is read and data transfer is interrupted at more than ~ 40 kB.

The transfer also works with the PR: #950
However, I was unable to use the progress bar, as it causes the program to crash.

Modified files:
scopehal/SCPITMCTransport.cpp

[dreisiebner]

There was an error in the file ‘SCPITMCTransport.cpp’. One line was accidentally not deleted. I deleted the line online on GitHub. I don't know if this change was saved directly in the pull request.

Peter

[azonenberg]

I think this PR is redundant now? Can we close? I'm confused because the diffs are showing up but they're adding code that's already merged.

[dreisiebner]

I'm sure I've made mistakes with Git and my pull requests. The change in ‘SCPITMCTransport.cpp’ is present in my updated fork.

Peter

[dreisiebner]

Unfortunately, the incorrect additional line is still present in ‘SCPITMCTransport.cpp’. I checked it in https://github.com/ngscopeclient/scopehal/blob/master/scopehal/SCPITMCTransport.cpp.

Line 236 should be deleted:

			if (m_data_in_staging_buf <= 0)
				m_data_in_staging_buf = 0;
			m_data_offset = 0;  // WRONG - DELETE
		}

I'm sorry, I don't know what went wrong.

Peter

[azonenberg]

I'll look at this later I'm busy cleaning up a different issue that I didn't catch until after merging: your trigger code broke all existing triggers by reusing the same names. Now any time someone with a different kind of scope loads a session with an edge trigger they get an R&S edge trigger instead.