Skip to content

Commit b289955

Browse files
committed
Updated files for tagged release 10-22-2012
1 parent 14abb4f commit b289955

File tree

4 files changed

+61
-8
lines changed

4 files changed

+61
-8
lines changed

ChangeLog.txt

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,3 +169,43 @@ Version History
169169
conversions were taking place for channels > 3 on U3-HVs.
170170
- Fixed the Handle parameter name in the AddRequest method.
171171
- Fixed a LabJackException throw in U12.write. Now throws an U12Exception.
172+
- October 22, 2012
173+
- Fixed a U3 and U6 stream bug when SamplesPerPacket was less than 25.
174+
- Changed UE9 TCP stream reads on Linux/MacOS X to return the packet as a
175+
a string. Makes it consistent with all other stream reads.
176+
- Added streaming support to the UE9 class.
177+
- Updated stream examples to include the UE9.
178+
- Added negative channel 32 support to U3 streaming methods.
179+
- In the U3 stream examples, added the getCalibrationData call for
180+
calibrated readings.
181+
- Fixed U3 voltageToDACBits method to handle uncalibrated 16 bit
182+
conversions and changed the formula to use nominal slope and offset.
183+
- Fixed broken U6-Pro hi-res support.
184+
- Added voltageToDACBits function to UE9 and U6 classes.
185+
- Cleaned up and added some U6 class documentation.
186+
- Fixed UE9 feedback function for DAC1.
187+
- Fixed UE9 watchdogConfig and watchdogRead functions.
188+
- Fixed how UE9-Pro calibration constants are applied when BipGain = 0 or
189+
8 and Resolution < 18.
190+
- Added resolution parameter to UE9 binaryToCalibratedAnalogVoltage method.
191+
- Updated streamConfig function in classes. Added ScanFrequency and
192+
deprecated SampleFrequency parameters.
193+
- Updated streamTest.py to use ScanFrequency, 2 channels, and take both
194+
scan and sample rates into consideration.
195+
- Tweaked UE9 streamConfig and streamData.
196+
- In streamData over TCP, packet buffering was implemented to return
197+
packetsPerRequest*16 samples like over USB.
198+
- Updated stream example to count packets instead of assuming all expected
199+
packets arrived.
200+
- Fixed U6 Timer Feedback command classes so all timers can be used.
201+
- Fixed setDIOState member in the LabJackPython class.
202+
- Removed UE9 TCP requirement of opening the Modbus port on Linux/Mac OS X.
203+
- Now setting the socket timeout before opening TCP ports for faster open
204+
errors.
205+
- Added setDOState, getDIState and getDIOState methods to U3 and U6
206+
classes.
207+
- Fixed the U12 eDigitalOut method when setting D8 to D15 states.
208+
- Fixed the U12 eDigitalIn method when reading D lines.
209+
- Updated the UD driver (v3.25) constants in the LabJackPython module.
210+
- Fixed configU3 to set TimerClockConfig, TimerClockDivisor and
211+
CompatibilityOptions settings properly.

README

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
11
LabJackPython: Cross-platform (Windows, Linux, Mac OS X) Python module and
22
examples for LabJack devices.
3-
08/26/2011
3+
10/22/2012
44
support@labjack.com
55

6-
Python 2.5 or higher is required to use LabJackPython. To use the UE9
7-
over Ethernet, install comm firmware 1.50 or higher. At the moment it’s
8-
on the beta page:
6+
Python 2.5 or higher is required to use LabJackPython. Python 3.x is not
7+
supported.
8+
9+
To use Modbus first check that your LabJack device meets the minimum required
10+
firmware version listed on this page:
11+
12+
http://labjack.com/support/modbus
13+
14+
To upgrade firmware look at this page:
15+
16+
http://labjack.com/support/firmware
17+
18+
To use Modbus on a UE9 over Ethernet, install Comm firmware 1.50 or higher.
19+
At the moment it’s on the beta page:
920

1021
http://labjack.com/support/firmware/ue9/beta
1122

12-
Installation is easy:
23+
To install LabJackPython, run the following command in a terminal:
24+
1325
$ sudo python setup.py install
1426

1527
(Leave off the `sudo' on Windows.)
@@ -55,7 +67,8 @@ For U12:
5567
}
5668
>>> d.close()
5769

58-
From there, check the Examples/ directory, especially the workingWithModbus.py file to get started.
70+
From there, check the Examples/ directory, especially the workingWithModbus.py
71+
file to get started.
5972

6073

6174
LICENSE

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from distutils.core import setup
22
setup(name='LabJackPython',
3-
version='8-26-2011',
3+
version='10-22-2012',
44
description='The LabJack python module.',
55
url='http://www.labjack.com/support/labjackpython',
66
author='The LabJack crew',

src/LabJackPython.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import atexit # For auto-closing devices
2020
import threading # For a thread-safe device lock
2121

22-
LABJACKPYTHON_VERSION = "8-26-2011"
22+
LABJACKPYTHON_VERSION = "10-22-2012"
2323

2424
SOCKET_TIMEOUT = 3
2525
LJSOCKET_TIMEOUT = 62

0 commit comments

Comments
 (0)