Release/v0.18.1 (#10)

tektronix · Sep 23, 2024 · 369e2c2 · 369e2c2
1 parent ae73950
commit 369e2c2
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,13 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
     Fixed -- for any bug fixes.
     Security -- in case of vulnerabilities.
 -->
+
+## [0.18.1]
+
+### Fixed
+- Fixed any type issue for few commands 
+- Fixing command help link is broken for 2600B models
+
 ## [0.18.0]
 
 ### Added
@@ -37,7 +44,9 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 - workflow has been added for generaing json artifacts.
 
 <!--Version Comparison Links-->
-[Unreleased]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/compare/v0.16.0...HEAD
+[Unreleased]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/compare/v0.18.1...HEAD
+[0.18.1]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/releases/tag/v0.18.1
+[0.18.0]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/releases/tag/v0.18.0
 [0.16.0]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/releases/tag/v0.16.0
 [0.15.3]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/releases/tag/v0.15.3
 [0.15.1]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/releases/tag/v0.15.1
diff --git a/Json_parser/Utility.cs b/Json_parser/Utility.cs
@@ -9,6 +9,19 @@ namespace jsonToLuaParser
     class Utility
     {
 
+        private static readonly List<string> MODEL_2600B_MODELS = new List<string>
+        {
+            "2601B",
+            "2611B",
+            "2635B",
+            "2604B",
+            "2614B",
+            "2602B",
+            "2612B",
+            "2634B",
+            "2636B"
+        };
+
         public class Example_Info
         {
             public string example { get; set; }
@@ -616,7 +629,7 @@ public static string get_command_header(CommandInfo cmd, string file_name)
             var command_header = "\n---**" + cmd.name + "**\n"
                 + "----";
 
-            var helpFilePath = $@"{file_name}/{cmd.webhelpfile}";
+            var helpFilePath = $@"{(MODEL_2600B_MODELS.Contains(file_name)?"2600B": file_name )}/{cmd.webhelpfile}";
             command_header += "\n--- **" + cmd.description + "**\n---\n"
             + "--- *Type:*  " + cmd.command_type + "\n---\n"
             + "--- *Details:*<br>\n--- " + cmd.details + "\n---\n"

diff --git a/ParserGeneric/26xx-command_param_data_type.txt b/ParserGeneric/26xx-command_param_data_type.txt
@@ -251,6 +251,7 @@ bits: number
 
 setup.poweron
 id: integer
+N: integer
 
 tsplink.writeprotect
 mask: number
@@ -331,6 +332,9 @@ sourceRangeLow: number
 smuX.source.offlimitY
 sourceLimit: number
 
+smuX.source.protectv
+limit: number
+
 smuX.source.rangeY
 rangeValue: number
 
@@ -868,6 +872,7 @@ model: string
 
 localnode.password
 password: string
+passWord: string
 
 localnode.prompts
 prompting: localnodepromptsprompting
@@ -2729,12 +2734,33 @@ adjustDate: number
 smuX.cal.date
 calDate: number
 
-smua.cal.due
+smuX.cal.due
 calDue: number
 
 smuX.cal.unlock()
 password: string
 
+smuX.interlock.enable
+interlockState: interlockState
+
+smuX.pulser.enable
+enable: pulserState
+
+smuX.pulser.protect.sensev
+level: number
+
+smuX.pulser.protect.tripped
+tripped: boolean
+
+smuX.pulser.protect.sourcev
+level: number
+
+smuX.pulser.measure.aperture
+aperture: number
+
+smuX.pulser.measure.delay
+delay: number
+
 smuX.contact.calibratehi()
 cp1Measured: number
 cp1Reference: number
@@ -2761,6 +2787,9 @@ bufferSize: integer
 smuX.nvbufferY
 bufferVar: bufferVar
 
+smuX.measure.adc
+adc: adcConverter
+
 smuX.measure.calibrateY()
 range: number
 cp1Measured: number
@@ -2834,6 +2863,9 @@ rbuffer: bufferVar
 ibuffer: bufferVar
 vbuffer: bufferVar
 
+smuX.trigger.source.pulsewidth
+pulsewidth: number
+
 smuX.trigger.source.linearY()
 startValue: number
 endValue: number

diff --git a/main.py b/main.py
@@ -56,7 +56,7 @@ def parse():
 
             # for 2601B-PULSE the commands are already having smua.
             # Making this to similar to other 2600 models
-            if Confiurations.MODEL_NUMBER == "2601B-PULSE" and command.startswith('smua.'):
+            if Confiurations.MODEL_NUMBER == "2601B-PULSE" and command.find('smua.')!=-1:
                 command = command.replace("smua", "smuX")
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tektronix/keithley_instrument_libraries",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "",
   "main": "index.js",
   "scripts": {