wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
312 Commits 9 Branches 2 Tags
Commit Graph

312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Johansson
d816a1c30f Merge branch 'master' of github.com:rscada/libmbus 2012-07-25 00:04:16 +09:00
Robert Johansson
543d3493d7 added test frame with float point value that was incorrectly decoded (now fixed) 2012-07-25 00:02:24 +09:00
Robert Johansson
ed61932579 fixed bug in float point decoding. previously failed when exponent<0. 2012-07-24 23:59:20 +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
4af9518ce5 correct fprintf format type for size_t 2012-07-24 23:11:02 +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
Robert Johansson
418e6741ae Merge pull request #18 from tmtom/tmtom_fixes 
Manpages, autotools cleanup
 2012-07-19 14:34:31 -07:00
Tmtom
84dd8c2352 Expanded manpage 2012-07-19 22:56:22 +02:00
Tmtom
3bc701e995 Corrected pkgnames/dirnames 2012-07-19 22:34:03 +02:00
Tmtom
db6a1954f0 Added share/doc to be distributed as well. 2012-07-19 21:54:17 +02:00
Tmtom
632ff8c921 Updated schema, added KiCAD project. 2012-07-19 21:33:46 +02:00
Stefan Wahren
5467679f66 Reset retry counter after valid frame to be conform with M-Bus 
documentation
 2012-07-19 21:08:07 +02:00
Stefan Wahren
7a83f7931d Fixed command args handling of mbus-serial-scan-secondary 2012-07-19 20:09:24 +02:00
Tmtom
63959632e3 Added manpages to the deb package, added autottols call to build-deb.sh 2012-07-18 21:06:03 +02:00
Tmtom
67577dd2d9 Added cleanup script 2012-07-18 19:33:56 +02:00
Tmtom
1a449d8f36 Further cleanup. Need to check debian builds and possible provide cleanup script. 2012-07-18 19:18:11 +02:00
Tmtom
a901d94b44 Cleaned up the GIT repository (expanded .gitignore, removed autogenerated files). 2012-07-18 18:15:47 +02:00
Tmtom
db343cba2b First version of manpages. Added remaining baud rates for serial communication. 2012-07-17 21:50:02 +02:00
Robert Johansson
36c46d18c2 Merge pull request #17 from lategoodbye/master 
Retransmission of request frames
 2012-07-14 08:40:04 -07:00
Stefan Wahren
555c627665 Removed unnecessary sleep 2012-07-14 16:25:52 +02:00
Stefan Wahren
08a4c55443 - Initialize maximum retry counter to 3 for serial and tcp connections 
- Retransmit request frame (just for mbus_sendrecv_request) in case of
timeout or invalid response
 2012-07-14 16:22:25 +02:00
Stefan Wahren
97f2ac34ba M-Bus handle extended by maximum retry counter (in case of transmission 
errors)
 2012-07-14 16:15:45 +02:00
Robert Johansson
3386f0a419 Merge pull request #16 from lategoodbye/master 
Bugfixes for serial tools
 2012-07-13 16:59:51 -07: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
Robert Johansson
198e9afcef Merge pull request #15 from lategoodbye/master 
Removed magic numbers and added new test frames
 2012-07-12 16:59:51 -07:00
Stefan Wahren
e6a52f97ea Replaced magic resultcodes from mbus_recv_frame with defines 2012-07-11 23:33:52 +02:00
Stefan Wahren
ff37c4af8c Added test frames: 
- ABB F95
- Allmess Megacontrol CF-50
- Elster TMP-A
- EMH DIZ
- NZR DMZ 5/63
 2012-07-11 22:41:13 +02:00
Robert Johansson
9ef64d0fb5 added contributor 2012-07-10 19:52:47 +09:00
Robert Johansson
69373692b1 Merge pull request #14 from jakubovsky/master 
Few improvements
 2012-07-09 08:03:41 -07: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
e70c07e8f3 TCP and serial specific data structs renamed. 2012-07-06 11:29:46 +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
Robert Johansson
d7f63586c6 Merge pull request #13 from lategoodbye/master 
Few bugfixes
 2012-07-05 06:30:52 -07: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
34255c7237 free_auxdata() added to mbus_handle interface for freeing context specific data 2012-07-04 19:08:51 +02:00
jakubovsky
645e5eb482 mbus_serial_connect() is ready 2012-07-04 18:38:50 +02:00
jakubovsky
c848090f56 Rebuilding M-Bus context structs in progress 
- changed local library file includes from <> to ""
- get rid of 'if (is_serial)' conditions
- mbus_context_serial() and mbus_context_tcp() allocates memory and initialize context specific function pointers
- simply mbus_connect() called instead of mbus_connect_tcp() or mbus_connect_serial()
- context specific data can still be accessed via (void* auxdata) pointer
- strdup(3) to copy host IP into TCP context struct
 2012-07-04 17:18:36 +02:00
jakubovsky
9f9e0fc008 Fixed mbus_recv_frame() return value to -1 when invalid m-bus handle 2012-07-03 17:17:10 +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
Stefan Wahren
d025b27b07 - fixed check of mbus_sendrecv_request and mbus_recv_frame 
- initialized memory in mbus_sendrecv_request
- used defines for special address instead of magic numbers
 2012-06-20 00:23:25 +02:00
Stefan Wahren
0d610b6a27 - fixed check of mbus_sendrecv_request and mbus_recv_frame 
- initialize memory in mbus_sendrecv_request
- used defines for special address instead of magic numbers
 2012-06-20 00:21:28 +02:00
Robert Johansson
82aec2ff97 repo cleanup, no need for .in files in the repository 0.8.0 2012-06-18 21:11:49 +09:00
Robert Johansson
d3e4decf59 maintenance updates for new release 0.8.0 2012-06-18 21:08:10 +09:00