Skip to content

Commit 39f12b7

Browse files
authored
Merge pull request #35 from EnviroDIY/develop
Develop
2 parents 704a0ff + cb36518 commit 39f12b7

File tree

21 files changed

+1027
-366
lines changed

21 files changed

+1027
-366
lines changed

.github/workflows/build_documentation.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ jobs:
3333
name: Build documentation
3434
uses: EnviroDIY/workflows/.github/workflows/build_documentation.yaml@main
3535
with:
36+
use_latex: false
3637
use_graphviz: false
3738
publish: ${{ (github.event_name == 'release' && github.event.action == 'published') || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') || (github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'true')}}
3839
rebuild_cache_number: 1
40+
doxygen_version: 1.14.0
3941
secrets: inherit

.github/workflows/changelog_reminder.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
name: Changelog Reminder
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4
8+
- uses: actions/checkout@v5
99
with:
1010
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
1111

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,13 @@ sync.ffs_db
165165
runDoxygen_args.bat
166166
docs/markdown_prefilter.py
167167
docs/Doxyfile.bak
168+
clang_format_all.bat
169+
clang-format-all.py
170+
installWorkingDependencies.bat
171+
run_mcss.bat
172+
pio_common_libdeps.ini
173+
Ubuntu-Bold.ttf
174+
docs/clipboard.js
175+
docs/enviroDIY_favicon.png
176+
docs/css/m-EnviroDIY+documentation.compiled.css
177+
docs/examples.dox

ChangeLog.md

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,23 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
2020

2121
***
2222

23+
## [1.0.0]
24+
25+
### Added
26+
27+
- Added functions to read coils
28+
- Added functions to write single and multiple coils
29+
- Added functions to read discrete inputs
30+
- Added functions to read holding and input registers without requiring the command type as input
31+
- Added functions to read coils, discrete inputs, holding, and input registers into a user buffer
32+
- Added code spell configuration
33+
34+
### Fixed
35+
36+
- Fixed spelling errors
37+
38+
***
39+
2340
## [0.7.3]
2441

2542
### Changed
@@ -80,7 +97,7 @@ This information can now be found in its [own repository](https://github.com/Env
8097

8198
### Added
8299

83-
- Added documetation for the wing shield.
100+
- Added documentation for the wing shield.
84101

85102
***
86103

@@ -97,7 +114,7 @@ This information can now be found in its [own repository](https://github.com/Env
97114
### Fixed
98115

99116
- Fixed attoseconds for TAI64NA time formats.
100-
- Fixed compiler warnings when compiling with stricter -Wextra flag.
117+
- Fixed compiler warnings when compiling with stricter `-Wextra` flag.
101118

102119
***
103120

@@ -168,7 +185,10 @@ This information can now be found in its [own repository](https://github.com/Env
168185

169186
***
170187

171-
[Unreleased]: https://github.com/EnviroDIY/SensorModbusMaster/compare/v0.7.0...HEAD
188+
[Unreleased]: https://github.com/EnviroDIY/SensorModbusMaster/compare/v1.0.0...HEAD
189+
[1.0.0]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.7.3
190+
[0.7.3]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.7.3
191+
[0.7.2]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.7.2
172192
[0.7.1]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.7.1
173193
[0.7.0]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.7.0
174194
[0.6.8]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.6.8
@@ -178,7 +198,6 @@ This information can now be found in its [own repository](https://github.com/Env
178198
[0.5.3]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.5.3
179199
[0.5.2]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.5.2
180200
[0.4.8]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.4.8
181-
[0.4.7]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.4.7
182201
[0.4.3]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.4.3
183202
[0.4.0]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.4.0
184203
[0.1.2]: https://github.com/EnviroDIY/SensorModbusMaster/releases/tag/v0.1.2

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SensorModbusMaster<!-- {#mainpage} -->
1+
# SensorModbusMaster<!--! {#mainpage} -->
22

33
This library is designed to use an Arduino as a Modbus master to communicate with a sensor/slave via the [Modbus RTU](https://en.wikipedia.org/wiki/Modbus) communication protocol.
44
It's specifically written with lots of "higher-level" functions to help out users who are largely unfamiliar with the Modbus protocol and want an easy way to get information from a Modbus device.
@@ -84,7 +84,7 @@ You need the following data from your Modbus map:
8484
- All input registers are read-only.
8585
If your map says a register is read/write (R/W), it is a holding register.
8686
- the register or coil number the data is stored in
87-
- the format of data within the registers/coils (ie, float, integer, bitmask, ascii text)
87+
- the format of data within the registers/coils (ie, float, integer, bit mask, ascii text)
8888
- whether multi-register numeric data is stored as ["big-endian" or "little-endian"](https://en.wikipedia.org/wiki/Endianness) values (That is, is it high _word_ first or low _word_ first.
8989
There are no specifications for this.)
9090
- whether single-register data is stored "big-endian" or "little-endian" (That is, is it high _byte_ first or low _byte_ first.
@@ -178,7 +178,7 @@ Again, mind your voltages and the method of direction control.
178178

179179
## Hardware interface suggestions for EnviroDIY Mayfly
180180

181-
For use with the [EnviroDIY Mayfly datalogger](https://github.com/EnviroDIY/EnviroDIY_Mayfly_Logger) and other Arduino framework boards, you will likely need some additional [Hardware for using ModbusRTU with RS-485 on Arduino](https://github.com/EnviroDIY/SensorModbusMaster/tree/master/hardware).
181+
For use with the [EnviroDIY Mayfly data logger](https://github.com/EnviroDIY/EnviroDIY_Mayfly_Logger) and other Arduino framework boards, you will likely need some additional [Hardware for using ModbusRTU with RS-485 on Arduino](https://github.com/EnviroDIY/SensorModbusMaster/tree/master/hardware).
182182

183183
We have developed a [Modbus-Mayfly-WingShield](https://github.com/EnviroDIY/SensorModbusMaster/tree/master/hardware/Modbus-Mayfly_WingShield) that combines AltSoftSerial TTL to RS-485 conversion with an optional power boost to 9V or 12V.
184184
This has worked quite well for us for a variety of deployment configurations and sensors.

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.7.3
1+
1.0.0

cspell.json

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"language": "en-US",
3+
"ignoreRegExpList": [
4+
"header-defines",
5+
"doxygen-commands",
6+
"doxygen-commands-custom",
7+
"example_tags"
8+
],
9+
"patterns": [
10+
{
11+
"name": "header-defines",
12+
"pattern": "/SRC_[A-Z0-9_]+_H_/g"
13+
},
14+
{
15+
"name": "latex-command",
16+
"pattern": "/\\\\\\\\[a-z]+/g"
17+
},
18+
{
19+
"name": "javadoc-command",
20+
"pattern": "/@[a-z_]+/g"
21+
},
22+
{
23+
"name": "doxygen-commands",
24+
"pattern": ["latex-command", "javadoc-command"]
25+
},
26+
{
27+
"name": "hash-reference",
28+
"pattern": "/#[a-z0-9_]+/g"
29+
},
30+
{
31+
"name": "ref-command",
32+
"pattern": "/@ref\\s[a-z0-9_]+/g"
33+
},
34+
{
35+
"name": "anchor-command",
36+
"pattern": "/@anchor\\s[a-z0-9_]+/g"
37+
},
38+
{
39+
"name": "group-command",
40+
"pattern": "/@(?:def|in)group\\s[a-z0-9_]+/g"
41+
},
42+
{
43+
"name": "section-command",
44+
"pattern": "/@(?:sub)*section\\s[a-z0-9_]+/g"
45+
},
46+
{
47+
"name": "doxygen-commands-custom",
48+
"pattern": [
49+
"hash-reference",
50+
"ref-command",
51+
"anchor-command",
52+
"group-command",
53+
"section-command"
54+
]
55+
}
56+
],
57+
"words": [
58+
"attosecond",
59+
"attoseconds",
60+
"Aufdenkampe",
61+
"Damiano",
62+
"datasheet",
63+
"doxyfile",
64+
"enviro_diy",
65+
"EnviroDIY",
66+
"Geleskie",
67+
"Modbus",
68+
"neilh10",
69+
"SRGD",
70+
"SRGDamia1",
71+
"USBVIRTUAL",
72+
"Wextra",
73+
"YosemiTech"
74+
],
75+
"ignoreWords": [],
76+
"ignorePaths": ["platformio.ini", "*doxyfile*", ".vscode"]
77+
}

0 commit comments

Comments
 (0)