Commit Graph

145 Commits

Author SHA1 Message Date
Victor Antonovich 432b7a1a8f mbusd 0.5.0 2020-11-28 13:47:32 +04:00
Victor Antonovich 252aa45e5d Improve serial port config handling and logging 2020-08-13 20:43:03 +04:00
Victor Antonovich 461ce8baa0 Do not wait for a reply for RTU broadcast address #61 2020-08-13 17:39:30 +04:00
Victor Antonovich ad58141b87 Fix division by zero error for default serial port speed 2020-08-13 11:52:18 +04:00
Victor Antonovich c6301d4250
Merge pull request #63 from KrystianD/feat-baudrate
Show an error when trying to use unsupported baudrate
2020-08-13 11:23:27 +04:00
Victor Antonovich 3742d8d8c5
Merge pull request #62 from KrystianD/master
Add more baudrates
Fixes #60
2020-08-13 11:17:37 +04:00
Krystian Dużyński 32344e5f94 Fix log message (baudrate to speed) 2020-08-12 00:35:02 +02:00
Krystian Dużyński d24b257c13 Make use of baudrate 0 as indicator of default baudrate, show error when trying to use unsupported baudrate 2020-08-12 00:28:23 +02:00
Krystian Dużyński 965ff443c8 Remove unused resppause member 2020-08-12 00:27:48 +02:00
Krystian Dużyński 4bf9d94713 Add more baudrates 2020-08-12 00:08:58 +02:00
Victor Antonovich 5eb74fa568 Fix GCC C99 compatibility error 2020-05-22 16:56:31 +04:00
Victor Antonovich f5becef211 Take into account tty parity bit in the timing calculations (#59) 2020-05-22 15:47:50 +04:00
Victor Antonovich 0c1dcb727d Add online network requirements to the systemd service file (fix #58) 2020-05-21 13:59:53 +04:00
Victor Antonovich 88916fe82d Add IPv6 support (#53) 2019-07-17 17:04:22 +04:00
Victor Antonovich 2aa063db79 Add command-line and config options to set an TCP socket address (#53)
Still no IPv6 support though.
2019-07-16 11:14:37 +04:00
Victor Antonovich 2465860496 Add 'enhancement' label to stale bot exemptLabels 2019-07-08 14:59:51 +04:00
Victor Antonovich 8e266fc5e9 Update working version to 0.4.1 2019-07-08 14:56:36 +04:00
Victor Antonovich 2282376417 Add stale bot config 2019-07-08 14:55:59 +04:00
Victor Antonovich caec364ac1 mbusd 0.4.0 2019-07-08 13:45:36 +04:00
Victor Antonovich c582e6f052 Move queue_next_elem() outside of the `switch` block (fix #52) 2019-07-08 13:24:45 +04:00
Victor Antonovich b2effb1db9 Set up stdout and stderr in Popen() calls in tests 2019-07-08 13:16:51 +04:00
Victor Antonovich d33d66f242
Merge pull request #50 from nickma82/extending_readme
added informaiton from a ticket question and dev information
2019-05-27 12:15:23 +04:00
nickma 82b286d47f added informaiton from a ticket question and dev information
https://github.com/3cky/mbusd/issues/24#issuecomment-349256945
2019-05-26 19:56:49 +02:00
Victor Antonovich ba41aaee28
Merge pull request #46 from nickma82/test-pymodbus-upgrade
python module version freeze, pymodbus pump to v2.2.0
2019-04-22 11:53:47 +04:00
nickma e5a8dc9f0a pymodbus.server.async -> asynchronous 2019-04-21 22:41:06 +02:00
Victor Antonovich f8b6448b08
Merge pull request #43 from temperednetworks/modbus-framing
modbus: read only a single frame at a time
2019-01-28 11:42:05 +04:00
Dustin Lundquist 5c064928ae modbus: read only a single frame at a time
When multiple modbus frames were queued in the socket buffer
conn_read() would read until it completely drained the
kernel's socket buffer or filled the connection buffer. The first modbus
frame in the buffer is then processed and sent to the tty, then the
buffer is reused for the reponse after it is received from the tty
possibly overwritting any subsequent modbus request frames already read.

Avoid this by maintaining pre-connection length to read, so we only read
a single modbus frame at a time.
2019-01-25 14:13:12 -08:00
Victor Antonovich 8a29a0e029
Merge pull request #42 from nickma82/CPack-architecture
cmake armhf: set CPack architecture
2019-01-10 14:57:47 +04:00
nickma c7efb2a3ce cmake armhf: set CPack architecture 2019-01-09 21:59:26 +01:00
Victor Antonovich b5e3c5324a Implement tty reconnect with exponential backoff 2019-01-04 19:28:22 +04:00
Victor Antonovich d507507d29 Try to reinit tty on EOF (#41) 2019-01-04 12:54:48 +04:00
Victor Antonovich 076120bf6c Force set tty CLOCAL mode flag (trying to address #41) 2019-01-03 20:45:52 +04:00
Victor Antonovich a3a6530eed
Merge pull request #35 from nickma82/test_simplification
Test simplification
2018-06-19 19:31:43 +04:00
Nick ab99734d87 ci: fixing dependency issues 2018-06-18 21:34:33 +02:00
Nick 1c94fda030 ci: moved test stage before the build stage 2018-06-18 21:33:01 +02:00
Nick 0a35ef68b6 tests: running into race conditions 2018-06-18 21:15:34 +02:00
Nick fabae05238 added __init__ to test/environment 2018-06-18 17:02:56 +02:00
Nick e092b4e935 gitlab-ci: fixing the arm build 2018-06-18 16:51:46 +02:00
Nick b28678831d gitlab-ci: changed test execution, reduced apt deps 2018-06-18 16:46:17 +02:00
Nick 74189d6caf test: moved all setup/teardown into the python realm 2018-06-18 16:06:16 +02:00
Nick ae360073bf tests: better logging for all testcases 2018-06-18 14:15:01 +02:00
Nick ecf63b992b tests: moved rtu_slave handling inside pythons realm 2018-06-18 14:13:51 +02:00
Nick ccf0beb800 gitlab-ci ctest: added twisted as dependency 2018-05-16 22:13:01 +02:00
Nick fa0b7a295e gitlab-ci tests: switched to 'cmake test' target 2018-05-16 22:02:51 +02:00
Nick 809857ab98 gitlab-ci: added make as dependency 2018-05-15 11:33:51 +02:00
Victor Antonovich 77f1ccd345 Merge branch 'master' of https://github.com/3cky/mbusd.git 2018-04-26 13:55:47 +03:00
Victor Antonovich fb4f8fb569 Handle incorrect Modbus/TCP data length header field #31 2018-04-26 13:10:57 +03:00
Victor Antonovich a6d204bbdd Add integration tests 2018-04-11 16:42:50 +03:00
dwyer-employee 8f2ccf1ec0 Modbus RTU Exception Forwarding (#29)
Add checking for Modbus exception codes returned by RTU slaves

These PDUs are now forwarded to the TCP client.
2018-03-26 13:12:43 +03:00
NickMa fb3d6d6489 Cmake gitlabci (#25)
* gitlabci: hardcoded the debian systemd path

* cmake: no failure on forced SYSTEMD_SERVICES_INSTALL_DIR

* gitlabci: added fedora target

* gitlabci: added fedora package

* gitlabci: added another fedora package

* gitlabci: fedora changed rpmbuilder

* fedora...

* fedora package name try4

* rpmdevtools detection

* gitlabci: changed rpm detection

* gitlabci: rpmbuilder detection

* rpmbuilder added references

* gitlabci: changed the expiration timespan to 6months

* removed always false comparison (dbglvl is unsigned)
2018-03-05 17:19:52 +03:00