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

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

@@ -7,15 +7,73 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.0] - 2026-07-15
 
-## [1.0.1] - 2026-01-07
+### ⚠️ Breaking Changes
+
+- **Removed the `siglent` compatibility shim.** `import siglent` now raises
+  `ModuleNotFoundError`; use `import scpi_control` (identical API). The shim
+  had emitted a `DeprecationWarning` since 1.0.0, which announced its removal
+  in v2.0.0. If you cannot migrate yet, pin `SCPI-Instrument-Control<2.0`.
+- **Python 3.9+ required** (was 3.8+; Python 3.8 reached end of life in
+  October 2024). CI now tests Python 3.9 through 3.14.
 
 ### Added
 
+- **Browser-based lab gateway** (`pip install "SCPI-Instrument-Control[web]"`,
+  then `scpi-web` or `python -m scpi_control.server`): a FastAPI server that
+  manages named multi-instrument sessions and serves a React UI to any
+  browser on the LAN. Mock-first — every feature works against the built-in
+  mock scope (`mock: true`).
+  - Live waveform streaming over WebSocket, with channel, timebase, trigger,
+    and acquisition (run/stop/single/auto) controls
+  - LAN instrument discovery and a dashboard-style home screen
+  - Measurements with live values and cross-tab-synchronized selection
+  - Software math channels (M1/M2) streamed as canvas traces
+  - SCPI terminal, instrument screenshot PNG, full-resolution waveform
+    export as CSV and JSON
+  - FFT spectrum view computed server-side from full-resolution data
+    (window selection, peak markers, THD readout)
+  - Software Butterworth filters (lowpass/highpass/bandpass) streamed as
+    F1/F2 traces
+  - Reference waveforms: save named snapshots, ghost overlay on the canvas,
+    live correlation and max-deviation statistics
+  - Measurement trend recording: server-side ring buffer at ~1 Hz, live
+    trend chart, CSV export; the measurement selection locks while recording
+- Dual-dialect SCPI support: legacy (e.g. SDS1104X-E) and modern
+  (e.g. SDS800X HD) Siglent command sets behind one API, auto-detected from
+  `*IDN?` with a manual override
+
 ### Changed
 
+- Connection layer hardened: thread-safe socket handling, exact-length
+  binary reads, default SCPI port 5025
+- `wait_for_trigger` honors a user-configured NORMAL trigger mode instead of
+  forcing SINGLE
+- Black formatting standardized on the 26.x stable style; dev extra now
+  requires `black>=26.5,<27` (installed on Python >= 3.10, where Black 26 is available)
+- Removed the unused `uplot` frontend dependency (the UI draws on a
+  hand-rolled canvas)
+
 ### Fixed
 
+- Mock-fidelity and hardware-behavior fixes from the 2026-07 code audit
+  (trigger vocabulary mapping, waveform preamble parsing, measurement
+  timeout handling, and related issues)
+
+## [1.1.0] - 2026-01-12
+
+### Added
+
+- Data acquisition / data logger instrument support (`DataLogger`): Keysight
+  34970A/DAQ970A-style SCPI units — DMM function configuration (V/I/R/
+  temperature), scan lists, triggering, alarms, channel scaling, and timed
+  logging helpers (PR #39)
+
+## [1.0.1] - 2026-01-07
+
+Packaging and metadata fixes for the 1.0.0 rename release; no functional changes.
+
 ## [1.0.0] - 2026-01-06
 
 ### ⚠️ MAJOR RELEASE - Package Renamed

{scpi_instrument_control-1.1.0 → scpi_instrument_control-2.0.0}/MANIFEST.in

@@ -7,12 +7,14 @@ include pyproject.toml
 # Include user-facing documentation
 recursive-include docs/images *.png *.jpg
 include docs/VISUAL_MEASUREMENTS.md
-include docs/SCREENSHOT_GUIDE.md
 include docs/SDS800XHD_Series_ProgrammingGuide_EN11G.pdf
 
 # Include resources (logos, icons)
 recursive-include resources *.png *.ico *.icns
 
+# Include web gateway frontend build output (when present)
+recursive-include scpi_control/server/static *
+
 # Include examples
 recursive-include examples *.py
 recursive-include examples *.md

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SCPI-Instrument-Control
-Version: 1.1.0
+Version: 2.0.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
@@ -17,11 +17,12 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Manufacturing
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator
@@ -30,7 +31,7 @@ Classifier: Topic :: System :: Networking :: Monitoring
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Environment :: X11 Applications :: Qt
 Classifier: Typing :: Typed
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.24.0
@@ -40,17 +41,20 @@ Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
 Requires-Dist: codecov>=2.1.0; extra == "dev"
-Requires-Dist: black>=23.0; extra == "dev"
+Requires-Dist: black<27,>=26.5; python_version >= "3.10" and extra == "dev"
 Requires-Dist: flake8>=6.0; extra == "dev"
 Requires-Dist: build>=0.10.0; extra == "dev"
 Requires-Dist: twine>=4.0.0; extra == "dev"
-Requires-Dist: black[jupyter]>=23.0; extra == "dev"
 Provides-Extra: hdf5
 Requires-Dist: h5py>=3.8.0; extra == "hdf5"
 Provides-Extra: gui
 Requires-Dist: PyQt6>=6.6.0; extra == "gui"
 Requires-Dist: PyQt6-WebEngine>=6.6.0; extra == "gui"
 Requires-Dist: pyqtgraph>=0.13.0; extra == "gui"
+Provides-Extra: web
+Requires-Dist: fastapi>=0.115; extra == "web"
+Requires-Dist: uvicorn[standard]>=0.30; extra == "web"
+Requires-Dist: Pillow>=10.0; extra == "web"
 Provides-Extra: fun
 Requires-Dist: shapely>=2.0.0; extra == "fun"
 Requires-Dist: Pillow>=10.0.0; extra == "fun"
@@ -312,7 +316,7 @@ pip install "SCPI-Instrument-Control[all]"
 
 #### 2. Update Your Import Statements
 
-**Old imports** (deprecated but still work):
+**Old imports** (no longer work as of v2.0.0):
 
 ```python
 from siglent import Oscilloscope, PowerSupply, FunctionGenerator
@@ -330,16 +334,11 @@ from scpi_control.waveform import Waveform
 
 #### 3. Backward Compatibility
 
-**Good news**: The old `import siglent` syntax still works! A compatibility shim automatically redirects to `scpi_control`.
-
-However, you'll see a `DeprecationWarning` encouraging you to update your code:
-
-```
-DeprecationWarning: The 'siglent' package name is deprecated and will be removed in v2.0.0.
-Please update your imports to use 'scpi_control' instead.
-```
-
-**The compatibility layer will be removed in v2.0.0**, so please migrate your code when convenient.
+The `siglent` compatibility shim was removed in **v2.0.0** (it had emitted a
+`DeprecationWarning` since v1.0.0). `import siglent` now raises
+`ModuleNotFoundError` — update your imports to `scpi_control` as shown above;
+the API is otherwise identical. If you cannot migrate yet, pin
+`SCPI-Instrument-Control<2.0`.
 
 #### 4. Command-Line Tools
 
@@ -357,7 +356,7 @@ No changes needed to scripts or automation that invoke these commands.
 | Old | New | Status |
 |-----|-----|--------|
 | PyPI package: `siglent` | PyPI package: `SCPI-Instrument-Control` | **Changed** |
-| `import siglent` | `import scpi_control` | **Recommended** |
+| `import siglent` | `import scpi_control` | **Required since v2.0.0** |
 | `siglent-gui` command | `siglent-gui` command | **Unchanged** |
 | `siglent-report-generator` command | `siglent-report-generator` command | **Unchanged** |
 
@@ -422,7 +421,7 @@ main()
 
 ### Core Library
 
-- Python 3.8+
+- Python 3.9+
 - NumPy >= 1.24.0
 - Matplotlib >= 3.7.0
 - SciPy >= 1.10.0
@@ -681,6 +680,48 @@ See `examples/vector_graphics_xy_mode.py` for programmatic usage and animation e
 - I2C, SPI, UART, CAN, LIN decoding
 - Packet analysis and export
 
+## Web Gateway (beta)
+
+Control instruments from any browser on your LAN:
+
+```bash
+pip install scpi-instrument-control[web]   # includes the browser gateway
+scpi-web --host 0.0.0.0 --port 8765
+```
+
+Open `http://<gateway-pc>:8765`. Sessions can target real scopes by IP or a
+built-in mock (`mock: true`) for hardware-free use. The API is documented at
+`/docs` (OpenAPI). No authentication in this release — bind to `127.0.0.1`
+(the default) unless your LAN is trusted.
+
+- `GET /api/discover` scans the gateway's subnet (or `?cidr=…`) for SCPI
+  instruments on port 5025 and lists them with model and dialect — handy when
+  DHCP moves your instruments around.
+- `GET .../scope/screenshot.png` — the instrument's display as a PNG
+- `GET .../scope/waveform?channels=1,2&max_points=N` — waveform data as JSON
+- `GET/PATCH .../scope/math/{1,2}` — software math channels (streamed as M1/M2 traces)
+- `GET .../scope/measurements` — the current measurement selection
+- `GET/PATCH .../scope/spectrum` — server-computed FFT spectrum (streamed as `spectrum` frames)
+- `GET .../scope/filters` + `PATCH .../scope/filters/{1,2}` — software Butterworth filters (streamed as F1/F2 traces)
+- `GET/POST/DELETE .../scope/references` + `GET/PUT .../scope/reference` — saved reference waveforms and the live overlay
+- `POST .../scope/log/start` / `POST .../scope/log/stop` — record the selected measurements (~1 Hz) server-side
+- `GET .../scope/log`, `GET .../scope/log/data?since=`, `GET .../scope/log.csv` — recording status, rows, and CSV export
+
+### Browser UI
+
+```bash
+make webapp-install       # once
+make webapp-build         # build the UI into the server
+scpi-web --host 0.0.0.0   # serve API + UI on one port
+```
+
+Open `http://<gateway-pc>:8765`. For UI development, run `scpi-web` in one
+terminal and `cd webapp/app && npm run dev` in another — Vite proxies `/api`
+(HTTP and WebSocket) to the gateway with hot reload.
+
+The home screen scans your LAN and lists instruments to connect to, resume, or
+open a shared session on — plus manual IP and a hardware-free mock.
+
 ## API Documentation
 
 ### Oscilloscope

{scpi_instrument_control-1.1.0 → scpi_instrument_control-2.0.0}/README.md

@@ -222,7 +222,7 @@ pip install "SCPI-Instrument-Control[all]"
 
 #### 2. Update Your Import Statements
 
-**Old imports** (deprecated but still work):
+**Old imports** (no longer work as of v2.0.0):
 
 ```python
 from siglent import Oscilloscope, PowerSupply, FunctionGenerator
@@ -240,16 +240,11 @@ from scpi_control.waveform import Waveform
 
 #### 3. Backward Compatibility
 
-**Good news**: The old `import siglent` syntax still works! A compatibility shim automatically redirects to `scpi_control`.
-
-However, you'll see a `DeprecationWarning` encouraging you to update your code:
-
-```
-DeprecationWarning: The 'siglent' package name is deprecated and will be removed in v2.0.0.
-Please update your imports to use 'scpi_control' instead.
-```
-
-**The compatibility layer will be removed in v2.0.0**, so please migrate your code when convenient.
+The `siglent` compatibility shim was removed in **v2.0.0** (it had emitted a
+`DeprecationWarning` since v1.0.0). `import siglent` now raises
+`ModuleNotFoundError` — update your imports to `scpi_control` as shown above;
+the API is otherwise identical. If you cannot migrate yet, pin
+`SCPI-Instrument-Control<2.0`.
 
 #### 4. Command-Line Tools
 
@@ -267,7 +262,7 @@ No changes needed to scripts or automation that invoke these commands.
 | Old | New | Status |
 |-----|-----|--------|
 | PyPI package: `siglent` | PyPI package: `SCPI-Instrument-Control` | **Changed** |
-| `import siglent` | `import scpi_control` | **Recommended** |
+| `import siglent` | `import scpi_control` | **Required since v2.0.0** |
 | `siglent-gui` command | `siglent-gui` command | **Unchanged** |
 | `siglent-report-generator` command | `siglent-report-generator` command | **Unchanged** |
 
@@ -332,7 +327,7 @@ main()
 
 ### Core Library
 
-- Python 3.8+
+- Python 3.9+
 - NumPy >= 1.24.0
 - Matplotlib >= 3.7.0
 - SciPy >= 1.10.0
@@ -591,6 +586,48 @@ See `examples/vector_graphics_xy_mode.py` for programmatic usage and animation e
 - I2C, SPI, UART, CAN, LIN decoding
 - Packet analysis and export
 
+## Web Gateway (beta)
+
+Control instruments from any browser on your LAN:
+
+```bash
+pip install scpi-instrument-control[web]   # includes the browser gateway
+scpi-web --host 0.0.0.0 --port 8765
+```
+
+Open `http://<gateway-pc>:8765`. Sessions can target real scopes by IP or a
+built-in mock (`mock: true`) for hardware-free use. The API is documented at
+`/docs` (OpenAPI). No authentication in this release — bind to `127.0.0.1`
+(the default) unless your LAN is trusted.
+
+- `GET /api/discover` scans the gateway's subnet (or `?cidr=…`) for SCPI
+  instruments on port 5025 and lists them with model and dialect — handy when
+  DHCP moves your instruments around.
+- `GET .../scope/screenshot.png` — the instrument's display as a PNG
+- `GET .../scope/waveform?channels=1,2&max_points=N` — waveform data as JSON
+- `GET/PATCH .../scope/math/{1,2}` — software math channels (streamed as M1/M2 traces)
+- `GET .../scope/measurements` — the current measurement selection
+- `GET/PATCH .../scope/spectrum` — server-computed FFT spectrum (streamed as `spectrum` frames)
+- `GET .../scope/filters` + `PATCH .../scope/filters/{1,2}` — software Butterworth filters (streamed as F1/F2 traces)
+- `GET/POST/DELETE .../scope/references` + `GET/PUT .../scope/reference` — saved reference waveforms and the live overlay
+- `POST .../scope/log/start` / `POST .../scope/log/stop` — record the selected measurements (~1 Hz) server-side
+- `GET .../scope/log`, `GET .../scope/log/data?since=`, `GET .../scope/log.csv` — recording status, rows, and CSV export
+
+### Browser UI
+
+```bash
+make webapp-install       # once
+make webapp-build         # build the UI into the server
+scpi-web --host 0.0.0.0   # serve API + UI on one port
+```
+
+Open `http://<gateway-pc>:8765`. For UI development, run `scpi-web` in one
+terminal and `cd webapp/app && npm run dev` in another — Vite proxies `/api`
+(HTTP and WebSocket) to the gateway with hot reload.
+
+The home screen scans your LAN and lists instruments to connect to, resume, or
+open a shared session on — plus manual IP and a hardware-free mock.
+
 ## API Documentation
 
 ### Oscilloscope

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SCPI-Instrument-Control
-Version: 1.1.0
+Version: 2.0.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
@@ -17,11 +17,12 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Manufacturing
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator
@@ -30,7 +31,7 @@ Classifier: Topic :: System :: Networking :: Monitoring
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Environment :: X11 Applications :: Qt
 Classifier: Typing :: Typed
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.24.0
@@ -40,17 +41,20 @@ Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
 Requires-Dist: codecov>=2.1.0; extra == "dev"
-Requires-Dist: black>=23.0; extra == "dev"
+Requires-Dist: black<27,>=26.5; python_version >= "3.10" and extra == "dev"
 Requires-Dist: flake8>=6.0; extra == "dev"
 Requires-Dist: build>=0.10.0; extra == "dev"
 Requires-Dist: twine>=4.0.0; extra == "dev"
-Requires-Dist: black[jupyter]>=23.0; extra == "dev"
 Provides-Extra: hdf5
 Requires-Dist: h5py>=3.8.0; extra == "hdf5"
 Provides-Extra: gui
 Requires-Dist: PyQt6>=6.6.0; extra == "gui"
 Requires-Dist: PyQt6-WebEngine>=6.6.0; extra == "gui"
 Requires-Dist: pyqtgraph>=0.13.0; extra == "gui"
+Provides-Extra: web
+Requires-Dist: fastapi>=0.115; extra == "web"
+Requires-Dist: uvicorn[standard]>=0.30; extra == "web"
+Requires-Dist: Pillow>=10.0; extra == "web"
 Provides-Extra: fun
 Requires-Dist: shapely>=2.0.0; extra == "fun"
 Requires-Dist: Pillow>=10.0.0; extra == "fun"
@@ -312,7 +316,7 @@ pip install "SCPI-Instrument-Control[all]"
 
 #### 2. Update Your Import Statements
 
-**Old imports** (deprecated but still work):
+**Old imports** (no longer work as of v2.0.0):
 
 ```python
 from siglent import Oscilloscope, PowerSupply, FunctionGenerator
@@ -330,16 +334,11 @@ from scpi_control.waveform import Waveform
 
 #### 3. Backward Compatibility
 
-**Good news**: The old `import siglent` syntax still works! A compatibility shim automatically redirects to `scpi_control`.
-
-However, you'll see a `DeprecationWarning` encouraging you to update your code:
-
-```
-DeprecationWarning: The 'siglent' package name is deprecated and will be removed in v2.0.0.
-Please update your imports to use 'scpi_control' instead.
-```
-
-**The compatibility layer will be removed in v2.0.0**, so please migrate your code when convenient.
+The `siglent` compatibility shim was removed in **v2.0.0** (it had emitted a
+`DeprecationWarning` since v1.0.0). `import siglent` now raises
+`ModuleNotFoundError` — update your imports to `scpi_control` as shown above;
+the API is otherwise identical. If you cannot migrate yet, pin
+`SCPI-Instrument-Control<2.0`.
 
 #### 4. Command-Line Tools
 
@@ -357,7 +356,7 @@ No changes needed to scripts or automation that invoke these commands.
 | Old | New | Status |
 |-----|-----|--------|
 | PyPI package: `siglent` | PyPI package: `SCPI-Instrument-Control` | **Changed** |
-| `import siglent` | `import scpi_control` | **Recommended** |
+| `import siglent` | `import scpi_control` | **Required since v2.0.0** |
 | `siglent-gui` command | `siglent-gui` command | **Unchanged** |
 | `siglent-report-generator` command | `siglent-report-generator` command | **Unchanged** |
 
@@ -422,7 +421,7 @@ main()
 
 ### Core Library
 
-- Python 3.8+
+- Python 3.9+
 - NumPy >= 1.24.0
 - Matplotlib >= 3.7.0
 - SciPy >= 1.10.0
@@ -681,6 +680,48 @@ See `examples/vector_graphics_xy_mode.py` for programmatic usage and animation e
 - I2C, SPI, UART, CAN, LIN decoding
 - Packet analysis and export
 
+## Web Gateway (beta)
+
+Control instruments from any browser on your LAN:
+
+```bash
+pip install scpi-instrument-control[web]   # includes the browser gateway
+scpi-web --host 0.0.0.0 --port 8765
+```
+
+Open `http://<gateway-pc>:8765`. Sessions can target real scopes by IP or a
+built-in mock (`mock: true`) for hardware-free use. The API is documented at
+`/docs` (OpenAPI). No authentication in this release — bind to `127.0.0.1`
+(the default) unless your LAN is trusted.
+
+- `GET /api/discover` scans the gateway's subnet (or `?cidr=…`) for SCPI
+  instruments on port 5025 and lists them with model and dialect — handy when
+  DHCP moves your instruments around.
+- `GET .../scope/screenshot.png` — the instrument's display as a PNG
+- `GET .../scope/waveform?channels=1,2&max_points=N` — waveform data as JSON
+- `GET/PATCH .../scope/math/{1,2}` — software math channels (streamed as M1/M2 traces)
+- `GET .../scope/measurements` — the current measurement selection
+- `GET/PATCH .../scope/spectrum` — server-computed FFT spectrum (streamed as `spectrum` frames)
+- `GET .../scope/filters` + `PATCH .../scope/filters/{1,2}` — software Butterworth filters (streamed as F1/F2 traces)
+- `GET/POST/DELETE .../scope/references` + `GET/PUT .../scope/reference` — saved reference waveforms and the live overlay
+- `POST .../scope/log/start` / `POST .../scope/log/stop` — record the selected measurements (~1 Hz) server-side
+- `GET .../scope/log`, `GET .../scope/log/data?since=`, `GET .../scope/log.csv` — recording status, rows, and CSV export
+
+### Browser UI
+
+```bash
+make webapp-install       # once
+make webapp-build         # build the UI into the server
+scpi-web --host 0.0.0.0   # serve API + UI on one port
+```
+
+Open `http://<gateway-pc>:8765`. For UI development, run `scpi-web` in one
+terminal and `cd webapp/app && npm run dev` in another — Vite proxies `/api`
+(HTTP and WebSocket) to the gateway with hot reload.
+
+The home screen scans your LAN and lists instruments to connect to, resume, or
+open a shared session on — plus manual IP and a hardware-free mock.
+
 ## API Documentation
 
 ### Oscilloscope

{scpi_instrument_control-1.1.0 → scpi_instrument_control-2.0.0}/SCPI_Instrument_Control.egg-info/SOURCES.txt

@@ -152,5 +152,19 @@ 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_control/server/__init__.py
+scpi_control/server/__main__.py
+scpi_control/server/app.py
+scpi_control/server/compute.py
+scpi_control/server/discovery.py
+scpi_control/server/recorder.py
+scpi_control/server/schemas.py
+scpi_control/server/sessions.py
+scpi_control/server/api/__init__.py
+scpi_control/server/api/discovery.py
+scpi_control/server/api/scope.py
+scpi_control/server/api/sessions.py
+scpi_control/server/api/stream.py
+scpi_control/server/static/index.html
+scpi_control/server/static/assets/index-0Vpguwg6.js
+scpi_control/server/static/assets/index-CyUPLIHk.css

{scpi_instrument_control-1.1.0 → scpi_instrument_control-2.0.0}/SCPI_Instrument_Control.egg-info/entry_points.txt

@@ -1,3 +1,4 @@
 [console_scripts]
+scpi-web = scpi_control.server.__main__:main
 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-2.0.0}/SCPI_Instrument_Control.egg-info/requires.txt

@@ -21,11 +21,12 @@ pyinstaller>=6.0.0
 pytest>=7.0
 pytest-cov>=4.0.0
 codecov>=2.1.0
-black>=23.0
 flake8>=6.0
 build>=0.10.0
 twine>=4.0.0
-black[jupyter]>=23.0
+
+[dev:python_version >= "3.10"]
+black<27,>=26.5
 
 [docs]
 mkdocs>=1.5.0
@@ -62,3 +63,8 @@ ollama>=0.6.0
 [usb]
 pyvisa>=1.14.0
 pyvisa-py>=0.7.0
+
+[web]
+fastapi>=0.115
+uvicorn[standard]>=0.30
+Pillow>=10.0

{scpi_instrument_control-1.1.0 → scpi_instrument_control-2.0.0}/SCPI_Instrument_Control.egg-info/top_level.txt

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

{scpi_instrument_control-1.1.0 → scpi_instrument_control-2.0.0}/examples/README.md

@@ -232,7 +232,7 @@ collector.save_data(waveforms, 'output.mat', format='mat')
 ## Quick Start - Programmatic API
 
 ```python
-from siglent.automation import DataCollector
+from scpi_control.automation import DataCollector
 
 # Simple capture
 with DataCollector('192.168.1.100') as collector:
@@ -245,7 +245,7 @@ with DataCollector('192.168.1.100') as collector:
 ## Tips
 
 - Make sure your oscilloscope is connected to the same network as your computer
-- Ensure the SCPI port (5024) is accessible
+- Ensure the SCPI port (5025) is accessible
 - Some commands may vary slightly between oscilloscope models - refer to your programming manual
 - Enable at least one channel before capturing waveforms
 - Use AUTO trigger mode for continuous acquisition

{scpi_instrument_control-1.1.0 → scpi_instrument_control-2.0.0}/examples/function_generator_basic.py

@@ -11,7 +11,7 @@ Supported models:
 Requirements:
 - Function generator connected to network
 - IP address configured on generator
-- Default SCPI port: 5024
+- Default SCPI port: 5025
 
 Usage:
     python function_generator_basic.py --ip 192.168.1.100
@@ -32,7 +32,7 @@ def main():
     """Main function to demonstrate AWG control."""
     parser = argparse.ArgumentParser(description="Control Siglent Function Generator")
     parser.add_argument("--ip", type=str, default="192.168.1.100", help="Function generator IP address")
-    parser.add_argument("--port", type=int, default=5024, help="SCPI port (default: 5024)")
+    parser.add_argument("--port", type=int, default=5025, help="SCPI port (default: 5025)")
     args = parser.parse_args()
 
     logger.info(f"Connecting to function generator at {args.ip}:{args.port}")