Commit Graph

233 Commits

Author SHA1 Message Date
6166553755 Make my last change more readable.
As suggested by lategoodbye. Also make it more in line with the way
everything else is written.
2013-03-17 09:19:29 +01:00
363f59a149 Ignore filler DIF (= 0x2F) 2013-03-11 09:27:16 +01:00
91f0c87207 Merge pull request #37 from lategoodbye/master
replace magic numbers
2013-03-02 16:34:58 -08:00
b1063db3bc replace magic numbers with defines
fix MBUS_MAX_PRIMARY_SLAVES to 250
2013-03-02 18:03:31 +01:00
b67ed06ffc Merge pull request #36 from tmtom/pkgconfig
Updated pkgconfig - added math lib dependency
2013-02-09 20:04:50 -08:00
70a4ef7f92 Updated pkgconfig - added math lib dependency 2013-02-09 22:35:16 +01:00
be6e49db16 Merge pull request #35 from aleax/bugfix
Fix undeclared variable
2013-01-14 02:37:42 -08:00
4cd114e911 Fix undeclared variable 2013-01-14 12:28:14 +02:00
86a7305f5e Merge pull request #34 from lategoodbye/master
Address check functions
2013-01-01 06:18:42 -08:00
312eca72e5 fix logic of secondary address check 2012-12-31 13:53:40 +01:00
e248d6e421 replace address parameter checks with new helper functions 2012-12-31 13:44:03 +01:00
898ee57d41 replace address parameter checks with new helper functions 2012-12-31 13:42:27 +01:00
61fd2aa1c7 add new helper functions to check primary and secondary addresses 2012-12-31 13:37:17 +01:00
a8cc7b0acd Merge pull request #33 from aleax/debian
Add libmbus1-dbg package.
2012-12-29 23:44:51 -08:00
a409a917b9 Merge pull request #32 from lategoodbye/master
Fix segmentation fault
2012-12-29 23:44:40 -08:00
9c9c0201f9 add exploit for invalid length 2012-12-29 11:57:13 +01:00
94e5c93299 Add libmbus1-dbg package. 2012-12-25 11:49:20 +02:00
2335deb742 Fix segmentation fault
- check if L Field is at least 3 to avoid crash (MBDOC48.PDF, page 23)
2012-12-22 00:08:59 +01:00
ded841eeb5 Merge pull request #31 from lategoodbye/master
Some clean ups
2012-12-21 05:27:51 -08:00
1080031879 Merge remote-tracking branch 'origin/master'
Conflicts:
	mbus/mbus-protocol.c
2012-12-20 20:57:33 +01:00
404e245af5 replace magic number with define 2012-12-20 20:42:10 +01:00
a4e92f6eab replace magic number with define 2012-12-20 20:12:19 +01:00
b3a3dfec0b Merge remote-tracking branch 'origin/master' 2012-12-19 21:21:28 +01:00
48a5b2bab7 Extend clean up script (based on the changes from tmtom) 2012-12-19 21:20:38 +01:00
c5661ba35f Add mbus-tcp-raw-send to clean up script 2012-12-19 11:30:17 +01:00
6f2986ee79 Merge pull request #30 from lategoodbye/master
Context options, improved hex convertion, clean up
2012-12-17 03:23:56 -08:00
746e611236 Merge remote-tracking branch 'upstream/master'
Conflicts:
	mbus/mbus-protocol-aux.h
2012-12-12 18:06:40 +01:00
5dccbf4197 Merge pull request #29 from aleax/debian
Improve debian build scripts
2012-12-12 04:43:41 -08:00
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
59ed4e8612 Merge branch 'master' of git+ssh://git@github.com/lategoodbye/libmbus.git 2012-12-11 20:24:31 +01:00
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
410471e248 correct doxygen comment 2012-12-10 21:55:13 +01:00
a266c96a2f - remove unnecessary POSIX header
- change file handling from POSIX to ANSI C
2012-12-10 21:37:42 +01:00
be68f84d38 remove unnecessary POSIX header 2012-12-10 21:35:02 +01:00
dc948566db remove unnecessary POSIX header 2012-12-10 21:26:48 +01:00
72868fdc3f add a new helper function ( mbus_hex2bin ) to convert hex values
into binary values
2012-12-10 21:16:46 +01:00
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
72341baea5 Modify C header files to include from C++ code 2012-12-05 21:24:58 +02:00
ee6241c331 Merge pull request #26 from lategoodbye/master
Fixed parsing with custom VIFE
2012-10-25 07:39:08 -07:00
ad6297cb05 experimental command-line tool for sending raw (hex) frames to a select mbus unit 2012-10-23 21:34:38 +09:00
cfa35db086 Fixed potential segmentation fault 2012-10-22 23:35:45 +02:00
688f0d3bc0 Added product name mapping for Elvaco meters 2012-10-21 23:24:04 +02:00
bc2c85c378 Add custom VIFE handling with a corrective factor (from Jakob
Skov-Pedersen)
2012-10-21 11:21:07 +02:00
0c26bc17a7 Add VIF for digital input and output
Correct some cases
2012-10-21 11:09:21 +02:00
99d48d27b2 Extended mbus_data_variable_print to print out VIF/VIFE 2012-10-21 11:05:08 +02:00
cf297a56c3 New test frame for Elvaco temperature / humidity meter (from Jakob
Skov-Pedersen)
2012-10-21 10:55:48 +02:00
8fb44554c5 Merge pull request #25 from lategoodbye/master
simple echo cancelation
2012-10-13 04:11:10 -07:00
3de91c5eab Added product name mapping for Ista sensonic II mbus 2012-10-05 22:09:07 +02:00
30ab8dd643 handle direction of ACK correctly 2012-10-04 23:20:28 +02:00
da28505323 revert last commit 2012-10-04 22:59:09 +02:00