#include <string.h>
#include <zlib.h>
#include <sigrok.h>
+#include <config.h>
#include "asix-sigma.h"
#define USB_VENDOR 0xa600
sigma->num_probes = 0;
sigma->samples_per_event = 0;
sigma->capture_ratio = 50;
+ sigma->use_triggers = 0;
/* Register SIGMA device. */
sdi = sigrok_device_instance_new(0, ST_INITIALIZING,
return SIGROK_ERR;
}
}
+
+ if (trigger_set)
+ sigma->use_triggers = 1;
}
return SIGROK_OK;
} else if (capability == HWCAP_PROBECONFIG) {
ret = configure_probes(sdi, value);
} else if (capability == HWCAP_LIMIT_MSEC) {
- sigma->limit_msec = strtoull(value, NULL, 10);
- ret = SIGROK_OK;
+ sigma->limit_msec = *(uint64_t*) value;
+ if (sigma->limit_msec > 0)
+ ret = SIGROK_OK;
+ else
+ ret = SIGROK_ERR;
} else if (capability == HWCAP_CAPTURE_RATIO) {
- sigma->capture_ratio = strtoull(value, NULL, 10);
- ret = SIGROK_OK;
+ sigma->capture_ratio = *(uint64_t*) value;
+ if (sigma->capture_ratio < 0 || sigma->capture_ratio > 100)
+ ret = SIGROK_ERR;
+ else
+ ret = SIGROK_OK;
} else {
ret = SIGROK_ERR;
}
sent += tosend;
}
- packet.type = DF_TRIGGER;
- packet.length = 0;
- packet.payload = 0;
- session_bus(sigma->session_id, &packet);
+ /* Only send trigger if explicitly enabled. */
+ if (sigma->use_triggers) {
+ packet.type = DF_TRIGGER;
+ packet.length = 0;
+ packet.payload = 0;
+ session_bus(sigma->session_id, &packet);
+ }
}
/* Send rest of the chunk to sigrok. */
const int chunks_per_read = 32;
unsigned char buf[chunks_per_read * CHUNK_SIZE];
int bufsz, numchunks, i, newchunks;
- uint32_t running_msec;
+ uint64_t running_msec;
struct timeval tv;
fd = fd;
sigma = sdi->priv;
- /* If the samplerate has not been set, default to 50 MHz. */
+ /* If the samplerate has not been set, default to 200 KHz. */
if (sigma->cur_firmware == -1)
- set_samplerate(sdi, MHZ(50));
+ set_samplerate(sdi, KHZ(200));
/* Enter trigger programming mode. */
sigma_set_register(WRITE_TRIGGER_SELECT1, 0x20, sigma);