Merge branch 'release'

Author: zzeroo

.travis.yml

@@ -1,30 +1,16 @@
-sudo: false
 language: rust
-# Dependencies of kcov, used by coverage
-addons:
-  apt:
-    packages:
-      - libcurl4-openssl-dev
-      - libelf-dev
-      - libdw-dev
-      - binutils-dev
-      - cmake
-    sources:
-      - kalakris-cmake
 rust:
   - stable
   - beta
   - nightly
-before_script:
-  - |
-      cargo install cargo-travis &&
-      export PATH=$HOME/.cargo/bin:$PATH
-
-# the main build
 script:
-  - |
-      cargo test
-
-after_success:
-# measure code coverage and upload to coveralls.io
-  - cargo coveralls
+  - cargo build --verbose
+  - cargo test --verbose
+jobs:
+  allow_failures:
+    - rust: nightly
+  fast_finish: true
+cache: cargo
+before_cache:
+  - rm -rf "$TRAVIS_HOME/.cargo/registry/src"
+  ⋮ # rest of your existing "before_cache"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "libmodbus-rs"
-version = "0.9.0"
+name = "libmodbus"
+version = "1.0.0"
 authors = ["Stefan Müller <co@zzeroo.com>"]
 readme = "README.md"
 keywords = ["modbus", "libmodbus"]
@@ -10,18 +10,18 @@ homepage = "http://zzeroo.github.io/libmodbus-rs"
 description = "libmodbus bindings for Rust"
 license = "LGPL-2.1" # same as libmodbus
 categories = ["api-bindings"]
+edition = "2018"
 
 [badges]
 travis-ci = { repository = "zzeroo/libmodbus-rs" }
 
 [dependencies]
-failure = "0.1.5"
-libc = "0.2.55"
-libmodbus-sys = { path = "libmodbus-sys", version = "0.9" }
-rand = "0.6.5"
-time = "0.1.42"
+libc = "0.2.80"
+libmodbus-sys = { path = "libmodbus-sys", version = "1" }
+rand = "0.7.3"
+time = "0.2.22"
 
-[dependencies.clap]
+[dev-dependencies.clap]
 version = "2.33"
 default-features = false
 features = [ "color" ]

README.md

@@ -1,14 +1,16 @@
-# libmodbus-rs
-## [libmodbus](http://libmodbus.org/) bindings for Rust  
+# libmodbus
 
-**This crate is an reduced version without active bindgen! I need this because our build system can not deliver rust and libclang. Please don't use in production and expect odd behavior.**
+> This crate was renamed to just *libmodbus*. Before version 1.0.0 the name of the crate was libmodbus-rs.
+
+## [libmodbus](http://libmodbus.org/) bindings for Rust
 
 Libmodbus is a free software library to send and receive data with a device that respects the Modbus protocol. That crate contains the Rust bindings for the libmodbus library (written in C).
 Like libmodbus self, this crate supports serial port and Ethernet connections for Modbus server and clients.
 
 
 [![Crates.io version](https://img.shields.io/crates/v/libmodbus-rs.svg)](https://crates.io/crates/libmodbus-rs)  
 [![Build Status](https://travis-ci.org/zzeroo/libmodbus-rs.svg?branch=master)](https://travis-ci.org/zzeroo/libmodbus-rs)  
+[![Build status](https://ci.appveyor.com/api/projects/status/v24293bvng52ihn5/branch/master?svg=true)](https://ci.appveyor.com/project/zzeroo/libmodbus-rs/branch/master)  
 [![Coverage Status](https://coveralls.io/repos/github/zzeroo/libmodbus-rs/badge.svg?branch=master)](https://coveralls.io/github/zzeroo/libmodbus-rs?branch=master)
 
 [Homepage |][homepage]  
@@ -27,7 +29,7 @@ Include the dependencies into your `Cargo.toml` file.
 
 ```toml
 [dependencies]
-libmodbus-rs = "0.6"
+libmodbus-rs = "1"
 ```
 
 ### or development (github master)
@@ -43,7 +45,7 @@ For example if you what to build an modbus server, in the modbus tcp context, in
 ```rust
 extern crate libmodbus_rs;
 
-use libmodbus_rs::{Modbus, ModbusServer, ModbusTCP};
+use libmodbus::{Modbus, ModbusServer, ModbusTCP};
 ```
 
 The examples in the examples directory show this.
@@ -56,7 +58,7 @@ The examples in the examples directory show this.
 
 ## Building libmodbus-rs
 
-The libmodbus ffi bindings (libmodbus-sys) are build using [bindgen][bindgen]. [Bindgen need Clang 3.9 or greater on your system.][bindgen-reg]
+The libmodbus ffi bindings (libmodbus-sys) are build using [bindgen][bindgen]. [Bindgen need Clang 3.9 or greater on your system.][bindgen-requirements]
 
 ### Dependencies Archlinux
 
@@ -72,7 +74,29 @@ apt install autoconf build-essential curl clang git-core libtool
 
 Look also at the local ci/ docker files under `./ci/docker-archlinux` and `.ci/docker-debian9` for a known working, minimal setup.
 
-For more information about the bindgen requirements please visit [https://servo.github.io/rust-bindgen/requirements.html][bindgen-reg]
+For more information about the bindgen requirements please visit [https://servo.github.io/rust-bindgen/requirements.html][bindgen-requirements]
+
+## Dependencies Windows
+
+Follow the msys2 instructions <https://www.msys2.org>
+
+```sh
+pacman -Syu
+```
+
+Followed by the second update step
+
+```sh
+pacman -Su
+```
+
+Finally install clang
+
+```sh
+pacman -S  mingw64/mingw-w64-x86_64-clang
+```
+
+----
 
 If all dependencies are solved, compile with `cargo build` and/ or run the tests with `cargo test`.
 
@@ -82,11 +106,10 @@ cd libmodbus-rs
 cargo build
 ```
 
-
 ## Examples
 
-All original libmodbus examples are reproduced in Rust. You can find them in the
-`examples` directory of this crate.
+Most of the original libmodbus examples are reproduced in Rust.
+You can found them in the `examples` directory of this crate.
 
 **Please have look at the README.md in the examples directory for more information about the examples.**
 
@@ -97,16 +120,15 @@ cargo run --example random-test-server
 ```
 
 In another shell start the client after the server
+
 ```sh
 cargo run --example random-test-client
 ```
 
-
 # License
 
 `libmodbus-rs` is distributed under the terms of the LGPL-2.1 license, which is the same license, [libmodbus](http://libmodbus.org/) is using.
 
-
 # Links
 
 * [http://libmodbus.org][libmodbus]
@@ -124,4 +146,4 @@ This project hosts the original libmodbus documentation, used here, as well. Ple
 [libmodbus-repo]: https://github.com/stephane/libmodbus.git
 [libmodbus-doc]: http://zzeroo.github.io/libmodbus-rs/libmodbus/libmodbus.html
 [bindgen]: https://github.com/servo/rust-bindgen
-[bindgen-reg]: https://servo.github.io/rust-bindgen/requirements.html
+[bindgen-requirements]: https://servo.github.io/rust-bindgen/requirements.html

TODO.md

@@ -0,0 +1,18 @@
+# TODOs
+
+## Urgend
+
+- Error Handling
+[] remove failure crate
+[] create custom error or use another crate 'fehler'
+[] fix strange error in RTU
+    ```bash
+    sudo socat PTY,link=/dev/ttyS10 PTY,link=/dev/ttyS11 &
+    # this works only one time. The server then process strange data
+    cargo run --example simple-server -- -b rtu -s /dev/ttyS10 &
+    cargo run --example simple-client -- -b rtu -s /dev/ttyS11 &
+
+    # If you change the client/ server ports all is fine
+    cargo run --example simple-server -- -b rtu -s /dev/ttyS11 &
+    cargo run --example simple-client -- -b rtu -s /dev/ttyS10 &
+    ```

appveyor.bat

@@ -0,0 +1,46 @@
+echo on
+SetLocal EnableDelayedExpansion
+
+rem Matrix-driven Appveyor CI script for libmodbus-rs
+rem Currently only does MSYS2 builds.
+rem https://www.appveyor.com/docs/installed-software#mingw-msys-cygwin
+rem Needs the following vars:
+rem     MSYS2_ARCH: x86_64 or i686
+rem     MSYSTEM:    MINGW64 or MINGW32
+rem     target:     x86_64-pc-windows-gnu, i686-pc-windows-gnu
+rem     channel:    stable, beta, nightly
+rem This script based on the work of the libmypaint team.
+
+rem Download rust
+set RUSTUP_URL=https://win.rustup.rs/rustup-init.exe
+echo Downloading %RUSTUP_URL%...
+powershell -Command "appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe"
+rustup-init -yv --default-toolchain %channel% --default-host %target%
+set PATH=%PATH%;%USERPROFILE%\.cargo\bin
+rustc -vV
+cargo -vV
+
+rem Set the paths appropriately
+PATH C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%PATH%
+PATH %PATH%;%USERPROFILE%\.cargo\bin
+
+rem Upgrade the MSYS2 platform
+bash -lc "pacman --noconfirm --sync --refresh --refresh pacman"
+bash -lc "pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade"
+
+rem Install required tools
+bash -xlc "pacman --noconfirm -S --needed base-devel"
+
+rem Install the relevant native dependencies
+bash -xlc "pacman --noconfirm -S --needed mingw-w64-%MSYS2_ARCH%-clang"
+
+rem Invoke subsequent bash in the build tree
+cd %APPVEYOR_BUILD_FOLDER%
+set CHERE_INVOKING=yes
+
+rem Build/test scripting
+bash -xlc "set pwd"
+bash -xlc "env"
+
+cargo build --verbose
+cargo test --verbose

appveyor.yml

@@ -0,0 +1,44 @@
+# Appveyor configuration for Rust using rustup for Rust installation
+# Based on the template https://github.com/starkat99/appveyor-rust
+# Please validate before push https://ci.appveyor.com/tools/validate-yaml
+
+## Operating System (VM environment) ##
+
+# Rust needs at least Visual Studio 2013 Appveyor OS for MSVC targets.
+os: Visual Studio 2015
+
+## Build Matrix ##
+
+environment:
+  matrix:
+    - compiler: msys2
+      ARCH: x64
+      MSYS2_ARCH: x86_64
+      MSYS2_DIR: msys64
+      MSYSTEM: MINGW64
+      channel: stable
+      target: x86_64-pc-windows-gnu
+    - compiler: msys2
+      ARCH: x64
+      MSYS2_ARCH: x86_64
+      MSYS2_DIR: msys64
+      MSYSTEM: MINGW64
+      channel: nightly
+      target: x86_64-pc-windows-gnu
+    # - compiler: msys2
+    #   ARCH: x86
+    #   MSYS2_ARCH: i686
+    #   MSYS2_DIR: msys64
+    #   MSYSTEM: MINGW32
+    #   channel: stable
+    #   target: i686-pc-windows-gnu
+
+### Allowed failures ###
+
+matrix:
+  allow_failures:
+    - channel: nightly
+
+build_script:
+  - '%APPVEYOR_BUILD_FOLDER%\appveyor.bat'
+

examples/bandwidth-client.rs examples/bandwidth-client.rs_examples/bandwidth-client.rs renamed to examples/bandwidth-client.rs_

@@ -1,9 +1,8 @@
-extern crate libmodbus_rs;
 extern crate time;
 
 mod unit_test_config;
 
-use libmodbus_rs::{Modbus, ModbusClient, ModbusTCP, ModbusRTU};
+use libmodbus::{Modbus, ModbusClient, ModbusTCP, ModbusRTU};
 use std::env;
 use std::io::Error;
 use std::mem::size_of;

examples/bandwidth-server-many-up.rs examples/bandwidth-server-many-up.rs_examples/bandwidth-server-many-up.rs renamed to examples/bandwidth-server-many-up.rs_

@@ -1,8 +1,6 @@
-extern crate libmodbus_rs;
-
 mod unit_test_config;
 
-use libmodbus_rs::{Modbus, ModbusMapping, ModbusTCP};
+use libmodbus::{Modbus, ModbusMapping, ModbusTCP};
 
 
 const NB_CONNECTION: i32 = 5;

examples/bandwidth-server-one.rs examples/bandwidth-server-one.rs_examples/bandwidth-server-one.rs renamed to examples/bandwidth-server-one.rs_

@@ -1,8 +1,6 @@
-extern crate libmodbus_rs;
-
 mod unit_test_config;
 
-use libmodbus_rs::{Modbus, ModbusMapping, ModbusServer, ModbusTCP, ModbusRTU};
+use libmodbus::{Modbus, ModbusMapping, ModbusServer, ModbusTCP, ModbusRTU};
 use std::env;
 use unit_test_config::*;
 

examples/random-test-client.rs examples/random-test-client.rs_examples/random-test-client.rs renamed to examples/random-test-client.rs_

@@ -1,7 +1,4 @@
-extern crate rand;
-extern crate libmodbus_rs;
-
-use libmodbus_rs::{Modbus, ModbusClient};
+use libmodbus::{Modbus, ModbusClient};
 use rand::Rng;
 
 
@@ -33,12 +30,12 @@ fn run() -> Result<(), String> {
     let mut rng = rand::thread_rng();
 
     // // RTU
-    // use libmodbus_rs::ModbusRTU;
+    // use libmodbus::ModbusRTU;
     // let mut modbus = Modbus::new_rtu("/dev/ttyUSB0", 19200, 'N', 8, 1).expect("could not create RTU context");
     // modbus.set_slave(SERVER_ID).expect("could not set slave ID");
 
     // TCP
-    use libmodbus_rs::ModbusTCP;
+    use libmodbus::ModbusTCP;
     let mut modbus = Modbus::new_tcp("127.0.0.1", 1502).expect("could not create TCP context");
 
     modbus.set_debug(true).expect("could not set DEBUG mode");