70 Commits

Author SHA1 Message Date
Dirk Zenker
5f0b5d5dd1 Beautify: replace tabs with spaces and remove trailing spaces 2014-02-24 15:20:42 +01:00
Stefan Wahren
b674dfcf24 Use new retransmission option and handle member 2013-10-19 11:44:37 +02:00
Stefan Wahren
d54b594696 Sync behavior to mbus-serial-request-data-multi-reply
- init slaves before requesting data
- free ressources before exit
- refactor data request
- fix comments
2013-10-17 14:17:57 +02:00
Stefan Wahren
c2a3f4b871 Fix event handling after moving callbacks to mbus handle 2013-10-13 21:56:15 +02:00
Stefan Wahren
55d4c0fba2 Remove trailing whitespace
Signed-off-by: Stefan Wahren <info@lategoodbye.de>
2013-09-13 17:53:33 +02:00
Robert Johansson
b1473adc46 fixed warning 2013-07-04 23:49:42 +09:00
Robert Johansson
0a0403988c improve error message in request data programs 2013-07-03 22:31:57 +09:00
Stefan Wahren
8b9d6e735e sync mbus-tcp-request-data-multi-reply with serial
make init_slaves and parse_abort static
fix return value of parse_abort
remove unused variables
free resources before exit
2013-07-01 08:16:20 +02:00
Stefan Wahren
2ca73eefa1 add new parameter f to man page
add range for TCP port
2013-07-01 08:09:01 +02:00
Robert Johansson
0f0882d4fa Merge pull request #54 from lategoodbye/master
Add missing file mbus-tcp-application-reset.c
2013-06-29 07:13:06 -07:00
Stefan Wahren
2c03cab529 Add missing file mbus-tcp-application-reset from issue #42.
This will fix also issue #52.
2013-06-28 18:59:04 +02:00
Pascal Spoerri
a61714d26d Added frame option to mbus-serial-request-data-multi-reply
Improved parsing
2013-06-28 14:10:15 +00:00
Stefan Wahren
4d85dad403 change TCP port datatype from int to uint16_t
because int doesn't match the range
add range check in every TCP binary
2013-05-12 21:26:38 +02:00
Stefan Wahren
3935b4013e make parseable for splint
- replace non standard u_char with unsigned char (ANSI)
- advice splint to ignore variadic macros
- move declarations from the middle to top of functions (C90)
- replace local library includes <> to ""
2013-05-04 18:14:18 +02:00
Stefan Wahren
e1657399ff add new function to send application reset incl. subcode
fix typo in comment
add new program to test experimental feature application reset
add mbus-tcp-application-reset to build process
2013-04-27 13:16:44 +02:00
Stefan Wahren
f6601ca40f print all errors on stderr in all binaries 2013-04-26 08:18:17 +02:00
Stefan Wahren
ea0c6c3455 add new parameter to specify retries for mbus-serial-scan and
mbus-tcp-scan
make primary scan to retransmit SND_NKE in case of timeout so it's more
reliable but also slowlier
keep default behaviour, no retransmission
equalize mbus-serial-scan and mbus-tcp-scan
update man page
2013-04-25 21:19:41 +02:00
Stefan Wahren
b1063db3bc replace magic numbers with defines
fix MBUS_MAX_PRIMARY_SLAVES to 250
2013-03-02 18:03:31 +01:00
Stefan Wahren
312eca72e5 fix logic of secondary address check 2012-12-31 13:53:40 +01:00
Stefan Wahren
e248d6e421 replace address parameter checks with new helper functions 2012-12-31 13:44:03 +01:00
Stefan Wahren
898ee57d41 replace address parameter checks with new helper functions 2012-12-31 13:42:27 +01:00
Stefan Wahren
404e245af5 replace magic number with define 2012-12-20 20:42:10 +01:00
Stefan Wahren
48a5b2bab7 Extend clean up script (based on the changes from tmtom) 2012-12-19 21:20:38 +01:00
Stefan Wahren
be68f84d38 remove unnecessary POSIX header 2012-12-10 21:35:02 +01:00
Stefan Wahren
dc948566db remove unnecessary POSIX header 2012-12-10 21:26:48 +01:00
Robert Johansson
ad6297cb05 experimental command-line tool for sending raw (hex) frames to a select mbus unit 2012-10-23 21:34:38 +09:00
Stefan Wahren
606d238a6d Merge branch 'master' of
git+ssh://git@github.com/lategoodbye/libmbus.git

Conflicts:
	mbus/mbus-protocol-aux.c
2012-10-04 22:43:06 +02:00
Stefan Wahren
501b105d01 unify m-bus slave init 2012-09-01 22:52:55 +02:00
Stefan Wahren
1a538e73aa New parameter for mbus_send_ping_frame to purge response 2012-09-01 22:51:44 +02:00
Stefan Wahren
d2608d5de7 add allocation error handling 2012-09-01 22:14:21 +02:00
Robert Johansson
d816a1c30f Merge branch 'master' of github.com:rscada/libmbus 2012-07-25 00:04:16 +09:00
Robert Johansson
989fdbd7ee added -lm in link flags (libmbus uses the pow function from libm) 2012-07-24 23:55:56 +09:00
Robert Johansson
0ca0148bba Merge pull request #19 from lategoodbye/master
Small bugfixes (retry counter, command args)
2012-07-19 14:35:09 -07:00
Tmtom
84dd8c2352 Expanded manpage 2012-07-19 22:56:22 +02:00
Stefan Wahren
7a83f7931d Fixed command args handling of mbus-serial-scan-secondary 2012-07-19 20:09:24 +02:00
Tmtom
db343cba2b First version of manpages. Added remaining baud rates for serial communication. 2012-07-17 21:50:02 +02:00
Stefan Wahren
555c627665 Removed unnecessary sleep 2012-07-14 16:25:52 +02:00
Stefan Wahren
c86ed10af7 Fixed result check for mbus_connect 2012-07-13 23:01:29 +02:00
Stefan Wahren
5d724d9473 Initialize reply structures to avoid segmentation fault in debug 2012-07-13 22:59:26 +02:00
Stefan Wahren
e6a52f97ea Replaced magic resultcodes from mbus_recv_frame with defines 2012-07-11 23:33:52 +02:00
jakubovsky
b95f29fcc8 mbus_connect() and mbus_disconnect() return 0 on success and -1 otherwise 2012-07-09 12:33:32 +02:00
jakubovsky
5f9052b284 Renamed mbus_recv_frame_dummy() to more descriptive mbus_purge_frames() 2012-07-09 10:48:13 +02:00
jakubovsky
78a6013d75 mbus_recv_dummy() instead of while loop. 2012-07-06 11:21:24 +02:00
jakubovsky
6b2d43617f Merge remote-tracking branch 'upstream/master' 2012-07-06 11:14:47 +02:00
Stefan Wahren
433744c80a Fix problem with multiple selected devices (secondary address)
- resend SND_NKE to ensure all devices are deselected, because the first
SND_NKE could get lost
2012-07-04 21:21:01 +02:00
Stefan Wahren
736181b35e Revert "Fix problem with multiple selected devices (secondary address) resend "
This reverts commit 1fa5e202fb5af6c343d0597693185aa406dda7a9.
2012-07-04 21:15:55 +02:00
Stefan Wahren
1fa5e202fb Fix problem with multiple selected devices (secondary address)
resend
2012-07-04 21:14:00 +02:00
jakubovsky
ec50ab9286 Examples from bin directory updated. API usage updated in mbus-protocol-aux.h. 2012-07-04 19:49:54 +02:00
jakubovsky
5d079254cc Extended mbus_recv_frame() error codes, improved collision handling
- handling TCP connection reset and read(2) timeout
2012-07-03 14:35:07 +02:00
Stefan Wahren
2093b4a9c0 Merge remote-tracking branch 'upstream/master' 2012-06-23 14:29:14 +02:00