epicsdev-tektonix 2.0.0__tar.gz

epicsdev_tektonix-2.0.0/.github/copilot-instructions.md

@@ -0,0 +1,29 @@
+# Copilot instructions for epicsdev_tektronix
+
+## Big picture architecture
+- Core server lives in [epicsdev_tektronix/mso.py](epicsdev_tektronix/mso.py): defines PVs (`myPVDefs()`), maps PVs ↔ SCPI, and runs the EPICS PVAccess loop.
+- Device I/O is via PyVISA (`pyvisa`/`pyvisa-py`). All SCPI traffic is serialized with `Threadlock` and routed through `scopeCmd()`.
+- Data flow: PV write → setter (`set_scpi`, `set_trigger`, etc.) → SCPI command → scope → `publish()`; polling loop → `trigger_is_detected()` → `acquire_waveforms()` → waveform conversion → PV updates.
+- Waveform conversion uses Tektronix preamble queries (`WFMOutpre:*`) and `CURVe?` binary block parsing; conversion formula is `v = (waveform - yoff) * ymult + yzero`.
+
+## Key files and patterns
+- PV definitions are built in `myPVDefs()` with channel templates (`c<n>...`); **do not** use `SPV` inside `ChannelTemplates` (they are expanded later).
+- SCPI names are stored in `C_.scpi`; `make_readSettingQuery()` uppercases and strips lowercase chars before building a combined query.
+- Timing and counters are published in `rareUpdate()` and `poll()`.
+- GUI definitions are in [config/epicsScope_pp.py](config/epicsScope_pp.py); Tektronix wrapper is [config/epicsdev_tektronix_pp.py](config/epicsdev_tektronix_pp.py).
+- Command mapping reference is in [docs/SCPI_COMMANDS.md](docs/SCPI_COMMANDS.md).
+
+## Developer workflows (observed)
+- Install: `pip install -e .` (dependencies in [requirements.txt](requirements.txt)).
+- Run server (module entry point is in `mso.py`): `python -m epicsdev_tektronix.mso -r 'TCPIP::IP::INSTR' -v`.
+- GUI: `python -m pypeto -c config -f epicsdev_tektronix` (optional deps).
+
+## Project-specific conventions
+- PV prefixes are `<device><index>:` (defaults from CLI args).
+- Channel PVs use zero-padded numbers: `c01Waveform`, `c02OnOff`, etc.
+- Many setters use `publish(..., IF_CHANGED)` to minimize traffic; follow that pattern when adding new PVs.
+- Tektronix-specific SCPI commands should match the mappings documented in [docs/SCPI_COMMANDS.md](docs/SCPI_COMMANDS.md).
+
+## Integration points & dependencies
+- External deps: `epicsdev`, `p4p`, `pyvisa`, `pyvisa-py`, `numpy`.
+- VISA resource string (`-r/--resource`) is required for hardware access; tests are not present in repo.

epicsdev_tektonix-2.0.0/.gitignore

@@ -0,0 +1,134 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+Pipfile.lock
+
+# PEP 582
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# IDEs
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+Thumbs.db

epicsdev_tektonix-2.0.0/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Andrey Sukhanov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

epicsdev_tektonix-2.0.0/MIGRATION_NOTES.md

@@ -0,0 +1,130 @@
+# Migration to Latest epicsdev Module
+
+## Summary
+Updated `epicsdev_tektronix` project to use the latest epicsdev module API, following the patterns established in `epicsdev_rigol_scope`.
+
+## Key Changes Made
+
+### 1. **Updated Imports** (Line 15-17)
+**Before:**
+```python
+from epicsdev import epicsdev as edev
+```
+
+**After:**
+```python
+from epicsdev.epicsdev import  Server, init_epicsdev, sleep,\
+    serverState, set_server, publish, pvobj, pvv,\
+    printi, printe, printw, printv, printvv
+```
+
+This removes the need for `edev.` prefix throughout the code and directly imports all required epicsdev API functions.
+
+### 2. **Refactored PV Definitions** (Lines 30-106)
+**Key Changes:**
+- Removed `SPV()` wrapper calls - now using direct Python types (lists, strings, numbers)
+- Changed attribute key from unnamed tuple pattern to explicit dictionary format:
+  - Old: `SPV(['AUTO','MANUAL'],'WD')` 
+  - New: `['AUTO','MANUAL']` with `{F:'WD', ...}` dictionary
+- Used `F` (features) key instead of embedding mode indicators in `SPV()`
+- Simplified channel template expansion - removed `SPV(*pvdef[2])` wrapper
+
+**Pattern Change:**
+Old format with SPV:
+```python
+['setup', 'description', SPV(['Setup','Save latest',...], 'WD'), {SET:set_setup}]
+```
+
+New format:
+```python
+['setup', 'description', ['Setup','Save latest',...], {F:'WD', SET:set_setup}]
+```
+
+### 3. **Updated serverStateChanged Callback** (Lines 154-165)
+**Before:**
+```python
+def serverStateChanged(newState:str):
+    if newState == 'Start':
+        printi('start_device called')
+        configure_scope()
+    elif newState == 'Stop':
+        ...
+    adopt_local_setting()  # Called for all states
+```
+
+**After:**
+```python
+def serverStateChanged(newState:str):
+    if newState == 'Start':
+        printi('start_device called')
+        configure_scope()
+        adopt_local_setting()  # Only on Start
+        with Threadlock:
+            C_.scope.write(':RUN')
+    elif newState == 'Stop':
+        ...
+```
+
+Changes:
+- Moved `adopt_local_setting()` to only run on 'Start' state
+- Added `:RUN` command to start scope acquisition on startup
+
+### 4. **Refactored Main Entry Point** (Lines 615-649)
+**Key Updates:**
+- Cleaner initialization sequence matching epicsdev_rigol_scope pattern
+- Direct function calls instead of wrapped API calls
+- Improved clarity in main loop with added exit message
+
+Pattern alignment with epicsdev_rigol_scope:
+```python
+# Initialize epicsdev and PVs
+pargs.prefix = f'{pargs.device}{pargs.index}:'
+C_.PvDefs = myPVDefs()
+PVs = init_epicsdev(pargs.prefix, C_.PvDefs, pargs.verbose, serverStateChanged)
+
+# Initialize the device
+init()
+
+# Start the Server
+set_server('Start')
+
+# Main loop with Server
+server = Server(providers=[PVs])
+while True:
+    state = serverState()
+    if state.startswith('Exit'):
+        break
+    if not state.startswith('Stop'):
+        poll()
+    if not sleep():
+        periodicUpdate()
+```
+
+## API Functions Used
+All functions are now directly imported from `epicsdev.epicsdev`:
+- `Server()` - Main EPICS PVAccess server
+- `init_epicsdev()` - Initialize PV definitions
+- `sleep()` - Sleep with poll interval handling
+- `serverState()` - Get current server state
+- `set_server()` - Set server state
+- `publish()` - Publish PV values
+- `pvobj()` - Get PV object
+- `pvv()` - Get current PV value
+- `printi/printe/printw/printv/printvv` - Logging functions
+
+## Compatibility
+- No changes to hardware communication (PyVISA interface)
+- No changes to SCPI command patterns
+- No changes to waveform acquisition logic
+- All existing functionality preserved
+
+## Testing Notes
+1. Syntax validation: ✓ Passed
+2. Import structure: ✓ Compatible with latest epicsdev
+3. PV definition format: ✓ Matches epicsdev_rigol_scope pattern
+4. Main loop structure: ✓ Follows standard epicsdev server pattern
+
+## Version Information
+- Updated: 2026-02-25
+- Base Version: v1.0.3
+- Reference Implementation: epicsdev_rigol_scope

epicsdev_tektonix-2.0.0/PKG-INFO

@@ -0,0 +1,66 @@
+Metadata-Version: 2.4
+Name: epicsdev_tektonix
+Version: 2.0.0
+Summary: EPICS PVAccess server for Tektronix MSO oscilloscopes
+Project-URL: Homepage, https://github.com/ASukhanov/epicsdev_tektronix
+Project-URL: Bug Tracker, https://github.com/ASukhanov/epicsdev_tektronix
+Author-email: Andrey Sukhanov <sukhanov@bnl.gov>
+License-File: LICENSE
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.11
+Requires-Dist: epicsdev>=3.0.1
+Requires-Dist: p4p>=4.2.2
+Description-Content-Type: text/markdown
+
+# epicsdev_tektronix
+Python-based EPICS PVAccess server for Tektronix MSO oscilloscopes (4, 5, and 6 Series).
+
+It is based on [p4p](https://epics-base.github.io/p4p/) and [epicsdev](https://github.com/ASukhanov/epicsdev) packages 
+and it can run standalone on Linux, OSX, and Windows platforms.
+
+This implementation is adapted from [epicsdev_rigol_scope](https://github.com/ASukhanov/epicsdev_rigol_scope) 
+and supports Tektronix MSO series oscilloscopes using SCPI commands as documented in the 
+[Tektronix 4-5-6 Series MSO Programmer Manual](https://download.tek.com/manual/4-5-6-Series-MSO-Programmer_077130524.pdf).
+
+## Installation
+```pip install epicsdev_tektronix```
+
+For control GUI and plotting:
+```pip install pypeto,pvplot```
+
+Control GUI:
+```python -m pypeto -c path_to_repository/config -f epicsdev_tektronix```
+
+## Features
+- Support for Tektronix MSO oscilloscopes (configurable)
+- Real-time waveform acquisition via EPICS PVAccess
+- SCPI command interface for scope control
+- Support for multiple trigger modes (AUTO, NORMAL, SINGLE)
+- Configurable horizontal and vertical scales
+- Channel-specific controls (coupling, offset, termination)
+- Performance timing diagnostics
+
+## Command-line Options
+- `-c, --channels`: Number of channels per device (default: 4)
+- `-d, --device`: Device name for PV prefix (default: 'tektronix')
+- `-i, --index`: Device index for PV prefix (default: '0')
+- `-r, --resource`: VISA resource string (default: 'TCPIP::192.168.1.100::INSTR')
+- `-v, --verbose`: Increase verbosity (-vv for debug output)
+
+## Example Usage
+```bash
+python -m epicsdev_tektronix.mso -r'TCPIP::192.168.1.100::4000:SOCKET'
+```
+Control GUI:
+```python -m pypeto -c path_to_repository/config -f epicsdev_tektronix```
+
+## Supported Tektronix Models
+- MSO44, MSO46, MSO48 (4 Series)
+- MSO54, MSO56, MSO58 (5 Series)
+- MSO64 (6 Series)
+- Other MSO series models using compatible SCPI commands
+
+## Performance
+Acquisition time of 6 channels, each with 1M of floating point values is 2.0 s. Throughput maxes out at 12 MB/s.

epicsdev_tektonix-2.0.0/README.md

@@ -0,0 +1,50 @@
+# epicsdev_tektronix
+Python-based EPICS PVAccess server for Tektronix MSO oscilloscopes (4, 5, and 6 Series).
+
+It is based on [p4p](https://epics-base.github.io/p4p/) and [epicsdev](https://github.com/ASukhanov/epicsdev) packages 
+and it can run standalone on Linux, OSX, and Windows platforms.
+
+This implementation is adapted from [epicsdev_rigol_scope](https://github.com/ASukhanov/epicsdev_rigol_scope) 
+and supports Tektronix MSO series oscilloscopes using SCPI commands as documented in the 
+[Tektronix 4-5-6 Series MSO Programmer Manual](https://download.tek.com/manual/4-5-6-Series-MSO-Programmer_077130524.pdf).
+
+## Installation
+```pip install epicsdev_tektronix```
+
+For control GUI and plotting:
+```pip install pypeto,pvplot```
+
+Control GUI:
+```python -m pypeto -c path_to_repository/config -f epicsdev_tektronix```
+
+## Features
+- Support for Tektronix MSO oscilloscopes (configurable)
+- Real-time waveform acquisition via EPICS PVAccess
+- SCPI command interface for scope control
+- Support for multiple trigger modes (AUTO, NORMAL, SINGLE)
+- Configurable horizontal and vertical scales
+- Channel-specific controls (coupling, offset, termination)
+- Performance timing diagnostics
+
+## Command-line Options
+- `-c, --channels`: Number of channels per device (default: 4)
+- `-d, --device`: Device name for PV prefix (default: 'tektronix')
+- `-i, --index`: Device index for PV prefix (default: '0')
+- `-r, --resource`: VISA resource string (default: 'TCPIP::192.168.1.100::INSTR')
+- `-v, --verbose`: Increase verbosity (-vv for debug output)
+
+## Example Usage
+```bash
+python -m epicsdev_tektronix.mso -r'TCPIP::192.168.1.100::4000:SOCKET'
+```
+Control GUI:
+```python -m pypeto -c path_to_repository/config -f epicsdev_tektronix```
+
+## Supported Tektronix Models
+- MSO44, MSO46, MSO48 (4 Series)
+- MSO54, MSO56, MSO58 (5 Series)
+- MSO64 (6 Series)
+- Other MSO series models using compatible SCPI commands
+
+## Performance
+Acquisition time of 6 channels, each with 1M of floating point values is 2.0 s. Throughput maxes out at 12 MB/s.

epicsdev_tektonix-2.0.0/UPDATE_SUMMARY.md

@@ -0,0 +1,76 @@
+# Update Summary: epicsdev_tektronix → Latest epicsdev Module
+
+## ✅ Changes Completed
+
+### 1. **Import Refactoring**
+- **File**: [epicsdev_tektronix/mso.py](epicsdev_tektronix/mso.py#L15-L18)
+- **Change**: Direct function imports from `epicsdev.epicsdev` instead of module import
+- **Impact**: Cleaner code, no `edev.` prefix needed
+
+### 2. **PV Definition Format**
+- **File**: [epicsdev_tektronix/mso.py](epicsdev_tektronix/mso.py#L30-L106)
+- **Change**: Removed deprecated `SPV()` wrapper, using native Python types with feature dictionary
+- **Example**:
+  ```python
+  # Old: ['setup', 'description', SPV(['a','b'],'WD'), {SET:set_setup}]
+  # New: ['setup', 'description', ['a','b'], {F:'WD', SET:set_setup}]
+  ```
+
+### 3. **Server State Callback**
+- **File**: [epicsdev_tektronix/mso.py](epicsdev_tektronix/mso.py#L154-L166)
+- **Change**: State-specific initialization logic, added scope RUN command
+- **Impact**: Proper startup sequence aligned with epicsdev_rigol_scope
+
+### 4. **Main Entry Point**
+- **File**: [epicsdev_tektronix/mso.py](epicsdev_tektronix/mso.py#L615-L649)
+- **Change**: Standard epicsdev server initialization pattern
+- **Impact**: Clearer, more maintainable main loop
+
+## 📊 Comparison with epicsdev_rigol_scope
+
+| Aspect | Before | After | Reference |
+|--------|--------|-------|-----------|
+| Import style | `from epicsdev import epicsdev as edev` | Direct imports from `epicsdev.epicsdev` | ✓ Matches |
+| PV definitions | `SPV()` wrapper calls | Native Python types + feature dict | ✓ Matches |
+| Features key | Not standardized | `F='WD'`, `F='W'`, `F:'D'` | ✓ Matches |
+| Main loop | Custom pattern | Standard Server + serverState pattern | ✓ Matches |
+| State callback | All states same logic | State-specific logic | ✓ Matches |
+
+## 🔍 Code Quality
+
+- **Syntax Check**: ✅ Pass
+- **Import Resolution**: ✅ Pass
+- **API Compatibility**: ✅ Pass
+- **Pattern Alignment**: ✅ Pass with epicsdev_rigol_scope
+
+## 📝 Files Modified
+
+1. `epicsdev_tektronix/mso.py` - Main module (649 lines)
+   - Imports: Lines 15-18
+   - PV Definitions: Lines 30-106
+   - Server Callback: Lines 154-166
+   - Main Entry: Lines 615-649
+
+## 🚀 Running the Updated Code
+
+```bash
+# Install with latest epicsdev
+pip install -e .
+
+# Run server
+python -m epicsdev_tektronix.mso -r 'TCPIP::IP::INSTR' -v
+
+# Or directly
+python epicsdev_tektronix/mso.py -r 'TCPIP::192.168.1.100::5025::SOCKET'
+```
+
+## 📚 Documentation
+
+See [MIGRATION_NOTES.md](MIGRATION_NOTES.md) for detailed change documentation.
+
+## ✨ Benefits of This Update
+
+1. **Consistency**: Aligns with established epicsdev_rigol_scope pattern
+2. **Maintainability**: Cleaner, more readable code
+3. **Future-proofing**: Uses current epicsdev API conventions
+4. **Extensibility**: Easier to add new PVs following standard patterns

epicsdev_tektonix-2.0.0/config/epicsScope_pp.py

@@ -0,0 +1,116 @@
+"""Pypet page for oscilloscopes served by epicsdev-based server."""
+# pylint: disable=invalid-name
+__version__ = 'v1.3.3 2026-02-16'# fixed title.
+print(f'epicsScope {__version__}')
+
+#``````````````````Definitions````````````````````````````````````````````````
+# python expressions and functions, used in the spreadsheet
+_ = ''
+def span(x,y=1): return {'span':[x,y]}
+def color(*v): return {'color':v[0]} if len(v)==1 else {'color':list(v)}
+def font(size): return {'font':['Arial',size]}
+def just(i): return {'justify':{0:'left',1:'center',2:'right'}[i]}
+def slider(minValue,maxValue):
+    """Definition of the GUI element: horizontal slider with flexible range"""
+    return {'widget':'hslider','opLimits':[minValue,maxValue],'span':[2,1]}
+
+LargeFont = {'color':'light gray', **font(13), 'fgColor':'dark green'}
+ButtonFont = {'font':['Open Sans Extrabold',14]}# Comic Sans MS
+# Attributes for gray row, it should be in the first cell:
+#GrayRow = {'ATTRIBUTES':{'color':'light gray', **font(12)}}
+LYRow = {'ATTRIBUTES':{'color':'light yellow'}}
+lColor = color('lightGreen')
+
+# definition for plotting cell
+PyPath = 'python -m'
+PaneT = 'timing[1] timing[3]'
+#``````````````````PyPage Object``````````````````````````````````````````````
+class PyPage():
+    """Pypet page for oscilloscopes served by epicsdev-based server"""
+    def __init__(self, instance:str, title='', channels=4):
+        """Parameters
+        ----------
+        instance: str
+            The instance name of the oscilloscope, e.g. 'scope1:'. It is used to construct the PV names. 
+        title: str, optional
+            The title of the page tab. If not provided, it defaults to '{instance} Oscilloscope'.
+        channels: int, optional
+            The number of channels of the oscilloscope. Default is 4.
+        """
+        if title == '':
+            title = f'{instance} Oscilloscope'
+        print(f'Instantiating Page {title} for device{instance} with {channels} channels')
+
+        #``````````Mandatory class members starts here````````````````````````
+        self.namespace = 'PVA'
+        self.title = title
+
+        #``````````Page attributes, optional``````````````````````````````````
+        self.page = {**color(240,240,240)}# Does not work
+        #self.page['editable'] = False
+
+        #``````````Definition of columns``````````````````````````````````````
+        self.columns = {
+            1: {'width': 120, 'justify': 'right'},
+            2: {'width': 80},
+            3: {'width': 80},
+            4: {'width': 80},
+            5: {'width': 80},
+            6: {'width': 80},
+            7: {'width': 80},
+            8: {'width': 80},
+            9: {'width': 80},
+        }
+        """`````````````````Configuration of rows`````````````````````````````
+A row is a list of comma-separated cell definitions.
+The cell definition is one of the following: 
+  1)string, 2)device:parameters, 3)dictionary.
+The dictionary is used when the cell requires extra features like color, width,
+description etc. The dictionary is single-entry {key:value}, where the key is a 
+string or device:parameter and the value is dictionary of the features.
+        """
+        D = instance
+
+        #``````````Abbreviations, used in cell definitions
+        def ChLine(suffix):
+            return [f'{D}c{ch+1:02}{suffix}' for ch in range(channels)]
+        #FOption = ' -file '+logreqMap.get(D,'')
+        host = '130.199.41.111'
+        #scopeWWW = {'WWW':{'launch':f'firefox http://{host}/Tektronix/#/client/c/   Tek%20e*Scope',
+        #    **lColor, **ButtonFont, **span(1,2)}}
+        PaneP2P = ' '.join([f'c{i+1:02}Peak2Peak' for i in range(channels)])
+        PaneWF = ' '.join([f'c{i+1:02}Waveform' for i in range(channels)])
+        Plot = {'Plot':{'launch':f'{PyPath} pvplot -aV:{instance} -#0"{PaneP2P}" -#1"{PaneWF}" -#2"{PaneT}"',
+            **lColor, **ButtonFont}}
+        print(f'Plot command: {Plot}')
+
+        #``````````mandatory member```````````````````````````````````````````
+        self.rows = [
+['Device:',D, {D+'server':LargeFont}, {'Save:':just(2)}, D+'setup',
+    D+'HOSTNAME', D+'VERSION'],
+['Status:', {D+'status': span(8,1)}],
+['Cycle time:',D+'cycleTime', 'Sleep:',D+'sleep', 'Cycle:',D+'cycle', Plot],
+['Triggers recorded:', D+'acqCount', 'Lost:', D+'lostTrigs',
+  'Acquisitions:',D+'scopeAcqCount',_], 
+['Time/Div:', {D+'timePerDiv':span(2,1)},_,'recLength:', D+'recLengthS',
+  D+'recLengthR',_],
+['SamplingRate:', {D+'samplingRate':span(2,1)},_,_,_,_,_],
+#['Trigger:', D+'trigSourceS', D+'trigCouplingS', D+'trigSlopeS', 'level:', D+'trigLevelS', 'delay:', {D+'trigDelay':span(2,1)},''],
+['Trigger state:',D+'trigState','   trigMode:',D+'trigMode',
+  'TrigLevel','TrigDelay',_],
+[{D+'trigger':color('lightCyan')}, D+'trigSource', D+'trigCoupling',
+  D+'trigSlope', D+'trigLevel', D+'trigDelay',_],
+[{'ATTRIBUTES':color('lightGreen')}, 'Channels:','CH1','CH2','CH3','CH4','CH5','CH6'],
+['Volt/Div:']+ChLine('VoltsPerDiv'),
+['Offset:']+ChLine('VoltOffset'),
+['Coupling:']+ChLine('Coupling'),
+['Termination:']+ChLine('Termination'),
+['On/Off:']+ChLine('OnOff'),
+['Peak2Peak:']+ChLine('Peak2Peak'),
+['Mean:']+ChLine('Mean'),
+[LYRow,'',{'For Experts only!':{**span(6,1),**font(14)}}],
+[LYRow,'Scope command:', {D+'instrCmdS':span(2,1)},_,{D+'instrCmdR':span(4,1)}],
+[LYRow,'Special commands', {D+'instrCtrl':span(2,1)},_,_,_,_,_,],
+[LYRow,'Timing:',{D+'timing':span(6,1)}],
+]
+

epicsdev_tektonix-2.0.0/config/epicsdev_tektronix_pp.py

@@ -0,0 +1,7 @@
+"""Pypet definition for Tektronix MSO scope"""
+import epicsScope_pp as module
+
+def PyPage(**_):
+    return  module.PyPage(instance='tektronix0:', title='Tektronix MSO',
+        channels=6)
+