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: 62a3963128c5
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2c1fba224d6b
Choose a head ref
4 contributors
Loading
Showing with 7,984 additions and 956 deletions.
  1. +3 −0 .gitmodules
  2. +1 −0 graphwidget
  3. +21 −4 scopehal/AnalogRenderer.cpp
  4. +2 −2 scopehal/AnalogRenderer.h
  5. +350 −0 scopehal/AntikernelLogicAnalyzer.cpp
  6. +102 −0 scopehal/AntikernelLogicAnalyzer.h
  7. +11 −3 scopehal/CMakeLists.txt
  8. +3 −1 scopehal/CaptureChannel.h
  9. +12 −0 scopehal/ChannelRenderer.cpp
  10. +22 −0 scopehal/ChannelRenderer.h
  11. +0 −363 scopehal/Graph.cpp
  12. +8 −1 scopehal/Instrument.h
  13. +189 −73 scopehal/LeCroyOscilloscope.cpp
  14. +5 −2 scopehal/LeCroyOscilloscope.h
  15. +5 −0 scopehal/Measurement.cpp
  16. +2 −1 scopehal/Measurement.h
  17. +3 −1 scopehal/Multimeter.h
  18. +2 −8 scopehal/Oscilloscope.h
  19. +2 −0 scopehal/OscilloscopeChannel.cpp
  20. +13 −1 scopehal/OscilloscopeChannel.h
  21. +9 −0 scopehal/PacketDecoder.cpp
  22. +4 −2 scopehal/PacketDecoder.h
  23. +3 −0 scopehal/PowerSupply.h
  24. +147 −6 scopehal/ProtocolDecoder.cpp
  25. +20 −8 scopehal/ProtocolDecoder.h
  26. +633 −0 scopehal/RigolOscilloscope.cpp
  27. +106 −0 scopehal/RigolOscilloscope.h
  28. +37 −80 scopehal/RohdeSchwarzHMC8012Multimeter.cpp
  29. +4 −18 scopehal/RohdeSchwarzHMC8012Multimeter.h
  30. +38 −91 scopehal/RohdeSchwarzHMC804xPowerSupply.cpp
  31. +4 −18 scopehal/RohdeSchwarzHMC804xPowerSupply.h
  32. +651 −0 scopehal/RohdeSchwarzOscilloscope.cpp
  33. +106 −0 scopehal/RohdeSchwarzOscilloscope.h
  34. +66 −0 scopehal/SCPIDevice.cpp
  35. +53 −0 scopehal/SCPIDevice.h
  36. +64 −0 scopehal/SCPIOscilloscope.cpp
  37. +48 −0 scopehal/SCPIOscilloscope.h
  38. +102 −0 scopehal/SCPISocketTransport.cpp
  39. +62 −0 scopehal/SCPISocketTransport.h
  40. +44 −0 scopehal/SCPITransport.cpp
  41. +54 −0 scopehal/SCPITransport.h
  42. +145 −0 scopehal/Unit.cpp
  43. +80 −0 scopehal/Unit.h
  44. +6 −0 scopehal/base64.cpp
  45. +0 −42 scopehal/scopehal.cpp
  46. +9 −5 scopehal/scopehal.h
  47. +2 −0 scopemeasurements/CMakeLists.txt
  48. +94 −0 scopemeasurements/OvershootMeasurement.cpp
  49. +56 −0 scopemeasurements/OvershootMeasurement.h
  50. +94 −0 scopemeasurements/UndershootMeasurement.cpp
  51. +56 −0 scopemeasurements/UndershootMeasurement.h
  52. +2 −0 scopemeasurements/scopemeasurements.cpp
  53. +3 −0 scopemeasurements/scopemeasurements.h
  54. +309 −0 scopeprotocols/CANDecoder.cpp
  55. +73 −0 scopeprotocols/CANDecoder.h
  56. +109 −0 scopeprotocols/CANRenderer.cpp
  57. +25 −0 scopeprotocols/CANRenderer.h
  58. +19 −2 scopeprotocols/CMakeLists.txt
  59. +206 −0 scopeprotocols/ClockJitterDecoder.cpp
  60. +64 −0 scopeprotocols/ClockJitterDecoder.h
  61. +115 −0 scopeprotocols/ClockRecoveryDebugDecoder.cpp
  62. +63 −0 scopeprotocols/ClockRecoveryDebugDecoder.h
  63. +111 −50 scopeprotocols/ClockRecoveryDecoder.cpp
  64. +5 −1 scopeprotocols/ClockRecoveryDecoder.h
  65. +136 −0 scopeprotocols/DCOffsetDecoder.cpp
  66. +63 −0 scopeprotocols/DCOffsetDecoder.h
  67. +302 −0 scopeprotocols/DVIDecoder.cpp
  68. +47 −75 scopehal/Graph.h → scopeprotocols/DVIDecoder.h
  69. +119 −0 scopeprotocols/DVIRenderer.cpp
  70. +54 −0 scopeprotocols/DVIRenderer.h
  71. +23 −5 scopeprotocols/DifferenceDecoder.cpp
  72. +14 −19 scopeprotocols/EthernetRenderer.cpp
  73. +31 −8 scopeprotocols/EyeDecoder2.cpp
  74. +3 −0 scopeprotocols/FFTDecoder.cpp
  75. +237 −0 scopeprotocols/I2CDecoder.cpp
  76. +92 −0 scopeprotocols/I2CDecoder.h
  77. +121 −0 scopeprotocols/I2CRenderer.cpp
  78. +54 −0 scopeprotocols/I2CRenderer.h
  79. +4 −9 scopeprotocols/IBM8b10bRenderer.cpp
  80. +7 −7 scopeprotocols/JtagRenderer.cpp
  81. +503 −0 scopeprotocols/MDIODecoder.cpp
  82. +94 −0 scopeprotocols/MDIODecoder.h
  83. +136 −0 scopeprotocols/MDIORenderer.cpp
  84. +54 −0 scopeprotocols/MDIORenderer.h
  85. +152 −0 scopeprotocols/MovingAverageDecoder.cpp
  86. +64 −0 scopeprotocols/MovingAverageDecoder.h
  87. +170 −0 scopeprotocols/PeriodMeasurementDecoder.cpp
  88. +66 −0 scopeprotocols/PeriodMeasurementDecoder.h
  89. +276 −0 scopeprotocols/TMDSDecoder.cpp
  90. +89 −0 scopeprotocols/TMDSDecoder.h
  91. +112 −0 scopeprotocols/TMDSRenderer.cpp
  92. +54 −0 scopeprotocols/TMDSRenderer.h
  93. +4 −2 scopeprotocols/ThresholdDecoder.cpp
  94. +134 −0 scopeprotocols/USB2ActivityDecoder.cpp
  95. +58 −0 scopeprotocols/USB2ActivityDecoder.h
  96. +8 −8 scopeprotocols/USB2PCSRenderer.cpp
  97. +1 −1 scopeprotocols/USB2PMADecoder.cpp
  98. +5 −5 scopeprotocols/USB2PMARenderer.cpp
  99. +16 −30 scopeprotocols/USB2PacketRenderer.cpp
  100. +0 −2 scopeprotocols/UartClockRecoveryDecoder.cpp
  101. +12 −1 scopeprotocols/scopeprotocols.cpp
  102. +12 −1 scopeprotocols/scopeprotocols.h
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -4,3 +4,6 @@
[submodule "log"]
path = log
url = https://github.com/azonenberg/logtools.git
[submodule "graphwidget"]
path = graphwidget
url = git@github.com:azonenberg/graphwidget.git
1 change: 1 addition & 0 deletions graphwidget
Submodule graphwidget added at 821587
25 changes: 21 additions & 4 deletions scopehal/AnalogRenderer.cpp
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* *
* ANTIKERNEL v0.1 *
* *
* Copyright (c) 2012-2017 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 *
@@ -41,6 +41,7 @@ using namespace std;

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Construction / destruction

AnalogRenderer::AnalogRenderer(OscilloscopeChannel* channel)
: ChannelRenderer(channel)
{
@@ -196,7 +197,7 @@ void AnalogRenderer::RenderEndCallback(

float AnalogRenderer::PickStepSize(float volts_per_half_span, int min_steps, int max_steps)
{
const float step_sizes[12]=
const float step_sizes[24]=
{
//mV per div
0.001,
@@ -213,10 +214,26 @@ float AnalogRenderer::PickStepSize(float volts_per_half_span, int min_steps, int

1,
2.5,
5
5,

10,
25,
50,

100,
250,
500,

1000,
2500,
5000,

10000,
25000,
50000
};

for(int i=0; i<12; i++)
for(int i=0; i<24; i++)
{
float step = step_sizes[i];
float steps_per_half_span = volts_per_half_span / step;
4 changes: 2 additions & 2 deletions scopehal/AnalogRenderer.h
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
* *
* ANTIKERNEL v0.1 *
* *
* Copyright (c) 2012-2017 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 *
@@ -77,7 +77,7 @@ class AnalogRenderer : public ChannelRenderer
float volts_to_pixels(float v, bool offset = true);

public:
static float PickStepSize(float volts_per_half_span, int min_steps = 2, int max_steps = 4);
static float PickStepSize(float volts_per_half_span, int min_steps = 2, int max_steps = 5);

static void DrawVerticalAxisLabels(
const Cairo::RefPtr<Cairo::Context>& cr,
Loading