Hi Martin, Martin Ling writes: > On Thu, Nov 07, 2013 at 10:31:26PM +0100, Mathias Grimmberger wrote: > > > > I tested it and found a bug with the DS2000 series - it was in my code > > originally. Basically it failed to properly handle 2 channels. > > > > See the patch below. BTW, this is the first patch I created with git, is > > it OK? > > Thanks, that worked fine, I have applied it to the branch. The only > issue I had with it was that one of the added lines was indented with > spaces instead of tabs - can you try to get your editor to be consistent > with the style used?
I will beat the thing into submission. Darn, I even remember reading in the git book about avoiding whitespace issues... > I think the next thing to try is to merge in the additional changes from > your standalone version into the unified version. Would you like to > attempt that? Yes. But one thing isn't clear to me. The remaining code is about reading the sample memory when the scope is stopped. How to indicate the capability in the device options, and how to tell sigrok-cli to use that mode instead of live capture? Oh, another thing. I think I already mentioned that the Rigol DS4000 and DS6000 series seem to be using the exact same protocol as the DS2000, probably common firmware parts. So it may be useful to in general distinguish between the protocol used by the DS1xx2 and the one used by the newer devices (seems to me to conform to IEEE 488.2) and only use the series number to work around specific quirks if needed. So in case a DS4000 owner suddenly appears we'd not need to amend much code. And I'm willing to bet that the new DS1000Z series uses the new protocol too... (no programming manual available yet). MGri ------------------------------------------------------------------------------ November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk _______________________________________________ sigrok-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/sigrok-devel
