SCPI-Instrument-Control 1.0.0__tar.gz → 1.1.0__tar.gz

{scpi_instrument_control-1.0.0 → scpi_instrument_control-1.1.0}/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [1.0.1] - 2026-01-07
+
+### Added
+
+### Changed
+
+### Fixed
+
 ## [1.0.0] - 2026-01-06
 
 ### ⚠️ MAJOR RELEASE - Package Renamed

{scpi_instrument_control-1.0.0/SCPI_Instrument_Control.egg-info → scpi_instrument_control-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SCPI-Instrument-Control
-Version: 1.0.0
+Version: 1.1.0
 Summary: Universal Python library for controlling SCPI-compatible test equipment via Ethernet/LAN. Supports oscilloscopes (Siglent SDS series, generic SCPI scopes), function generators/AWGs (Siglent SDG series, generic SCPI AWGs), and power supplies (Siglent SPD series, generic SCPI PSUs). Features include waveform capture, measurements, FFT analysis, PyQt6 GUI, automated report generation with AI analysis, and comprehensive SCPI command abstraction.
 Author: Robin Mumm
 Maintainer: little-did-I-know

{scpi_instrument_control-1.0.0 → scpi_instrument_control-1.1.0/SCPI_Instrument_Control.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SCPI-Instrument-Control
-Version: 1.0.0
+Version: 1.1.0
 Summary: Universal Python library for controlling SCPI-compatible test equipment via Ethernet/LAN. Supports oscilloscopes (Siglent SDS series, generic SCPI scopes), function generators/AWGs (Siglent SDG series, generic SCPI AWGs), and power supplies (Siglent SPD series, generic SCPI PSUs). Features include waveform capture, measurements, FFT analysis, PyQt6 GUI, automated report generation with AI analysis, and comprehensive SCPI command abstraction.
 Author: Robin Mumm
 Maintainer: little-did-I-know

scpi_instrument_control-1.1.0/SCPI_Instrument_Control.egg-info/SOURCES.txt

@@ -0,0 +1,156 @@
+CHANGELOG.md
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+SCPI_Instrument_Control.egg-info/PKG-INFO
+SCPI_Instrument_Control.egg-info/SOURCES.txt
+SCPI_Instrument_Control.egg-info/dependency_links.txt
+SCPI_Instrument_Control.egg-info/entry_points.txt
+SCPI_Instrument_Control.egg-info/requires.txt
+SCPI_Instrument_Control.egg-info/top_level.txt
+docs/SDS800XHD_Series_ProgrammingGuide_EN11G.pdf
+docs/VISUAL_MEASUREMENTS.md
+docs/images/01_main_window.png
+docs/images/channel_controls.png
+docs/images/cursors.png
+docs/images/fft_analysis.png
+docs/images/main_window.png
+docs/images/measurements_panel.png
+docs/images/visual_measurements.png
+examples/README.md
+examples/advanced_analysis.py
+examples/basic_usage.py
+examples/batch_capture.py
+examples/continuous_capture.py
+examples/data_logger_basic.py
+examples/function_generator_basic.py
+examples/live_plot.py
+examples/measurements.py
+examples/probe_calibration_analysis.py
+examples/psu_advanced_features.py
+examples/psu_basic_control.py
+examples/psu_gui_test.py
+examples/psu_usb_connection.py
+examples/report_generation_example.py
+examples/simple_capture.py
+examples/trigger_based_capture.py
+examples/vector_graphics_xy_mode.py
+examples/waveform_capture.py
+resources/Test Equipment Wide.png
+resources/Test Equipment.icns
+resources/Test Equipment.ico
+resources/Test Equipment.png
+scpi_control/__init__.py
+scpi_control/analysis.py
+scpi_control/automation.py
+scpi_control/awg_models.py
+scpi_control/awg_output.py
+scpi_control/awg_scpi_commands.py
+scpi_control/channel.py
+scpi_control/daq_models.py
+scpi_control/daq_scpi_commands.py
+scpi_control/data_logger.py
+scpi_control/exceptions.py
+scpi_control/function_generator.py
+scpi_control/math_channel.py
+scpi_control/measurement.py
+scpi_control/measurement_config.py
+scpi_control/models.py
+scpi_control/oscilloscope.py
+scpi_control/power_supply.py
+scpi_control/power_supply_output.py
+scpi_control/protocol_decode.py
+scpi_control/psu_data_logger.py
+scpi_control/psu_models.py
+scpi_control/psu_scpi_commands.py
+scpi_control/py.typed
+scpi_control/reference_waveform.py
+scpi_control/scpi_commands.py
+scpi_control/screen_capture.py
+scpi_control/trigger.py
+scpi_control/vector_graphics.py
+scpi_control/waveform.py
+scpi_control/connection/__init__.py
+scpi_control/connection/base.py
+scpi_control/connection/mock.py
+scpi_control/connection/socket.py
+scpi_control/connection/visa_connection.py
+scpi_control/gui/__init__.py
+scpi_control/gui/app.py
+scpi_control/gui/connection_manager.py
+scpi_control/gui/daq_worker.py
+scpi_control/gui/live_view_worker.py
+scpi_control/gui/main_window.py
+scpi_control/gui/vnc_window.py
+scpi_control/gui/waveform_capture_worker.py
+scpi_control/gui/utils/validators.py
+scpi_control/gui/widgets/__init__.py
+scpi_control/gui/widgets/channel_control.py
+scpi_control/gui/widgets/cursor_panel.py
+scpi_control/gui/widgets/daq_ai_panel.py
+scpi_control/gui/widgets/daq_channel_config.py
+scpi_control/gui/widgets/daq_data_view.py
+scpi_control/gui/widgets/daq_scan_config.py
+scpi_control/gui/widgets/data_logger_control.py
+scpi_control/gui/widgets/error_dialog.py
+scpi_control/gui/widgets/fft_display.py
+scpi_control/gui/widgets/math_panel.py
+scpi_control/gui/widgets/measurement_marker.py
+scpi_control/gui/widgets/measurement_panel.py
+scpi_control/gui/widgets/protocol_decode_panel.py
+scpi_control/gui/widgets/psu_control.py
+scpi_control/gui/widgets/reference_panel.py
+scpi_control/gui/widgets/scope_web_view.py
+scpi_control/gui/widgets/terminal_widget.py
+scpi_control/gui/widgets/timebase_control.py
+scpi_control/gui/widgets/trigger_control.py
+scpi_control/gui/widgets/vector_graphics_panel.py
+scpi_control/gui/widgets/visual_measurement_panel.py
+scpi_control/gui/widgets/waveform_display.py
+scpi_control/gui/widgets/waveform_display_pg.py
+scpi_control/gui/widgets/measurement_markers/__init__.py
+scpi_control/gui/widgets/measurement_markers/frequency_marker.py
+scpi_control/gui/widgets/measurement_markers/timing_marker.py
+scpi_control/gui/widgets/measurement_markers/voltage_marker.py
+scpi_control/protocol_decoders/__init__.py
+scpi_control/protocol_decoders/i2c_decoder.py
+scpi_control/protocol_decoders/spi_decoder.py
+scpi_control/protocol_decoders/uart_decoder.py
+scpi_control/report_generator/__init__.py
+scpi_control/report_generator/app.py
+scpi_control/report_generator/main_window.py
+scpi_control/report_generator/generators/__init__.py
+scpi_control/report_generator/generators/base.py
+scpi_control/report_generator/generators/markdown_generator.py
+scpi_control/report_generator/generators/pdf_generator.py
+scpi_control/report_generator/llm/__init__.py
+scpi_control/report_generator/llm/analyzer.py
+scpi_control/report_generator/llm/client.py
+scpi_control/report_generator/llm/context_builder.py
+scpi_control/report_generator/llm/daq_analyzer.py
+scpi_control/report_generator/llm/daq_context_builder.py
+scpi_control/report_generator/llm/daq_prompts.py
+scpi_control/report_generator/llm/prompts.py
+scpi_control/report_generator/models/__init__.py
+scpi_control/report_generator/models/app_settings.py
+scpi_control/report_generator/models/criteria.py
+scpi_control/report_generator/models/plot_style.py
+scpi_control/report_generator/models/report_data.py
+scpi_control/report_generator/models/report_options.py
+scpi_control/report_generator/models/template.py
+scpi_control/report_generator/models/test_types.py
+scpi_control/report_generator/utils/__init__.py
+scpi_control/report_generator/utils/image_handler.py
+scpi_control/report_generator/utils/waveform_analyzer.py
+scpi_control/report_generator/utils/waveform_loader.py
+scpi_control/report_generator/widgets/__init__.py
+scpi_control/report_generator/widgets/ai_analysis_panel.py
+scpi_control/report_generator/widgets/chat_sidebar.py
+scpi_control/report_generator/widgets/llm_settings_dialog.py
+scpi_control/report_generator/widgets/metadata_panel.py
+scpi_control/report_generator/widgets/pdf_preview_dialog.py
+scpi_control/report_generator/widgets/report_options_dialog.py
+scpi_control/report_generator/widgets/template_manager_dialog.py
+siglent/__init__.py
+siglent/exceptions.py

scpi_instrument_control-1.1.0/SCPI_Instrument_Control.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+siglent-gui = scpi_control.gui.app:main
+siglent-report-generator = scpi_control.report_generator.app:main

scpi_instrument_control-1.1.0/SCPI_Instrument_Control.egg-info/top_level.txt

@@ -0,0 +1,2 @@
+scpi_control
+siglent

scpi_instrument_control-1.1.0/examples/data_logger_basic.py

@@ -0,0 +1,147 @@
+"""Basic Data Logger / DAQ example.
+
+This example demonstrates basic usage of the DataLogger class for
+data acquisition systems like the Keysight 34970A/DAQ970A.
+
+Requirements:
+    - A SCPI-compatible DAQ system (Keysight 34970A, DAQ970A, or similar)
+    - Network connection to the instrument
+"""
+
+from scpi_control import DataLogger
+
+# Replace with your DAQ's IP address
+DAQ_IP = "192.168.1.100"
+
+
+def basic_measurements():
+    """Demonstrate basic voltage measurements."""
+    print("=== Basic Voltage Measurements ===\n")
+
+    with DataLogger(DAQ_IP) as daq:
+        print(f"Connected to: {daq.identify()}")
+        print(f"Model: {daq.model_capability.model_name}")
+        print(f"Channels available: {daq.model_capability.get_all_channels()}\n")
+
+        # Configure channels 101-103 for DC voltage measurement
+        channels = [101, 102, 103]
+        daq.configure_voltage_dc(channels, range="AUTO", resolution="AUTO")
+        print(f"Configured channels {channels} for DC voltage\n")
+
+        # Take immediate measurements
+        readings = daq.measure_voltage_dc(channels)
+        print("Measurement results:")
+        for reading in readings:
+            print(f"  Channel {reading.channel}: {reading.value:.6f} {reading.unit}")
+
+
+def scan_multiple_channels():
+    """Demonstrate scanning multiple channels."""
+    print("\n=== Multi-Channel Scan ===\n")
+
+    with DataLogger(DAQ_IP) as daq:
+        # Configure different measurement types on different channels
+        daq.configure_voltage_dc([101, 102], range="10")  # 10V range
+        daq.configure_temperature([103, 104], sensor_type="TC", sensor_subtype="K")
+        daq.configure_resistance([105], four_wire=False)
+
+        # Set up scan list
+        scan_channels = [101, 102, 103, 104, 105]
+        daq.set_scan_list(scan_channels)
+        print(f"Scan list: {daq.get_scan_list()}")
+
+        # Configure trigger for immediate single scan
+        daq.set_trigger_source("IMM")
+        daq.set_trigger_count(1)
+
+        # Initiate and read
+        readings = daq.read()
+        print(f"\nScanned {len(readings)} channels:")
+        for i, reading in enumerate(readings):
+            ch = scan_channels[i] if i < len(scan_channels) else "?"
+            print(f"  Channel {ch}: {reading.value:.6f}")
+
+
+def continuous_logging():
+    """Demonstrate continuous data logging."""
+    print("\n=== Continuous Logging (5 seconds) ===\n")
+
+    with DataLogger(DAQ_IP) as daq:
+        # Configure for voltage monitoring
+        channels = [101, 102]
+        daq.configure_voltage_dc(channels)
+
+        # Log at 1 second intervals for 5 seconds
+        print("Logging for 5 seconds...")
+        all_readings = daq.start_logging(
+            channels=channels,
+            interval=1.0,
+            duration=5.0,
+            callback=lambda r: print(f"  Got {len(r)} readings"),
+        )
+
+        print(f"\nTotal scans collected: {len(all_readings)}")
+        print(f"Total readings: {sum(len(r) for r in all_readings)}")
+
+
+def alarm_monitoring():
+    """Demonstrate alarm/limit checking."""
+    print("\n=== Alarm Monitoring ===\n")
+
+    with DataLogger(DAQ_IP) as daq:
+        if not daq.model_capability.has_alarm:
+            print("This model does not support alarm limits")
+            return
+
+        # Configure voltage measurement with limits
+        channel = 101
+        daq.configure_voltage_dc(channel)
+
+        # Set alarm limits: warn if voltage goes outside 0-5V
+        daq.set_alarm_limits(channel, high=5.0, low=0.0)
+        daq.enable_alarm(channel, enable=True)
+        print(f"Alarm limits set on channel {channel}: 0V to 5V")
+
+        # Take a measurement
+        readings = daq.measure_voltage_dc(channel)
+        print(f"Current reading: {readings[0].value:.3f} V")
+
+
+def scaling_example():
+    """Demonstrate mx+b scaling."""
+    print("\n=== Scaling (mx+b) Example ===\n")
+
+    with DataLogger(DAQ_IP) as daq:
+        if not daq.model_capability.has_math:
+            print("This model does not support scaling")
+            return
+
+        channel = 101
+        daq.configure_voltage_dc(channel)
+
+        # Apply scaling: convert 0-10V input to 0-100% display
+        # Scaled value = (reading * 10) + 0 = percentage
+        daq.set_scaling(channel, gain=10.0, offset=0.0, enable=True)
+        print("Scaling configured: 0-10V input -> 0-100% output")
+
+        readings = daq.measure_voltage_dc(channel)
+        print(f"Raw voltage: {readings[0].value:.3f} V")
+        # Note: scaled value would be returned if DAQ returns scaled data
+
+
+if __name__ == "__main__":
+    print("Data Logger / DAQ Basic Examples")
+    print("================================\n")
+
+    try:
+        basic_measurements()
+        # scan_multiple_channels()
+        # continuous_logging()
+        # alarm_monitoring()
+        # scaling_example()
+    except Exception as e:
+        print(f"Error: {e}")
+        print("\nMake sure:")
+        print(f"  1. Your DAQ is connected at {DAQ_IP}")
+        print("  2. The IP address is correct")
+        print("  3. No other software is using the connection")

{scpi_instrument_control-1.0.0 → scpi_instrument_control-1.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "SCPI-Instrument-Control"
-version = "1.0.0"
+version = "1.1.0"
 description = "Universal Python library for controlling SCPI-compatible test equipment via Ethernet/LAN. Supports oscilloscopes (Siglent SDS series, generic SCPI scopes), function generators/AWGs (Siglent SDG series, generic SCPI AWGs), and power supplies (Siglent SPD series, generic SCPI PSUs). Features include waveform capture, measurements, FFT analysis, PyQt6 GUI, automated report generation with AI analysis, and comprehensive SCPI command abstraction."
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.8"
@@ -122,18 +122,19 @@ all = [
 ]
 
 [project.scripts]
-siglent-gui = "siglent.gui.app:main"
-siglent-report-generator = "siglent.report_generator.app:main"
+siglent-gui = "scpi_control.gui.app:main"
+siglent-report-generator = "scpi_control.report_generator.app:main"
 
 [tool.setuptools]
 include-package-data = true
 
 [tool.setuptools.package-data]
 siglent = ["py.typed"]
+scpi_control = ["py.typed"]
 
 [tool.setuptools.packages.find]
 where = ["."]
-include = ["siglent*"]
+include = ["siglent*", "scpi_control*"]
 
 [tool.black]
 line-length = 100
@@ -158,7 +159,7 @@ filterwarnings = [
 ]
 
 [tool.coverage.run]
-source = ["siglent"]
+source = ["siglent", "scpi_control"]
 omit = [
     "*/tests/*",
     "*/test_*.py",

scpi_instrument_control-1.1.0/scpi_control/__init__.py

@@ -0,0 +1,58 @@
+"""SCPI Instrument Control Package
+
+This package provides programmatic control for SCPI-compatible test equipment
+via Ethernet/LAN connection.
+
+Supported equipment:
+- Oscilloscopes (Siglent SDS series and SCPI-compatible models)
+- Function Generators / AWGs (Siglent SDG series and SCPI-compatible models)
+- Power Supplies (Siglent SPD series and SCPI-compatible models)
+- Data Acquisition / Data Loggers (Keysight 34970A/DAQ970A and SCPI-compatible models)
+
+For high-level automation and data collection, see the automation module:
+    from scpi_control.automation import DataCollector, TriggerWaitCollector
+
+For power supply control:
+    from scpi_control import PowerSupply
+
+For function generator control:
+    from scpi_control import FunctionGenerator
+
+For data acquisition / data logging:
+    from scpi_control import DataLogger
+
+For automated test report generation:
+    from scpi_control.report_generator import ReportGenerator
+"""
+
+__version__ = "1.1.0"
+
+from scpi_control.exceptions import CommandError, SiglentConnectionError, SiglentError, SiglentTimeoutError
+from scpi_control.oscilloscope import Oscilloscope
+
+# Power supply support (stable as of v0.5.0)
+from scpi_control.power_supply import PowerSupply
+from scpi_control.psu_data_logger import PSUDataLogger, TimedPSULogger
+
+# Function generator support (new in v0.6.0, stable in v1.0.0)
+from scpi_control.function_generator import FunctionGenerator
+
+# Data acquisition / Data logger support (new in v1.1.0)
+from scpi_control.data_logger import DataLogger
+
+__all__ = [
+    # Core features
+    "Oscilloscope",
+    "SiglentError",
+    "SiglentConnectionError",
+    "SiglentTimeoutError",
+    "CommandError",
+    # Power supply features
+    "PowerSupply",
+    "PSUDataLogger",
+    "TimedPSULogger",
+    # Function generator features
+    "FunctionGenerator",
+    # Data acquisition features
+    "DataLogger",
+]