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: 30e5e9c3fd4e
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 18fd1a3ed86a
Choose a head ref
  • 3 commits
  • 9 files changed
  • 1 contributor

Commits on Apr 27, 2021

  1. Copy the full SHA
    22128ca View commit details
  2. Copy the full SHA
    df8833b View commit details
  3. Copy the full SHA
    18fd1a3 View commit details
1 change: 1 addition & 0 deletions scopehal/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ endif()
set(SCOPEHAL_SOURCES
base64.cpp
scopehal.cpp
avx_mathfun.cpp

Unit.cpp

7 changes: 6 additions & 1 deletion scopehal/OscilloscopeChannel.h
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* *
* ANTIKERNEL v0.1 *
* *
* Copyright (c) 2012-2020 Andrew D. Zonenberg *
* Copyright (c) 2012-2021 Andrew D. Zonenberg *
* All rights reserved. *
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
@@ -50,10 +50,15 @@ class OscilloscopeChannel
public:
enum ChannelType
{
//Conventional time-series waveforms (or similar graphs like a FFT)
CHANNEL_TYPE_ANALOG,
CHANNEL_TYPE_DIGITAL,

//2D density plots
CHANNEL_TYPE_EYE,
CHANNEL_TYPE_SPECTROGRAM,

//Special channels not used for display
CHANNEL_TYPE_TRIGGER, //external trigger input, doesn't have data capture

//Complex datatype from a protocol decoder
Loading