f3ab43a8fb
sr: fx2lafw: Fix multistage trigger
...
Multistage triggers currently do no work, because there is a return statement
in the middle of the trigger detector which will be hit as soon as the first
stage in a multistage trigger matches. This patch removes the return statement
so that the trigger detector can continue to try to match the next stage. In
order for this to work we also make sure that the trigger stage is only reset
if the current sample does not match.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2012-06-24 14:35:26 +02:00
eabf24035b
sr: fx2lafw: Fix memory leaks in receive_transfer
...
There are a few memory leaks in the receive_transfer transfer function. The most
serve of them is that a sample buffer is not freed if the triggered has not
matched yet, which causes a sigrok process which is waiting for a trigger to
consume several megabytes of memory within seconds. The other leaks are on the
error paths in that function.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2012-06-22 09:23:30 +02:00
9edfee3ee3
sr: ols: Fix incorrect comment.
2012-06-21 23:59:27 +02:00
eb1f1eb407
sr: Unfinished Mastech VA18B (DMM) support.
2012-06-21 23:56:24 +02:00
b908f067f2
sr: chronovu-la8: Split code into api.c and driver.c.
...
We should generally use api.c for API related functions and put the other
functions (mostly hardware-specific low-level code) into other C file(s)
for better readability.
2012-06-21 23:34:38 +02:00
9956f2851f
sr: analog: Add MQ and UNIT enums.
...
MQ is the measured quantity, e.g. voltage, current, temperature.
UNIT is the unit in which these quantities are measured, e.g. volt,
ampere, celsius, kelvin, etc. etc.
The same MQ can be specified in different UNITs by the driver, depending
on what the hardware reports. Conversion is left to the frontends.
2012-06-20 23:55:23 +02:00
c13536fa9c
sr: backend/zeroplus: Improve debug output.
2012-06-19 23:33:50 +02:00
6e6eeff47a
hantek-dso: capturestate packet also contains the trigger point
...
Not yet used, but it's the key to knowing where in the frame to
start displaying; the frame is used as a circular buffer, and what
is sent is effectively a snapshot.
2012-06-18 23:09:37 +02:00
a217bcdf10
hantek-dso: relays now set properly
...
They appear to be arranged to switch on/off a hierarchical series of
devices that attenuate the channel by an order of magnitude.
2012-06-18 23:05:02 +02:00
384c28d9e7
sr: hantek-dso: Use portable g_ntohs() function.
...
The ntohs() from <arpa/inet.h> is not available on MinGW/Windows. There
are ways to work around this, but as we use glib already, using g_ntohs()
is the best option anyway.
2012-06-14 01:21:00 +02:00
c5841b2809
hantek-dso: calculate voltage based on vdiv setting
2012-06-05 18:18:23 +02:00
a10c805636
hantek-dso: default to DC coupling
2012-06-05 18:18:23 +02:00
1d97091e71
hantek-dso: fix CH2 vdiv setting
2012-06-05 18:18:23 +02:00
aff5a729ab
sr: add unit field to sr_df_analog packet
2012-06-05 18:18:23 +02:00
62bb8840e1
sr: hantek-dso: Consistency renames, constification.
2012-06-01 01:12:09 +02:00
0a88ec3d9c
sr: fx2lafw: Use gboolean, cosmetics, fix gcc warning.
2012-05-31 22:48:40 +02:00
af36b80969
hantek-dso: Update to constified libsigrok API.
2012-05-31 22:43:12 +02:00
88ff66c2c9
hantek-dso: Quickfix for build issue (will be removed later).
2012-05-31 22:40:41 +02:00
f4575b6549
fx2lafw: Added a check to limit the sample rate during 16-bit sampling
2012-05-31 19:53:36 +01:00
d1ddc7a9a8
fx2lafw: Added device caps and added support for wide sampling
2012-05-31 19:52:32 +01:00
a533743dd1
sr: Made sample rate lists const
2012-05-31 19:51:11 +01:00
1b79df2f57
sr: Made the dev_config_set parameter a const pointer
2012-05-31 19:51:11 +01:00
b7f578bef5
sr: Made the dev_info_get return value const
2012-05-31 19:51:10 +01:00
915f7cc87a
sr: Made hwcap const
2012-05-31 19:51:09 +01:00
2715c0b86b
hantek-dso: hopefully handle endianness in voltage setting
2012-05-30 23:56:13 +02:00
4a090d722d
hantek-dso: enable SR_HWCAP_COUPLING
2012-05-30 23:56:13 +02:00
b58fbd99c8
hantek-dso: support for SR_HWCAP_COUPLING
2012-05-30 23:56:13 +02:00
313deed219
hantek-dso: support SR_HWCAP_VDIV
2012-05-30 23:56:12 +02:00
ebb781a69f
hantek-dso: support for SR_HWCAP_FILTER
2012-05-30 23:56:12 +02:00
a370ef1916
hantek-dso: support for setting all CMD_SET_TRIGGER_SAMPLERATE params
2012-05-30 23:56:12 +02:00
bc79e906a0
hantek-dso: proper protocol implementation of trigger/samplerate setting
2012-05-30 23:56:12 +02:00
6e71ef3b6f
hantek-dso: fix channel selection
2012-05-30 23:56:12 +02:00
ae88b97ba2
hantek-dso: delimit frames with SR_DF_FRAME_* packets
2012-05-30 23:56:12 +02:00
3b533202c8
sr: initial support for Hantek 2xxx/5200 USB oscilloscopes
2012-05-30 23:56:12 +02:00
f366e86c68
sr: change all drivers to use SR_DF_META_LOGIC
2012-05-30 23:55:36 +02:00
7e41e319d9
sr: fx2lafw: Forgot to add (C) line to fx2lafw.h in recent commit.
2012-05-30 23:31:03 +02:00
0a8c0c324e
sr: fx2lafw: Only check for correct major FW version.
...
Changes in the minor version number are OK, as those should never
contain any incompatible/API changes.
2012-05-30 23:23:14 +02:00
8fdecced96
sr: Consistently use ZEROPLUS spelling.
...
This is the version used throughout their website, let's use it.
2012-05-30 23:23:14 +02:00
921634ec10
sr: Fix typos.
2012-05-30 22:42:47 +02:00
cf94c8167b
sr: fx2lafw: Add (C) line from old saleae driver it's based on.
2012-05-30 22:42:45 +02:00
f60fdf6ebe
sr: fx2lafw: s/MAX_RENUM_DELAY/MAX_RENUM_DELAY_MS/.
2012-05-30 09:30:50 +02:00
e8bd58ffd2
sr: fx2lafw: Fix a firmware upload bug on 32bit systems.
...
The glib GTimeVal data type (and some functions using it) will be faded
out from glib sooner or later, so it's not a good idea to use them anyway.
In this specific case GTimeVal.tv_sec was overflowing, leading a check in
libsigrok to fail, and thus to FX2 firmware upload errors, i.e.
non-working fx2lafw devices.
http://thread.gmane.org/gmane.comp.debugging.sigrok.devel/166
The root cause is that GTimeVal.tv_sec is a 'glong' (8 bytes on 64bit
systems, but only 4 on 32bit systems).
We now use an int64_t (and g_get_monotonic_time() instead of the more
problematics g_get_current_time() which uses a GTimeVal).
This has been verified to fix the issue on a 32bit system.
Other uses of GTimeVal in libsigrok will be removed in a later release.
Also, drop unneeded GTV_TO_MSEC.
2012-05-30 09:30:18 +02:00
9f05304e4e
sr: ARMFLY AX-Pro is supported by fx2lafw (LA only).
2012-05-29 20:25:08 +02:00
37dc0b16a6
fx2lafw: Cosmetics.
2012-05-11 00:22:30 +02:00
dc68c660d5
fx2lafw: Added a gpif delay debug message
2012-05-10 13:11:07 +01:00
79dc64985f
fx2lafw: Added support for 20kHz and 25kHz sampling
2012-05-10 13:10:59 +01:00
897c1a2ee5
fx2lafw: Added support for 100kHz and 50kHz sampling
2012-05-10 13:08:09 +01:00
1e94408ae5
sr: fx2lafw: Get/display FX2 REVID.
2012-05-06 19:54:46 +02:00
1663e4706c
sr: fx2lafw: Braintechnology USB-LPS support.
2012-05-06 17:24:40 +02:00
6352d030df
sr: We support both SIGMA and SIGMA2.
...
Also, a few minor coding-style fixes etc.
2012-05-03 01:41:02 +02:00
6b73d9a598
fx2lafw: use iManufacturer/iProduct fields to identify our firmware
...
It's more deterministic than the endpoint profile check we did before. Which
was also broken.
2012-04-27 01:28:47 +02:00
6752905e6b
sr: zeroplus: Fix segfault, add debug output.
...
There are various ZEROPLUS models with different probe numbers. For now
hardcode to 16 (for the popular LAP-C(16032)). This will need to be
fixed in a dynamic way later.
This fixes a segfault due to only 16 probe-names being defined, but the
drivers returning 32 as probecount.
Also, add some additional debug output.
2012-04-26 23:18:05 +02:00
993526f824
sr: don't use deprecated glib functions
...
As of the recent glib 2.32 release, these produce deprecation warnings
at compile time.
2012-04-23 15:31:41 +02:00
42cdeef626
sigma: Fix segfault when no Sigma present.
2012-04-23 13:36:17 +02:00
868501fa46
sigma: Bump copyright notice.
2012-04-22 15:10:46 +02:00
e210c6c090
sr: Remove zlib dependency.
...
No longer needed by Sigma driver.
2012-04-22 14:59:10 +02:00
e3fff420da
sigma: Add support for SIGMA2 (req. new firmware).
2012-04-22 14:59:10 +02:00
3c36c403fa
sigma: Use heap for datafeed packet and header.
2012-04-22 14:59:10 +02:00
805919b042
sigma: Fix bugs in receive_data callback.
...
- Poll data position on Sigma for every iteration.
- Return TRUE when no data ready.
2012-04-22 14:59:10 +02:00
934cde02b8
fx2lafw: supported_samplerates[] should be 0-terminated.
2012-04-19 00:55:29 +02:00
f488762a17
fx2lafw: Added support for default Cypess FX2 without EEPROM
2012-04-19 00:12:22 +02:00
824b1a8f5c
sr: Deleted the saleae-logic driver, fx2lafw has superceded it.
2012-04-19 00:12:22 +02:00
9304d57650
fx2lafw: Added slower sample rates
2012-04-18 19:07:39 +01:00
0aeb0ccd55
sr: sr_err() et. al. don't need trailing \n.
2012-04-10 23:25:57 +02:00
44dfd483db
sr: fx2lafw: Cosmetics.
2012-04-10 22:32:31 +02:00
13bf7eccbb
fx2lafw: Added command to verify firmware version
2012-04-10 18:27:24 +01:00
6fbe5e6081
fx2lafw: Safer use of libusb_get_device_list
2012-04-08 17:19:52 +01:00
da68656857
sr: fx2lafw: Consistency fixes.
2012-03-31 11:33:43 +02:00
7ae2f9d56f
sr: fx2lafw: Cosmetics.
2012-03-28 01:19:28 +02:00
b04902b646
sr: fx2lafw: Use SR_PRIV where needed.
2012-03-28 01:19:28 +02:00
30da9658ad
sr: fx2lafw: command.h: Add missing include guards.
2012-03-28 01:19:28 +02:00
f4a9e5c0aa
sr: fx2lafw: Cosmetics.
2012-03-28 01:19:27 +02:00
94c26b08fd
sr: Build ezusb.c for fx2lafw as well as saleae-logic
2012-03-25 19:42:37 +01:00
ec888f62fe
salae: Only terminate session after all transfers have been aborted
2012-03-25 19:42:37 +01:00
3e6292b296
fx2lafw: Made finish_acquisition a static function
2012-03-25 19:42:37 +01:00
590b9f9a91
sr: Fix some samplerate fields.
2012-03-24 22:32:47 +01:00
cb61e9f7c3
fx2lafw: Only terminate session after all transfers have been aborted
2012-03-24 10:09:28 +00:00
24125e0520
fx2lafw: Removed a line of redundant code
2012-03-24 10:07:58 +00:00
6c6781b6a7
fx2lafw: Imported software triggering from fx2lafw
2012-03-21 22:47:25 +00:00
2e7cb0040a
cli: Fix -V/-h output a bit.
...
Options and their defaults should not be documented there, but rather in
the manpage or such.
2012-03-21 23:20:09 +01:00
eb0a373189
sr/cli: s/patternmode/pattern/ in a few places.
2012-03-21 23:20:07 +01:00
ebc3473882
sr: s/err/ret/ for consistency.
...
We use ret, err, error, and others for return codes of functions.
Standardize on 'ret' for consistency reasons for now.
2012-03-21 23:20:06 +01:00
21b50ee183
Merge remote-tracking branch 'joel/public'
2012-03-16 00:04:51 +01:00
ecc16ed070
fx2lafw: Upped NUM_SIMUL_TRANSFERS to 32
2012-03-14 22:56:15 +00:00
455b26edba
sr: demo: s/struct databag/struct context/.
2012-03-14 22:44:30 +01:00
ab331b679c
sr: demo: s/mydata/ctx/.
2012-03-14 22:44:29 +01:00
4101f961e8
sr: s/SR_{USB,SERIAL}_INST/SR_INST_{USB,SERIAL}/.
2012-03-14 22:44:29 +01:00
4502e86921
fx2lafw: Added CWAV USBee SX to the device list
2012-03-12 21:49:34 +00:00
0ca21631dd
fx2lafw: Corrected a comment
2012-03-12 21:47:45 +00:00
93a9f3daaf
fx2lafw: Added Saleae Logic (and clones) to the device list
2012-03-12 21:47:44 +00:00
f8b07fc6c3
fx2lafw: Moved firmware path into fx2lafw_profile
2012-03-12 21:41:28 +00:00
4679d14db3
fx2lafw: Made fx2lafw profiles const
2012-03-12 21:41:27 +00:00
6ccfadaf66
fx2lafw: Made string pointers constant
2012-03-12 21:39:02 +00:00
17b6c75a89
fx2lafw: Added ESLA201A to device list
2012-03-12 21:38:57 +00:00
017375d17e
fx2lafw: Send start command after bulk transfer have been set up
2012-03-11 20:59:39 +00:00
13d0d2698c
ols: fixed *ctx null dereferences that would SEGFAULT on probing for a OLS or attempting to read from it.
...
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
2012-03-08 22:27:33 -08:00
9031ce63f3
fx2lafw: Corrected check_conf_profile checks
2012-03-07 07:52:05 +00:00
dba024420f
fx2lafw: Implemented control of sample rates
2012-03-07 07:52:05 +00:00
f92994fd91
fx2lafw: Ensure default sample rate is set
2012-03-07 07:52:05 +00:00
d98c4e35ce
fx2lafw: Removed CMD_STOP and renumbered commands
2012-03-07 07:52:05 +00:00
2e526f4a6a
fx2lafw: Moved num_samples into context struct
2012-03-07 07:52:05 +00:00
266784d594
saleae-logic: Moved num_samples into context struct
2012-03-07 07:52:05 +00:00
19ccdf696c
fx2lafw: Removed CMD_SET_SAMPLERATE
2012-03-07 07:52:05 +00:00
f6582cd7bf
fx2lafw: Implemented initial support for start capture
2012-03-07 07:52:05 +00:00
74fcfb806d
fx2lafw: Devices now retain the same PID/VID after fw load
2012-03-07 07:51:39 +00:00
e318664793
fx2lafw: Implemented SR_HWCAP_PROBECONFIG and SR_HWCAP_LIMIT_SAMPLES
2012-03-07 07:51:39 +00:00
c8f2c9dda4
fx2lafw: Fixed a compiler error, and made cv_data consistent with saleae-logic.c
2012-03-07 07:51:31 +00:00
0abee5076f
sr: Fix some TODOs, improve comments/docs.
2012-03-04 15:10:12 +01:00
3cd3a20b35
sr: More callback param renames.
...
Start/stop acquisition callbacks: Consistently name the 'void *' parameter
cb_data for now. The per-device-instance device pointer is called
'session_dev_id' everywhere for now, but this should be renamed to
something more clear.
2012-03-04 15:10:09 +01:00
1f9813eb6c
sr: Name all callback data 'cb_data'.
2012-03-02 02:25:42 +01:00
31ccebc492
sr: s/sr_session_bus/sr_session_send/.
2012-03-01 23:49:25 +01:00
c09f0b578c
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 23:52:30 +01:00
2285cf9bc5
sr: code cleanup
2012-02-28 17:47:02 +01:00
d261dbbfcc
sr: Fix/document probe names.
2012-02-28 01:09:29 +01:00
6c39d99a28
sr: fx2lafw: Consistent #include guard naming.
2012-02-27 23:55:06 +01:00
f9a69557d2
sr: fx2lafw: Use gboolean consistenly.
2012-02-27 23:53:44 +01:00
772a0e6153
fx2lafw: Small consistency fixes.
2012-02-27 23:40:38 +01:00
be4b99e897
fx2lafw: Compile fix.
2012-02-27 23:26:05 +01:00
5da939028d
fx2lafw: Implemented hw_dev_acquisition_stop
2012-02-27 21:58:25 +00:00
610dbb7091
fx2lafw: Implemented hw_dev_acquisition_start
2012-02-27 21:58:25 +00:00
7cb621d418
fx2lafw: Basic implementation of hw_dev_config_set with SR_HWCAP_LIMIT_SAMPLES
2012-02-27 21:58:25 +00:00
62bc70e412
fx2lafw: Added more to hw_cleanup
2012-02-27 21:58:25 +00:00
f1898235e8
fx2lafw: Implemented hw_dev_close
2012-02-27 21:58:25 +00:00
43125c6993
fx2lafw: Implemented hw_dev_open
2012-02-27 21:58:25 +00:00
7f6a3b43ad
sr: Moved GTV_TO_MSEC to sigrok-internal.h
2012-02-27 21:58:25 +00:00
b1eeb67e92
fx2lafw: Implemented firmware upload
2012-02-27 21:58:25 +00:00
cdfdd71101
fx2lafw: Renamed fx2lafw_dev to ctx in hw_dev_info_get
2012-02-27 21:58:25 +00:00
90282c82bc
fx2lafw: Renamed fx2lafw_dev to ctx in hw_init
2012-02-27 21:58:25 +00:00
cac0bbaafd
fx2lafw: Renamed dev_insts variable in hw_init
2012-02-27 21:58:25 +00:00
aae2fed675
fx2lafw: Implemented hw_get_status
2012-02-25 11:11:44 +00:00
8b35f47483
fx2lafw: Exposed capabilities data
2012-02-25 11:11:44 +00:00
187b358232
fx2lafw: Added probing for fx2lafw devices
2012-02-25 11:11:29 +00:00
f302a08256
fx2lafw: Added empty hardware module for fx2lafw
2012-02-25 09:11:53 +00:00
04254c3f83
sr: la8: Improve comments and messages a bit.
2012-02-23 22:16:16 +01:00
47671b0f26
sr: la8: Remove some unneeded checks.
2012-02-23 00:27:12 +01:00
ea9cfed7a5
sr: Consistent ctx name for per-dev-inst context.
2012-02-18 18:07:42 +01:00
6b3dfec8de
sr: Fix incorrectly renamed functions.
2012-02-18 12:25:43 +01:00
ee61b340da
sr: Remove unneeded temp. variable use.
2012-02-18 12:16:49 +01:00
a9a245b428
sr: s/config_set/dev_config_set/.
...
This functions is per-device-instance, so use dev_ as prefix as with
the other ones.
2012-02-18 12:11:15 +01:00
69040b7c8f
sr: s/acquisition_*/dev_acquisition_*/.
...
These functions are per-device-instance, so use dev_ as prefix as with
the other ones.
2012-02-18 12:03:49 +01:00
e7eb703fff
sr: opendev/closedev -> dev_open/dev_close.
2012-02-18 11:57:43 +01:00
8105505d06
sr: s/st*_acquisition/acquisition_st*/.
2012-02-18 11:46:51 +01:00
5097b0d091
sr/cli/gtk/qt: s/get_dev_info/dev_info_get/.
2012-02-18 11:41:21 +01:00
a7d05fcb38
sr/cli/gtk/qt: s/configuration/config/.
2012-02-18 00:31:35 +01:00
ffedd0bf5d
sr/cli/gtk: s/capability/hwcap/.
2012-02-18 00:17:18 +01:00
1d9a8a5fe1
sr/cli/gtk: A few more s/instance/inst/.
2012-02-17 23:55:27 +01:00
bb7ef79377
sr/cli/gtk/qt: s/device/dev/ in many places.
...
Also, a few s/instance/inst/ occurences.
2012-02-17 23:47:00 +01:00
d68e2d1a21
sr: Some more s/device_instance/dev_inst/.
2012-02-17 22:40:51 +01:00
7b48d6e104
sr: Prefix log messages with subsystem string.
2012-02-17 22:40:51 +01:00
9fc6aa0a56
sr: la8: remove debug output when no device is found
2012-02-14 13:18:17 +01:00
Lars-Peter Clausen
Uwe Hermann
Bert Vermeulen
Joel Holdsworth
Håvard Espeland
Matt Ranostay