Skip to content

Commit 2efebcd

Browse files
committed
Merge remote-tracking branch 'origin/bug-update_t8_fw_versions' into develop
2 parents f2840fd + 764269f commit 2efebcd

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

LabJack/LJM/ljm_constants.json

+20
Original file line numberDiff line numberDiff line change
@@ -3050,6 +3050,20 @@
30503050
"tags": ["AIN"],
30513051
"description": "T8 Only. This register is a bitmask representing the enable states of the analog inputs."
30523052
},
3053+
{
3054+
"address": 43702,
3055+
"name": "AIN_ALL_RESOLUTION_INDEX_ACTUAL",
3056+
"type": "UINT32",
3057+
"devices": [
3058+
{
3059+
"device": "T8",
3060+
"fwmin": 0.0123
3061+
}
3062+
],
3063+
"readwrite": "R",
3064+
"tags": ["AIN"],
3065+
"description": "T8 Only. Returns the AIN system's actual resolution index"
3066+
},
30533067
{
30543068
"address": 43710,
30553069
"name": "AIN_SAMPLING_RATE_HZ",
@@ -7922,6 +7936,11 @@
79227936
"string": "AIN_RATE_INVALID",
79237937
"description": "The selected AIN rate configuration is invalid for the desired resolution index or vise-versa."
79247938
},
7939+
{
7940+
"error": 2377,
7941+
"string": "AIN_CHN_DISABLED",
7942+
"description": "The AIN channel has been disabled"
7943+
},
79257944
{
79267945
"error": 2380,
79277946
"string": "LUA_VM_STATE_NO_CHANGE"
@@ -9124,6 +9143,7 @@
91249143
"2023.09.08.B Updated the description for the settling registers",
91259144
"2023.09.25.A Added error code for when an invalid stream trigger is given",
91269145
"2023.10.02.A Edited STREAM_BUFFER_SIZE_BYTES, POWER_AIN_EDFAULT, EF_32BIT_DATA_INTO_16BIT_REG for T8",
9146+
"2023.10.11.A Added T8 AIN_ALL_RESOLUTION_INDEX_ACTUAL register.",
91279147
"See https://github.com/labjack/ljm_constants for further comments.",
91289148
"End Of Comments"
91299149
]

0 commit comments

Comments
 (0)