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: 0fc1a0dd4566
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 984ed99a73c9
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 21, 2020

  1. Fixed LeCroy driver to work on Win32

    nshcat committed Jun 21, 2020
    Copy the full SHA
    4180794 View commit details

  2. Merge pull request #157 from nshcat/fix-lecroy_win32 

    [WIP] Fixed LeCroy driver to work on Win32
    @azonenberg
    azonenberg authored Jun 21, 2020
    Copy the full SHA
    984ed99 View commit details
Showing with 6 additions and 10 deletions.
  1. +6 −5 scopehal/LeCroyOscilloscope.cpp
  2. +0 −5 scopehal/LeCroyOscilloscope.h
11 changes: 6 additions & 5 deletions scopehal/LeCroyOscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -27,8 +27,6 @@
* *
***********************************************************************************************************************/

#ifndef _WIN32

#include "scopehal.h"
#include "LeCroyOscilloscope.h"
#include "ProtocolDecoder.h"
@@ -1175,7 +1173,12 @@ time_t LeCroyOscilloscope::ExtractTimestamp(unsigned char* wavedesc, double& bas
basetime = fseconds - seconds;
time_t tnow = time(NULL);
struct tm tstruc;

#ifdef _WIN32
localtime_s(&tstruc, &tnow);
#else
localtime_r(&tnow, &tstruc);
#endif

//Convert the instrument time to a string, then back to a tm
//Is there a better way to do this???
@@ -2154,6 +2157,4 @@ int64_t LeCroyOscilloscope::GetDeskewForChannel(size_t channel)
m_channelDeskew[channel] = skew_ps;

return skew_ps;
}

#endif
}
5 changes: 0 additions & 5 deletions scopehal/LeCroyOscilloscope.h
View file
Original file line number Diff line number Diff line change
@@ -27,8 +27,6 @@
* *
***********************************************************************************************************************/

#ifndef _WIN32

#ifndef LeCroyOscilloscope_h
#define LeCroyOscilloscope_h

@@ -243,7 +241,4 @@ class LeCroyOscilloscope
static std::string GetDriverNameInternal();
OSCILLOSCOPE_INITPROC(LeCroyOscilloscope)
};

#endif

#endif