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: 1d306ead0045
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 89af3a78732f
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Mar 13, 2020

  1. Added empty function for Oscilloscope to load config from save file

    @azonenberg
    azonenberg committed Mar 13, 2020
    Copy the full SHA
    89af3a7 View commit details
Showing with 22 additions and 9 deletions.
  1. +1 −1 scopehal/CMakeLists.txt
  2. +8 −0 scopehal/Oscilloscope.cpp
  3. +5 −0 scopehal/Oscilloscope.h
  4. +8 −8 scopehal/scopehal.h
2 changes: 1 addition & 1 deletion scopehal/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ set(SCOPEHAL_SOURCES

add_library(scopehal SHARED
${SCOPEHAL_SOURCES})
target_link_libraries(scopehal ${SIGCXX_LIBRARIES} ${GTKMM_LIBRARIES} xptools log graphwidget)
target_link_libraries(scopehal ${SIGCXX_LIBRARIES} ${GTKMM_LIBRARIES} xptools log graphwidget yaml-cpp)

target_include_directories(scopehal
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
8 changes: 8 additions & 0 deletions scopehal/Oscilloscope.cpp
View file
Original file line number Diff line number Diff line change
@@ -68,6 +68,14 @@ Oscilloscope::~Oscilloscope()
m_pendingWaveforms.clear();
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// File loading

void Oscilloscope::LoadConfiguration(const YAML::Node& node, std::map<void*, int>& idmap)
{
LogDebug("load config\n");
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Enumeration

5 changes: 5 additions & 0 deletions scopehal/Oscilloscope.h
View file
Original file line number Diff line number Diff line change
@@ -54,6 +54,11 @@ class Oscilloscope : public virtual Instrument
Oscilloscope();
virtual ~Oscilloscope();

/**
@brief Load instrument and channel configuration from a save file
*/
virtual void LoadConfiguration(const YAML::Node& node, std::map<void*, int>& idmap);

/**
@brief Instruments are allowed to cache configuration settings to reduce round trip queries to the device.
16 changes: 8 additions & 8 deletions scopehal/scopehal.h
View file
Original file line number Diff line number Diff line change
@@ -36,15 +36,19 @@
#ifndef scopehal_h
#define scopehal_h

#include "../log/log.h"

#include <sigc++/sigc++.h>

#include <vector>
#include <string>
#include <map>
#include <stdint.h>

#include <sigc++/sigc++.h>
#include <cairomm/context.h>

#include <yaml-cpp/yaml.h>

#include "../log/log.h"
#include "../graphwidget/Graph.h"

#include "Unit.h"

#include "SCPITransport.h"
@@ -62,10 +66,6 @@

#include "Measurement.h"

#include <cairomm/context.h>

#include "../graphwidget/Graph.h"

uint64_t ConvertVectorSignalToScalar(std::vector<bool> bits);

std::string GetDefaultChannelColor(int i);