Skip to content

Commit 33c5618

Browse files
author
rt-labs bot
committed
chore: catchup to 7b6853b
7b6853b docs: update main readme file 5d556a3 docs: add release notes eaa4f38 docs: Fix spelling c76aafa docs: Add instructions for spell checking 3701d6b docs: Add words to spelling wordlist 1f7773e docs: Switch to British spelling f2e1f22 docs: Switch to internal Kroki server 17dff3d docs: Move content to new chapter eb98351 chore: update version to 1.0.0 e9aee0b feat: add github evaluation readme Based-On-Commit: 7b6853b4c3f1b4768749933887007f68e4078e05 Change-Id: If21d4765d91ecc45e5b888597d83497c97d2c6e0
1 parent dc028fd commit 33c5618

File tree

5 files changed

+62
-26
lines changed

5 files changed

+62
-26
lines changed

.github/README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Evaluation version
2+
3+
This repository contains an evaluation version the M-Bus Modbus stack.
4+
The stack is written to an OS abstraction layer and can also be used
5+
in a bare metal application. Using the abstraction layer, the stack
6+
can run on Linux, Windows or on an RTOS.
7+
8+
It does not contain complete ports and cannot be built without adding additional sources.
9+
10+
See [readme](../../README.md) for more information on the complete version of
11+
the stack and the [releases](https://github.com/rtlabs-com/m-bus/releases)
12+
for binary downloads for common targets.
13+
14+
This version of M-Bus can be used for evaluation purposes
15+
only. Contact [email protected] if you intend to use this stack in a
16+
product or if you need assistance during evaluation. The commercial
17+
version of this stack is supplied with full sources.

README.md

Lines changed: 41 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,58 @@
11
Modbus stack
22
=============
3-
[![Build Status](https://github.com/rtlabs-com/m-bus/workflows/Build/badge.svg?branch=master)](https://github.com/rtlabs-com/m-bus/actions?workflow=Build)
4-
[![CodeQL](https://github.com/rtlabs-com/m-bus/workflows/CodeQL/badge.svg?branch=master)](https://github.com/rtlabs-com/m-bus/actions?workflow=CodeQL)
53

64
This repository contains the M-Bus Modbus stack. The stack is written to an OS
75
abstraction layer and can also be used in a bare metal
86
application. Using the abstraction layer, the stack can run on Linux,
97
Windows or on an RTOS.
108

11-
Cloning
12-
=======
9+
Web resources
10+
-------------
1311

14-
Clone the source:
12+
* Source repository: [https://github.com/rtlabs-com/m-bus](https://github.com/rtlabs-com/m-bus)
13+
* Documentation: [https://rt-labs.com/docs/m-bus](https://rt-labs.com/docs/m-bus)
14+
* RT-Labs (stack integration, certification services and training): [https://rt-labs.com](https://rt-labs.com)
1515

16-
```
17-
$ git clone --recurse-submodules https://github.com/rtlabs-com/m-bus.git
18-
```
16+
Features
17+
--------
1918

20-
This will clone the repository with submodules. If you already cloned
21-
the repository without the `--recurse-submodules` flag then run this
22-
in the `m-bus` folder:
19+
* Modbus master (client)
20+
* Modbus slave (server)
21+
* Modbus TCP
22+
* Modbus RTU
23+
* All four primary tables (coils, inputs, holding registers, input registers)
24+
* Vendor-defined function codes
25+
* Diagnostics
26+
* Implemented in C, supports C++
27+
* Ports available for Linux, Windows (Modbus TCP only) and RT-Kernel
28+
* Porting layer allows extending the stack to new ports
2329

24-
```
25-
$ git submodule update --init --recursive
26-
```
30+
License
31+
-------
2732

28-
Building
29-
========
33+
This software is dual-licensed, with GPL version 3 and a commercial license. See
34+
LICENSE.md for more details.
35+
36+
Requirements
37+
------------
38+
39+
cmake
40+
41+
* cmake 3.28 or later
42+
43+
For Linux:
44+
45+
* gcc 4.6 or later
46+
47+
For rt-kernel:
48+
49+
* Workbench 2018.1 or later
3050

31-
See the [manual](https://docs.rt-labs.com/m-bus/).
3251

3352
Contributions
34-
=============
53+
-------------
3554

36-
Contributions are welcome. If you want to contribute you will need to
37-
sign a Contributor License Agreement and send it to us either by
38-
e-mail or by physical mail. More information is available
39-
[here](https://rt-labs.com/contribution).
55+
Contributions are welcome. If you want to contribute you will need to sign a
56+
Contributor License Agreement and send it to us either by e-mail or by physical
57+
mail. More information is available
58+
on [https://rt-labs.com/contribution](https://rt-labs.com/contribution).

include/mbus.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ MB_EXPORT int mbus_read (
283283
* \param slave Slave handle. See mbus_connect()
284284
* \param address 1-based starting address. May be constructed
285285
* by calling MB_ADDRESS(). Note that only coils and
286-
* holding registers are writeable.
286+
* holding registers are writable.
287287
* \param quantity Number of addresses to write. Valid range is 1 - 1968
288288
* for coils and 1 - 123 for holding registers
289289
* \param buffer Input buffer
@@ -328,7 +328,7 @@ MB_EXPORT int mbus_write (
328328
* \param slave Slave handle. See mbus_connect()
329329
* \param address 1-based address to be written to. May be constructed
330330
* by calling MB_ADDRESS(). Note that only coils and
331-
* holding registers are writeable.
331+
* holding registers are writable.
332332
* \param value The value to be written
333333
*
334334
* \return 0 on success, error code otherwise

sample/ports/linux/tcp_rtu_master.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static void help (const char * name)
5454
printf (
5555
"Read/write Modbus registers\n"
5656
"\n"
57-
"This purpose of this program is to demonstrate use of the m-bus\n"
57+
"This purpose of this program is to demonstrate use of the M-Bus\n"
5858
"Modbus master stack. It may also be useful as a debugging tool.\n"
5959
"\n"
6060
"USAGE:\n"

sample/ports/windows/tcp_rtu_master.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static void help (const char * name)
5454
printf (
5555
"Read/write Modbus registers\n"
5656
"\n"
57-
"This purpose of this program is to demonstrate use of the m-bus\n"
57+
"This purpose of this program is to demonstrate use of the M-Bus\n"
5858
"Modbus master stack. It may also be useful as a debugging tool.\n"
5959
"\n"
6060
"USAGE:\n"

0 commit comments

Comments
 (0)