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

288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Wahren
cf297a56c3 New test frame for Elvaco temperature / humidity meter (from Jakob 
Skov-Pedersen)
 2012-10-21 10:55:48 +02:00
Robert Johansson
8fb44554c5 Merge pull request #25 from lategoodbye/master 
simple echo cancelation
 2012-10-13 04:11:10 -07:00
Stefan Wahren
3de91c5eab Added product name mapping for Ista sensonic II mbus 2012-10-05 22:09:07 +02:00
Stefan Wahren
30ab8dd643 handle direction of ACK correctly 2012-10-04 23:20:28 +02:00
Stefan Wahren
da28505323 revert last commit 2012-10-04 22:59:09 +02: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
fef774d98d Purge behavior as new context parameter (default = purge master to 
slave)
 2012-10-04 22:33:22 +02:00
Stefan Wahren
78f16f0248 New defines for purge behavior (echo cancelation) 2012-10-04 22:30:53 +02:00
Stefan Wahren
f7e238afdd Extend mbus_recv_frame with simple echo cancelation 2012-10-03 23:31:37 +02:00
Stefan Wahren
af80dda0d8 Revert "Extend mbus_recv_frame with simple echo cancelation" 
This reverts commit 169e37d360.
 2012-10-03 23:25:10 +02:00
Stefan Wahren
169e37d360 Extend mbus_recv_frame with simple echo cancelation 2012-10-03 23:06:11 +02:00
Stefan Wahren
d211c3cbcb new function mbus_frame_direction to get the direction of a frame 
(slave to master or vice versa)
 2012-10-03 23:03:05 +02:00
Stefan Wahren
d6c5529247 new function mbus_frame_direction to get the direction of a frame 
(slave to master or vice versa)
extended mbus_frame_data_parse to check the direction of a frame
 2012-10-03 23:01:44 +02:00
Robert Johansson
923858eaee Merge pull request #23 from lategoodbye/master 
Bugfix XML 1.0 conformity
 2012-09-22 19:51:48 -07:00
Stefan Wahren
fe4217772c Added product name mapping for Sensus PolluCom E 2012-09-17 21:01:53 +02:00
Stefan Wahren
1ae8869d7b convert all control chars into spaces to be xml 1.0 conform 2012-09-16 18:15:55 +02:00
Robert Johansson
b5e98ba1bc Merge pull request #22 from lategoodbye/master 
Fixed typo in VIF list
 2012-09-15 18:37:34 -07:00
Stefan Wahren
564483e092 new error message in case of unknown vif 2012-09-15 02:11:14 +02:00
Stefan Wahren
b55d038899 fixed typo in vif list 2012-09-15 02:06:08 +02:00
Robert Johansson
d05b7b6582 Merge pull request #21 from lategoodbye/master 
Unified slave init and allocation bugfixes
 2012-09-04 17:18:27 -07: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
Stefan Wahren
e653894bce Merge remote-tracking branch 'upstream/master' 2012-08-25 09:09:50 +02:00
Robert Johansson
dbd69e49f5 make sure that records are initialized to avoid potential core dumps after incomplete parsning and repacking 2012-08-12 19:08:14 +09:00
Stefan Wahren
166b93a1b1 Added product name mapping for Kamstrup 382 2012-07-25 00:09:11 +02:00
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