hi all,
it not support DSCope U2P20? (revise the scopehal-apps and libsigrok4DSL * for U2P20(IdentifyHardware and dsl_dev_open)
not show any waveform in ngscopeclient
steven@steven-VirtualBox:~/scopehal-sigrok-bridge/build$ ./scopehal-sigrok-bridge DSCope
libsigrok4DSL ver: '0.2.0'
Selected driver DSCope, scanning...
Found device: DreamSourceLab - DSCope U2P20
-> USB bus 2 : dev 6
Sample bits: 8 (scope)
Device has 2 channels
- available operation mode: Normal
- available operation mode: Internal Test
Initial op mode: Normal; stream = 0
vdiv options: 10 (0.1V), 20 (0.2V), 50 (0.5V), 100 (1.0V), 200 (2.0V), 500 (5.0V), 1000 (10.0V), 2000 (20.0V),
Hardware ADC report range: 0a - f5 (adj: 1.085)
(Clipping detection supported)
Client connected to SCPI socket
Client connected to data plane socket
Updated coupling for ch0, now AC1M
Updated RANGE; Wanted 50.000000 (0.500000 PtP), result: 94120718662528
Updated coupling for ch1, now AC1M
Updated RANGE; Wanted 50.000000 (0.500000 PtP), result: 94120718662528
Updated RATE; now 1000000
Updated DEPTH; now 10000
Updated ENABLED for ch0, now 1
Set trigger DELAY to 0 (%0)
Set trigger SOU to 0
Set trigger LEV to 0.000000
Set trigger EDGE to RISING
Set trigger DELAY to 0 (%0)
/home/steven/scopehal-apps/lib/scopehal/DSLabsOscilloscope.cpp
void DSLabsOscilloscope::IdentifyHardware()
{
//Assume no MSO channels to start
m_analogChannelCount = 0;
m_digitalChannelBase = 0;
m_digitalChannelCount = 0;
m_series = SERIES_UNKNOWN;
if (m_model == "DSCope U3P100")
{
m_series = DSCOPE_U3P100;
LogDebug("Found DSCope U3P100\n");
m_analogChannelCount = 2;
m_digitalChannelCount = 0;
}
else if (m_model == "DSLogic U3Pro16")
{
m_series = DSLOGIC_U3PRO16;
LogDebug("Found DSLogic U3Pro16\n");
m_analogChannelCount = 0;
m_digitalChannelCount = 16;
}
// ********add U2P20//
else if (m_model == "DSCope U2P20")
{
m_series = DSCOPE_U3P100;
LogDebug("Found DSCope U2P20\n");
m_analogChannelCount = 2;
m_digitalChannelCount = 0;
}
if (m_series == SERIES_UNKNOWN)
LogWarning("Unknown DSLabs model "%s"\n", m_model.c_str());
}
/home/steven/DSView/libsigrok4DSL/hardware/DSL/dsl.c
SR_PRIV int dsl_dev_open(struct sr_dev_driver *di, struct sr_dev_inst *sdi, gboolean fpga_done)
ret = dsl_wr_reg(sdi, CTR0_ADDR, bmNONE); // dessert clear
/ Check HDL version */
ret = dsl_hdl_version(sdi, &hw_info);
sr_info("HDL ver is %x",hw_info);
// ********add U2P20//
//if ((ret != SR_OK) || (hw_info != DSL_HDL_VERSION)) {
if ((ret != SR_OK) ) {
sr_err("%s: HDL verison incompatible!", func);
sdi->status = SR_ST_INCOMPATIBLE;
return SR_ERR;
}
hi all,
it not support DSCope U2P20? (revise the scopehal-apps and libsigrok4DSL * for U2P20(IdentifyHardware and dsl_dev_open)
not show any waveform in ngscopeclient
steven@steven-VirtualBox:~/scopehal-sigrok-bridge/build$ ./scopehal-sigrok-bridge DSCope
libsigrok4DSL ver: '0.2.0'
Selected driver DSCope, scanning...
Found device: DreamSourceLab - DSCope U2P20
-> USB bus 2 : dev 6
Sample bits: 8 (scope)
Device has 2 channels
Initial op mode: Normal; stream = 0
vdiv options: 10 (0.1V), 20 (0.2V), 50 (0.5V), 100 (1.0V), 200 (2.0V), 500 (5.0V), 1000 (10.0V), 2000 (20.0V),
Hardware ADC report range: 0a - f5 (adj: 1.085)
(Clipping detection supported)
Client connected to SCPI socket
Client connected to data plane socket
Updated coupling for ch0, now AC1M
Updated RANGE; Wanted 50.000000 (0.500000 PtP), result: 94120718662528
Updated coupling for ch1, now AC1M
Updated RANGE; Wanted 50.000000 (0.500000 PtP), result: 94120718662528
Updated RATE; now 1000000
Updated DEPTH; now 10000
Updated ENABLED for ch0, now 1
Set trigger DELAY to 0 (%0)
Set trigger SOU to 0
Set trigger LEV to 0.000000
Set trigger EDGE to RISING
Set trigger DELAY to 0 (%0)
/home/steven/scopehal-apps/lib/scopehal/DSLabsOscilloscope.cpp
void DSLabsOscilloscope::IdentifyHardware()
{
//Assume no MSO channels to start
m_analogChannelCount = 0;
m_digitalChannelBase = 0;
m_digitalChannelCount = 0;
m_series = SERIES_UNKNOWN;
if (m_model == "DSCope U3P100")
{
m_series = DSCOPE_U3P100;
LogDebug("Found DSCope U3P100\n");
m_analogChannelCount = 2;
m_digitalChannelCount = 0;
}
else if (m_model == "DSLogic U3Pro16")
{
m_series = DSLOGIC_U3PRO16;
LogDebug("Found DSLogic U3Pro16\n");
m_analogChannelCount = 0;
m_digitalChannelCount = 16;
}
// ********add U2P20//
else if (m_model == "DSCope U2P20")
{
m_series = DSCOPE_U3P100;
LogDebug("Found DSCope U2P20\n");
m_analogChannelCount = 2;
m_digitalChannelCount = 0;
}
if (m_series == SERIES_UNKNOWN)
LogWarning("Unknown DSLabs model "%s"\n", m_model.c_str());
}
/home/steven/DSView/libsigrok4DSL/hardware/DSL/dsl.c
SR_PRIV int dsl_dev_open(struct sr_dev_driver *di, struct sr_dev_inst *sdi, gboolean fpga_done)
ret = dsl_wr_reg(sdi, CTR0_ADDR, bmNONE); // dessert clear
/ Check HDL version */
ret = dsl_hdl_version(sdi, &hw_info);
sr_info("HDL ver is %x",hw_info);
// ********add U2P20//
//if ((ret != SR_OK) || (hw_info != DSL_HDL_VERSION)) {
if ((ret != SR_OK) ) {
sr_err("%s: HDL verison incompatible!", func);
sdi->status = SR_ST_INCOMPATIBLE;
return SR_ERR;
}