From 662be59d5c7cd66cceed8997d26aa822c65f5d99 Mon Sep 17 00:00:00 2001 From: amp-bjorn <166574451+amp-bjorn@users.noreply.github.com> Date: Thu, 9 Oct 2025 10:32:04 +1100 Subject: [PATCH 1/4] added ability to use keysight meter added keysight to regex to allow that equipment to be used. --- src/fixate/drivers/lcr/agilent_u1732c.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fixate/drivers/lcr/agilent_u1732c.py b/src/fixate/drivers/lcr/agilent_u1732c.py index 89678e72..0bd2ea67 100644 --- a/src/fixate/drivers/lcr/agilent_u1732c.py +++ b/src/fixate/drivers/lcr/agilent_u1732c.py @@ -79,7 +79,7 @@ class AgilentU1732C(LCR): - REGEX_ID = "Agilent Technologies,U1732C" + "(Keysight|Agilent) Technologies,U1732C" # Regex allows multiple manufacturers INSTR_TYPE = "VISA" def __init__(self, instrument): From 94e09c77f3e5fab03ac4ffe844c195753f31f55b Mon Sep 17 00:00:00 2001 From: amp-bjorn <166574451+amp-bjorn@users.noreply.github.com> Date: Thu, 9 Oct 2025 10:38:28 +1100 Subject: [PATCH 2/4] Update agilent_u1732c.py corrected typo with missing variable name --- src/fixate/drivers/lcr/agilent_u1732c.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fixate/drivers/lcr/agilent_u1732c.py b/src/fixate/drivers/lcr/agilent_u1732c.py index 0bd2ea67..5608a9d3 100644 --- a/src/fixate/drivers/lcr/agilent_u1732c.py +++ b/src/fixate/drivers/lcr/agilent_u1732c.py @@ -79,7 +79,7 @@ class AgilentU1732C(LCR): - "(Keysight|Agilent) Technologies,U1732C" # Regex allows multiple manufacturers + REGEX_ID = "(Keysight|Agilent) Technologies,U1732C" # Regex allows multiple manufacturers INSTR_TYPE = "VISA" def __init__(self, instrument): From b4317a8e37352b645be54e4af16328fbb6f48a4d Mon Sep 17 00:00:00 2001 From: amp-bjorn <166574451+amp-bjorn@users.noreply.github.com> Date: Thu, 9 Oct 2025 10:46:11 +1100 Subject: [PATCH 3/4] Update release-notes.rst updated release notes to show lcr driver changes. --- docs/release-notes.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index bcb9ad19..8c10d60c 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -1,7 +1,14 @@ ================================== Release Notes ================================== +************* +Version 0.6.6 +************* +Release Date 09/10/2025 +Improvements +############ +- LCR Driver now supports instruments reporting as Keysight or Agilent. Newer models of the LCR meter report as Keysight, whereas older models report as Agilent. ************* Version 0.6.5 ************* From 03ef0fa50dfab031cef370ae203f3df99daeb44b Mon Sep 17 00:00:00 2001 From: amp-bjorn <166574451+amp-bjorn@users.noreply.github.com> Date: Thu, 9 Oct 2025 10:51:35 +1100 Subject: [PATCH 4/4] Update release-notes.rst added features to unreleased version 0.6.5 --- docs/release-notes.rst | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 8c10d60c..948cdc76 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -1,14 +1,7 @@ ================================== Release Notes ================================== -************* -Version 0.6.6 -************* -Release Date 09/10/2025 -Improvements -############ -- LCR Driver now supports instruments reporting as Keysight or Agilent. Newer models of the LCR meter report as Keysight, whereas older models report as Agilent. ************* Version 0.6.5 ************* @@ -17,6 +10,7 @@ Release Date xx-xx-xxxx Improvements ############ - Fix bug where DSOX1202G appeared to hang both the program and scope +- LCR Driver now supports instruments reporting as Keysight or Agilent. Newer models of the LCR meter report as Keysight, whereas older models report as Agilent. ************* Version 0.6.4