From 9f1c2db9d296dc17f86e1f22634a14063b1d0a72 Mon Sep 17 00:00:00 2001
From: "Eugeniy E. Mikhailov" <evgmik@gmail.com>
Date: Wed, 1 Dec 2021 11:26:39 -0500
Subject: improve hardware definitions

---
 hardware/scope/__init__.py | 23 ++++++++++++++++-------
 hardware/scope/sds1104x.py |  6 +++---
 2 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'hardware/scope')

diff --git a/hardware/scope/__init__.py b/hardware/scope/__init__.py
index e6b6573..23462a7 100644
--- a/hardware/scope/__init__.py
+++ b/hardware/scope/__init__.py
@@ -2,21 +2,30 @@
 Provide basic class to operate scope
 Created by Eugeniy E. Mikhailov 2021/11/29
 """
-import scpi
+from hardware.scpi import SCPIinstr
 
-class Scope(scpi.SCPIinstr):
-    """     
-    Do not instantiate directly, use
-    rm = pyvisa.ResourceManager()
-    Scope(rm.open_resource('TCPIP::192.168.0.2::INSTR'))
-    """
+class Scope:
 
     # Minimal set of methods to be implemented by a scope.
     # Should work with minimal arguments list 
     # but might be faster if parameters provided: less IO requests
 
+    def __init__(self):
+        self.numberOfChannels = 0
+
     def getTrace(self, chNum, availableNpnts=None, maxRequiredPoints=None):
         warnings.warn( 'this function is not implemented' )
 
+class ScopeSCPI(SCPIinstr, Scope):
+    """     
+    Do not instantiate directly, use
+    rm = pyvisa.ResourceManager()
+    ScopeSCPI(rm.open_resource('TCPIP::192.168.0.2::INSTR'))
+    """
+    pass
+    def __init__(self, resource):
+        SCPIinstr.__init__(self, resource)
+        Scope.__init__(self)
+
 from .sds1104x import SDS1104X
 
diff --git a/hardware/scope/sds1104x.py b/hardware/scope/sds1104x.py
index 53e945a..23ac1be 100644
--- a/hardware/scope/sds1104x.py
+++ b/hardware/scope/sds1104x.py
@@ -3,19 +3,19 @@ Provide basic class to operate scope
 Created by Eugeniy E. Mikhailov 2021/11/29
 """
 
-from hardware.scope import Scope
+from hardware.scope import ScopeSCPI
 from datatrace import DataTrace
 import re
 import numpy as np
 
-class SDS1104X(Scope):
+class SDS1104X(ScopeSCPI):
     """ Siglent SDS1104x scope """
     vertDivOnScreen = 10
     horizDivOnScreen = 14
-    numberOfChannels = 4
     def __init__(self, resource):
         super().__init__(resource)
         self.resource.read_termination='\n'
+        self.numberOfChannels = 4
         self.maxRequiredPoints = 1000; # desired number of points per channel, can return twice more
 
     def response2numStr(self, strIn, firstSeparator=None, unit=None):
-- 
cgit v1.2.3