Fix remaining NIDAQmx references after rename

kalidke · claude · kalidke · commit 58cd70a927de · 2026-01-29T22:02:59.000-07:00
- Fix critical bug: getfield(NIDAQmx, ...) → getfield(DAQmx, ...) in properties.jl
- Fix CI.yml doctest to use DAQmx module
- Update all source file comments to use DAQmx.jl (package) or NI-DAQmx (driver)

Co-Authored-By: Claude Opus 4.5 &lt;noreply@anthropic.com&gt;
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -67,6 +67,6 @@ jobs:
         shell: julia --project=docs --color=yes {0}
         run: |
           using Documenter: DocMeta, doctest
-          using NIDAQmx
-          DocMeta.setdocmeta!(NIDAQmx, :DocTestSetup, :(using NIDAQmx); recursive=true)
-          doctest(NIDAQmx)
+          using DAQmx
+          DocMeta.setdocmeta!(DAQmx, :DocTestSetup, :(using DAQmx); recursive=true)
+          doctest(DAQmx)
diff --git a/src/channels/analog.jl b/src/channels/analog.jl
@@ -1,4 +1,4 @@
-# Analog channel functions for NIDAQmx.jl
+# Analog channel functions for DAQmx.jl
 
 """
     add_ai_voltage!(task::AITask, channel::String;
diff --git a/src/channels/counter.jl b/src/channels/counter.jl
@@ -1,4 +1,4 @@
-# Counter channel functions for NIDAQmx.jl
+# Counter channel functions for DAQmx.jl
 
 """
     add_ci_count_edges!(task::CITask, counter::String;
diff --git a/src/channels/digital.jl b/src/channels/digital.jl
@@ -1,4 +1,4 @@
-# Digital channel functions for NIDAQmx.jl
+# Digital channel functions for DAQmx.jl
 
 """
     add_di_chan!(task::DITask, lines::String;
diff --git a/src/devices.jl b/src/devices.jl
@@ -1,4 +1,4 @@
-# Device enumeration and information for NIDAQmx.jl
+# Device enumeration and information for DAQmx.jl
 
 """
     Device
@@ -19,7 +19,7 @@ end
 """
     devices() -> Vector{Device}
 
-Get a list of all available NIDAQmx devices.
+Get a list of all available NI-DAQmx devices.
 
 # Returns
 - A vector of `Device` objects representing available devices.
diff --git a/src/errors.jl b/src/errors.jl
@@ -1,7 +1,7 @@
-# Error handling for NIDAQmx
+# Error handling for DAQmx.jl
 
 # Helper functions for pointer type conversions
-# NIDAQmx generated functions expect Ptr{Cchar} for strings
+# NI-DAQmx generated functions expect Ptr{Cchar} for strings
 _cstr(s::String) = Ptr{Cchar}(pointer(s))
 const NULLSTR = Ptr{Cchar}()
 
@@ -45,7 +45,7 @@ end
 """
     get_error_message(code::Int32) -> String
 
-Retrieve the error message string for a given NIDAQmx error or warning code.
+Retrieve the error message string for a given NI-DAQmx error or warning code.
 """
 function get_error_message(code::Int32)
     # First call to get buffer size
@@ -82,14 +82,14 @@ end
 """
     check_error(code::Int32)
 
-Check a NIDAQmx return code and handle errors/warnings appropriately.
+Check an NI-DAQmx return code and handle errors/warnings appropriately.
 
 - If `code == 0`: Success, returns `nothing`.
 - If `code > 0`: Warning, logs a warning message and returns `nothing`.
-- If `code < 0`: Error, throws a `NIDAQError` exception.
+- If `code < 0`: Error, throws a `DAQmxError` exception.
 
 # Arguments
-- `code::Int32`: The return code from a NIDAQmx function.
+- `code::Int32`: The return code from an NI-DAQmx function.
 
 # Throws
 - `DAQmxError`: If `code < 0`.
@@ -117,7 +117,7 @@ end
 """
     @check expr
 
-Macro to check the return code of a NIDAQmx function call.
+Macro to check the return code of an NI-DAQmx function call.
 
 # Example
 ```julia
diff --git a/src/generated/constants.jl b/src/generated/constants.jl
@@ -1,4 +1,4 @@
-# Auto-generated constants for NIDAQmx
+# Auto-generated constants for NI-DAQmx
 # Do not edit manually - regenerate using gen/generator.jl
 
 # Buffer properties
diff --git a/src/generated/functions.jl b/src/generated/functions.jl
@@ -1,4 +1,4 @@
-# Auto-generated function bindings for NIDAQmx
+# Auto-generated function bindings for NI-DAQmx
 # Do not edit manually - regenerate using gen/generator.jl
 
 # Task management
diff --git a/src/generated/types.jl b/src/generated/types.jl
@@ -1,7 +1,7 @@
-# Auto-generated type definitions for NIDAQmx
+# Auto-generated type definitions for NI-DAQmx
 # Do not edit manually - regenerate using gen/generator.jl
 
-# Basic numeric type aliases matching NIDAQmx C types
+# Basic numeric type aliases matching NI-DAQmx C types
 const int8 = Int8
 const uInt8 = Cuchar
 const int16 = Cshort
@@ -13,7 +13,7 @@ const float64 = Cdouble
 const int64 = Clonglong
 const uInt64 = Culonglong
 
-# String type for NIDAQmx (varies by platform)
+# String type for NI-DAQmx (varies by platform)
 const dType = Cchar
 
 # Bool32 as a proper Julia type
diff --git a/src/io.jl b/src/io.jl
@@ -1,4 +1,4 @@
-# Read/Write operations for NIDAQmx.jl
+# Read/Write operations for DAQmx.jl
 
 # ============================================================================
 # Analog Input Read
diff --git a/src/library.jl b/src/library.jl
@@ -1,9 +1,9 @@
-# Library loading and version detection for NIDAQmx
+# Library loading and version detection for DAQmx.jl
 
 """
     libnidaq
 
-The path to the NIDAQmx shared library. Automatically detected based on the operating system.
+The path to the NI-DAQmx shared library. Automatically detected based on the operating system.
 """
 const libnidaq = if Sys.iswindows()
     "nicaiu.dll"
@@ -16,7 +16,7 @@ end
 """
     DAQmxVersion
 
-Holds the version information for the NIDAQmx driver.
+Holds the version information for the NI-DAQmx driver.
 """
 struct DAQmxVersion
     major::UInt32
@@ -33,18 +33,18 @@ Base.VersionNumber(v::DAQmxVersion) = VersionNumber(v.major, v.minor, v.update)
 """
     library_version() -> DAQmxVersion
 
-Query the installed NIDAQmx driver version.
+Query the installed NI-DAQmx driver version.
 
 # Returns
-- `DAQmxVersion`: The version of the installed NIDAQmx driver.
+- `DAQmxVersion`: The version of the installed NI-DAQmx driver.
 
 # Throws
 - `NIDAQError`: If the version cannot be determined.
 
 # Example
 ```julia
 julia> v = library_version()
-NIDAQmx v23.5.0
+NI-DAQmx v23.5.0
 
 julia> VersionNumber(v)
 v"23.5.0"
@@ -65,7 +65,7 @@ end
 """
     is_library_available() -> Bool
 
-Check if the NIDAQmx library is available on the system.
+Check if the NI-DAQmx library is available on the system.
 
 # Returns
 - `true` if the library can be loaded, `false` otherwise.
diff --git a/src/properties.jl b/src/properties.jl
@@ -1,4 +1,4 @@
-# Type-safe property system for NIDAQmx.jl
+# Type-safe property system for DAQmx.jl
 
 # ============================================================================
 # Property Metadata Definition
@@ -7,7 +7,7 @@
 """
     PropertyDef
 
-Defines metadata for a NIDAQmx property including getter/setter functions and type.
+Defines metadata for an NI-DAQmx property including getter/setter functions and type.
 """
 struct PropertyDef
     getter::Symbol
@@ -99,7 +99,7 @@ end
     measurement_type(task::Task, channel::String) -> Int32
 
 Get the measurement or output type for a channel.
-Returns the NIDAQmx constant value.
+Returns the NI-DAQmx constant value.
 """
 function measurement_type(task::Task, channel::String)
     ctype = channel_type(task, channel)
@@ -141,7 +141,7 @@ function get_channel_property(task::Task, channel::String, property::Symbol)
     end
 
     prop_def = CHANNEL_PROPERTIES[property]
-    getter = getfield(NIDAQmx, prop_def.getter)
+    getter = getfield(DAQmx, prop_def.getter)
 
     val = Ref{prop_def.value_type}(zero(prop_def.value_type))
     @check getter(task.handle, _cstr(channel), val)
@@ -170,7 +170,7 @@ function set_channel_property!(task::Task, channel::String, property::Symbol, va
         throw(ArgumentError("Property $property is read-only"))
     end
 
-    setter = getfield(NIDAQmx, prop_def.setter)
+    setter = getfield(DAQmx, prop_def.setter)
     @check setter(task.handle, _cstr(channel), convert(prop_def.value_type, value))
     return nothing
 end
@@ -186,7 +186,7 @@ function get_task_property(task::Task, property::Symbol)
     end
 
     prop_def = TASK_PROPERTIES[property]
-    getter = getfield(NIDAQmx, prop_def.getter)
+    getter = getfield(DAQmx, prop_def.getter)
 
     val = Ref{prop_def.value_type}(zero(prop_def.value_type))
     @check getter(task.handle, val)
@@ -209,7 +209,7 @@ function set_task_property!(task::Task, property::Symbol, value)
         throw(ArgumentError("Property $property is read-only"))
     end
 
-    setter = getfield(NIDAQmx, prop_def.setter)
+    setter = getfield(DAQmx, prop_def.setter)
     @check setter(task.handle, convert(prop_def.value_type, value))
     return nothing
 end
diff --git a/src/tasks.jl b/src/tasks.jl
@@ -1,4 +1,4 @@
-# Task lifecycle management for NIDAQmx.jl
+# Task lifecycle management for DAQmx.jl
 
 """
     start!(task::Task)
diff --git a/src/timing.jl b/src/timing.jl
@@ -1,4 +1,4 @@
-# Timing configuration for NIDAQmx.jl
+# Timing configuration for DAQmx.jl
 
 """
     configure_timing!(task::Task;
diff --git a/src/types.jl b/src/types.jl
@@ -1,4 +1,4 @@
-# Type definitions for NIDAQmx.jl
+# Type definitions for DAQmx.jl
 
 # ============================================================================
 # Task Types - Using parametric types instead of @eval loops
@@ -21,11 +21,11 @@ struct CounterOutputKind <: TaskKind end
 """
     Task{K<:TaskKind}
 
-A NIDAQmx task with parametric type for the task kind.
+An NI-DAQmx task with parametric type for the task kind.
 This allows for type-safe dispatch on different task types.
 
 # Fields
-- `handle::TaskHandle`: The underlying NIDAQmx task handle.
+- `handle::TaskHandle`: The underlying NI-DAQmx task handle.
 - `name::String`: The name of the task.
 
 # Type Aliases
@@ -85,7 +85,7 @@ end
 """
     create_task(name::String="") -> TaskHandle
 
-Create a new NIDAQmx task and return its handle.
+Create a new NI-DAQmx task and return its handle.
 """
 function create_task(name::String="")
     handle_ref = Ref{TaskHandle}(C_NULL)
@@ -341,7 +341,7 @@ end
 """
     task_handle(task::Task) -> TaskHandle
 
-Get the underlying NIDAQmx handle for a task.
+Get the underlying NI-DAQmx handle for a task.
 """
 task_handle(task::Task) = task.handle
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Analog channel functions for NIDAQmx.jl`
	`1`	`+# Analog channel functions for DAQmx.jl`
`2`	`2`
`3`	`3`	`"""`
`4`	`4`	`add_ai_voltage!(task::AITask, channel::String;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Counter channel functions for NIDAQmx.jl`
	`1`	`+# Counter channel functions for DAQmx.jl`
`2`	`2`
`3`	`3`	`"""`
`4`	`4`	`add_ci_count_edges!(task::CITask, counter::String;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Digital channel functions for NIDAQmx.jl`
	`1`	`+# Digital channel functions for DAQmx.jl`
`2`	`2`
`3`	`3`	`"""`
`4`	`4`	`add_di_chan!(task::DITask, lines::String;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Auto-generated constants for NIDAQmx`
	`1`	`+# Auto-generated constants for NI-DAQmx`
`2`	`2`	`# Do not edit manually - regenerate using gen/generator.jl`
`3`	`3`
`4`	`4`	`# Buffer properties`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Auto-generated function bindings for NIDAQmx`
	`1`	`+# Auto-generated function bindings for NI-DAQmx`
`2`	`2`	`# Do not edit manually - regenerate using gen/generator.jl`
`3`	`3`
`4`	`4`	`# Task management`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Read/Write operations for NIDAQmx.jl`
	`1`	`+# Read/Write operations for DAQmx.jl`
`2`	`2`
`3`	`3`	`# ============================================================================`
`4`	`4`	`# Analog Input Read`