Commit 51481b5b9e979f51ea1618817e6670013908f19f
1 parent
c8effdba
Merge -r10..12 from libmodbus 1.2 branch
Showing
2 changed files
with
19 additions
and
2 deletions
NEWS
| 1 | +libmodbus 1.2.2 (2007-11-12) | ||
| 2 | +- Fix #161989 (Konstantinos Togias) | ||
| 3 | + Serial device paths more than 10 chars long (eg. /dev/ttyUSB0) don't | ||
| 4 | + fit to modbus_param_t -> device char[11] var. | ||
| 5 | +- Structure is also bit better 'packed' to conserve memory (see the | ||
| 6 | + trunk for a real enhancement). | ||
| 7 | + | ||
| 8 | +libmodbus 1.2.1 (2007-11-02) | ||
| 9 | +- Fix #159443 (Stefan Bisanz) | ||
| 10 | + Index of incoming data in force multiple coils function | ||
| 11 | +- Deleted unuseful code in check_crc16() | ||
| 12 | +- Untabify source code | ||
| 13 | +- Changed author's email (Stéphane Raimbault) | ||
| 14 | + | ||
| 15 | +libmodbus 1.2.0 (2007-05-10) | ||
| 16 | +- FIX Compilation GCC-4.0 | ||
| 17 | +- Project name in autogen.sh |
src/modbus.h
| @@ -114,8 +114,8 @@ typedef enum { RTU, TCP } type_com_t; | @@ -114,8 +114,8 @@ typedef enum { RTU, TCP } type_com_t; | ||
| 114 | typedef struct { | 114 | typedef struct { |
| 115 | /* Communication : RTU or TCP */ | 115 | /* Communication : RTU or TCP */ |
| 116 | type_com_t type_com; | 116 | type_com_t type_com; |
| 117 | - /* Device: "/dev/ttyS0" */ | ||
| 118 | - char device[11]; | 117 | + /* Device: "/dev/ttyS0" or "/dev/ttyUSB0" */ |
| 118 | + char device[19]; | ||
| 119 | /* Parity: "even", "odd", "none" */ | 119 | /* Parity: "even", "odd", "none" */ |
| 120 | char parity[5]; | 120 | char parity[5]; |
| 121 | /* Bauds: 19200 */ | 121 | /* Bauds: 19200 */ |