Bug 299 - Trigger source list not correct for all models
Summary: Trigger source list not correct for all models
Status: RESOLVED FIXED
Alias: None
Product: libsigrok
Classification: Unclassified
Component: Driver: rigol-ds (show other bugs)
Version: unreleased development snapshot
Hardware: All All
: Normal normal
Target Milestone: ---
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-28 16:08 CET by Uwe Hermann
Modified: 2018-06-22 02:46 CEST (History)
1 user (show)


Attachments
Stores the trigger sources in the model struct and uses a macro to populate the info (8.68 KB, patch)
2018-05-24 23:01 CEST, Valentin Ochs 		Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Uwe Hermann 2014-01-28 16:08:23 CET 
The list of trigger sources doesn't match properly for all models.

E.g. on the DS1052E the triggers can be CH1, CH2, EXT, and AC Line, whereas the driver reports CH1, CH2, CH3, CH4 (IIRC).
Comment 1 Valentin Ochs 2018-05-24 22:17:00 CEST 
The list of trigger sources that's returned currently only seems to depend on whether the scope has digital channels or not. For those with digital channels, it outputs the full list (including CH3 and CH4 for scopes with only two analog channels), for those without it'll always print CH1-4.

I suppose a possible solution would be having two lists of triggers, with and without CH3 and CH4, and returning a (for analog-only scopes truncated) reference to that list.
Comment 2 Valentin Ochs 2018-05-24 23:01:48 CEST 
Created attachment 430 [details]
Stores the trigger sources in the model struct and uses a macro to populate the info
Comment 3 Uwe Hermann 2018-06-22 02:46:05 CEST 
Fixed in 6bcc81ac3aae2ab805f9c856c211c56c07afc8e2, thanks!