Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b2f97f36eace
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 39aa540dedab
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Feb 24, 2020

  1. LeCroyOscilloscope: compatibility fixes for DDA5000 series

    @azonenberg
    azonenberg committed Feb 24, 2020
    Copy the full SHA
    39aa540 View commit details
Showing with 14 additions and 2 deletions.
  1. +11 −1 scopehal/LeCroyOscilloscope.cpp
  2. +3 −1 scopehal/LeCroyOscilloscope.h
12 changes: 11 additions & 1 deletion scopehal/LeCroyOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -102,6 +102,10 @@ void LeCroyOscilloscope::IdentifyHardware()
//Look up model info
if(m_model.find("WS3") == 0)
m_modelid = MODEL_WAVESURFER_3K;
else if(m_model.find("HDO9") == 0)
m_modelid = MODEL_HDO_9K;
else if(m_model.find("DDA5") == 0)
m_modelid = MODEL_DDA_5K;
else if(m_model.find("WAVERUNNER8") == 0)
m_modelid = MODEL_WAVERUNNER_8K;
else
@@ -205,8 +209,14 @@ void LeCroyOscilloscope::DetectOptions()

void LeCroyOscilloscope::DetectAnalogChannels()
{
//Last digit of the model number is the number of channels
//Last digit of the model number is normally the number of channels
int nchans = m_model[m_model.length() - 1] - '0';

//DDA5005 and similar have 4 channels despite a model number ending in 5
if(m_modelid == MODEL_DDA_5K)
nchans = 4;


for(int i=0; i<nchans; i++)
{
//Hardware name of the channel
4 changes: 3 additions & 1 deletion scopehal/LeCroyOscilloscope.h
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* *
* ANTIKERNEL v0.1 *
* *
* Copyright (c) 2012-2019 Andrew D. Zonenberg *
* Copyright (c) 2012-2020 Andrew D. Zonenberg *
* All rights reserved. *
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
@@ -154,6 +154,8 @@ class LeCroyOscilloscope
{
MODEL_WAVESURFER_3K,
MODEL_WAVERUNNER_8K,
MODEL_HDO_9K,
MODEL_DDA_5K,

MODEL_UNKNOWN
};