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

262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Wahren
a4e92f6eab replace magic number with define 2012-12-20 20:12:19 +01:00
Stefan Wahren
b3a3dfec0b Merge remote-tracking branch 'origin/master' 2012-12-19 21:21:28 +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
c5661ba35f Add mbus-tcp-raw-send to clean up script 2012-12-19 11:30:17 +01:00
Robert Johansson
6f2986ee79 Merge pull request #30 from lategoodbye/master 
Context options, improved hex convertion, clean up
 2012-12-17 03:23:56 -08:00
Stefan Wahren
746e611236 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mbus/mbus-protocol-aux.h
 2012-12-12 18:06:40 +01:00
Robert Johansson
5dccbf4197 Merge pull request #29 from aleax/debian 
Improve debian build scripts
 2012-12-12 04:43:41 -08:00
Robert Johansson
343c62e503 Merge pull request #28 from aleax/cplusplus 
Modify C header files to include from C++ code
 2012-12-12 04:43:06 -08:00
Stefan Wahren
59ed4e8612 Merge branch 'master' of git+ssh://git@github.com/lategoodbye/libmbus.git 2012-12-11 20:24:31 +01:00
Stefan Wahren
9b94df16b9 - add new type for context options 
- add new function mbus_context_set_option to set context specific
options like retransmission or echo cancelation
 2012-12-11 20:22:26 +01:00
Stefan Wahren
410471e248 correct doxygen comment 2012-12-10 21:55:13 +01:00
Stefan Wahren
a266c96a2f - remove unnecessary POSIX header 
- change file handling from POSIX to ANSI C
 2012-12-10 21:37:42 +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
Stefan Wahren
72868fdc3f add a new helper function ( mbus_hex2bin ) to convert hex values 
into binary values
 2012-12-10 21:16:46 +01:00
aleax
49c5c751ee Improve debian build scripts 
1. Add calling autoreconf to debian/rules for purpose of automatic build
in chroot environment with pbuilder.
2. Copy missing pkg-config file libmbus.pc to /usr/lib/pkgconfig/
3. Remove unnecessary (IMHO) debian/files, becouse it automaticly deletes
by debian/rules clean action
 2012-12-05 21:38:12 +02:00
aleax
72341baea5 Modify C header files to include from C++ code 2012-12-05 21:24:58 +02:00
Robert Johansson
ee6241c331 Merge pull request #26 from lategoodbye/master 
Fixed parsing with custom VIFE
 2012-10-25 07:39:08 -07: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
cfa35db086 Fixed potential segmentation fault 2012-10-22 23:35:45 +02:00
Stefan Wahren
688f0d3bc0 Added product name mapping for Elvaco meters 2012-10-21 23:24:04 +02:00
Stefan Wahren
bc2c85c378 Add custom VIFE handling with a corrective factor (from Jakob 
Skov-Pedersen)
 2012-10-21 11:21:07 +02:00
Stefan Wahren
0c26bc17a7 Add VIF for digital input and output 
Correct some cases
 2012-10-21 11:09:21 +02:00
Stefan Wahren
99d48d27b2 Extended mbus_data_variable_print to print out VIF/VIFE 2012-10-21 11:05:08 +02:00
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 169e37d360f5782dbbfe8bf9ccb5877cb6af7fb9.
 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