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

337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Wahren
67af972e69 Added a new product name database 2012-05-20 03:12:10 +02:00
Stefan Wahren
45ebed05b7 Added error message in case of invalid parameter 2012-05-20 03:05:26 +02:00
Stefan Wahren
0ed30c1ad9 Merge branch 'master' of git+ssh://git@github.com/lategoodbye/libmbus.git 2012-05-20 02:58:56 +02:00
Stefan Wahren
9154fee1c4 Merge remote branch 'upstream/master' 2012-05-20 02:56:44 +02:00
Stefan Wahren
03d4876425 New events for wildcard search 2012-05-20 02:52:11 +02:00
Stefan Wahren
c6031f3287 Added missing header file 2012-05-20 02:39:29 +02:00
Stefan Wahren
9817d00329 Fixed potential segmentation fault 2012-05-18 14:14:17 +02:00
Stefan Wahren
b055dc612f Replaced deprecated BSD against ANSI functions (bzero -> memset, bcopy 
-> memcopy)
 2012-05-18 13:55:43 +02:00
Stefan Wahren
11f6392df3 Fixed potential segmentation faults 2012-05-18 13:35:02 +02:00
Robert Johansson
567fa74660 Merge pull request #9 from lategoodbye/f14b3beb84101c90c8eea0cc024f6ce658dea4ab 
Fixed bugs with serial connection
 2012-05-16 00:30:52 -07:00
Stefan Wahren
2c98c6c54d Added test directory to automake 2012-05-15 23:43:39 +02:00
Stefan Wahren
f2919f97ca Switch back to default output 2012-05-15 23:35:13 +02:00
Stefan Wahren
f14b3beb84 Fixed bugs in wildcard search 
- init slaves before search
- corrected return codes
- handle collisions (possibly more bytes than expected)
- sync recv frame (tcp vs serial)
- add tracing
 2012-05-15 23:30:55 +02:00
Stefan Wahren
980bbb1862 Fixed baud rate switching: 
- added missing call of tcsetattr
- handle return values
- adjust timeout correctly
 2012-05-15 23:17:49 +02:00
Stefan Wahren
f7c644bee6 Fixed output format of secondary address (always 16 digits, leading 
zeros)
 2012-05-15 23:06:14 +02:00
Stefan Wahren
8e56943fc8 Merge remote branch 'upstream/master' 2012-05-15 23:01:13 +02:00
Stefan Wahren
90aec91bff Added frame tracing (hex format) via debug switch 2012-05-15 22:57:03 +02:00
Robert Johansson
29aab5b395 Merge pull request #8 from lategoodbye/master 
Introducing event handling
 2012-05-13 18:58:16 -07:00
Stefan Wahren
61893a1b3d Fixed gcc warnings 2012-05-14 00:30:15 +02:00
Stefan Wahren
4178ffceb1 Added access to DRH in xml output function for data records 2012-05-14 00:26:41 +02:00
Stefan Wahren
5a7e69f90d Merge remote branch 'upstream/master' 
Conflicts:
	mbus/mbus-serial.c
 2012-05-14 00:09:05 +02:00
Stefan Wahren
8f48d75fb0 Added 2 event callbacks to handle send and receive events outside the 
library
(now it is possible to trigger a led from an application if m-bus data
is received)
 2012-05-13 23:57:24 +02:00
Robert Johansson
7d482e47f7 use the max frame limit 16 also for serial multi-telegram transfers (some devices does not seems to stop reporting 'more data follows', so unless we set a hard limit it will loop forever. so this limit should probably be made a cmd line argument) 2012-05-13 16:39:48 +09:00
Robert Johansson
dadf3b4823 added a debug/verbose flag to the primary address scan utils 2012-05-13 16:34:34 +09:00
Robert Johansson
726f837d2d improved error handling 2012-05-13 16:34:12 +09:00
Robert Johansson
29201258e7 in mbus_frame_print for dumping frame in HEX format to stdout, now looping over all frames in a multi-telegram frame list 2012-05-13 16:33:53 +09:00
Robert Johansson
59fca0a709 added option to dump frame in HEX to stdout before writing it to the serial port 2012-05-13 16:32:55 +09:00
Robert Johansson
6f76632728 fix bug in breakout of loop due to max_frames condition 2012-05-13 16:32:17 +09:00
Robert Johansson
fd6e432213 Merge pull request #7 from lategoodbye/master 
Migrate all new features also to mbus-protocol-aux.c
 2012-05-06 23:53:33 -07:00
Stefan Wahren
d617accea5 Added new function to generate XML with normalized values 
(equivalent to mbus_frame_data_xml)
 2012-05-06 23:00:59 +02:00
Stefan Wahren
b479412ab1 Migrated all new features also to mbus-protocol-aux.c: 
- support for custom VIF
- support for date / time
- support for float
- fix for huge values
- hexdump of manufacturer specific data
 2012-05-06 22:12:29 +02:00
Stefan Wahren
6dd17954d2 Added check to avoid segmentation fault 2012-05-06 21:55:39 +02:00
Robert Johansson
93ca82781c Merge pull request #5 from lategoodbye/master 
Better multi-telegram support
 2012-04-28 19:44:56 -07:00
Stefan Wahren
42ed80a5b0 - init slave to get always the beginning of the records 
- start read with FCB set
- fixed double free in case of send failure
 2012-04-28 14:09:58 +02:00
Stefan Wahren
41a3fa1a7b Sample XSL to convert XML in HTML 2012-04-28 13:52:23 +02:00
Stefan Wahren
74bb173147 Added multi-telegram support for serial connection 2012-04-23 20:56:26 +02:00
Robert Johansson
b8e3308779 restored lost kicad file 2012-04-23 10:33:43 +09:00
Robert Johansson
44eec2c92e Merge pull request #4 from lategoodbye/master 
Improved telegram parsing
 2012-04-22 18:28:44 -07:00
Stefan Wahren
e708c62550 Merge branch 'master' of git+ssh://git@github.com/lategoodbye/libmbus.git 2012-04-22 22:34:40 +02:00
Stefan Wahren
4d0afd161c Restore files 2012-04-22 22:24:47 +02:00
Stefan Wahren
b9f8464448 Restore files 2012-04-22 20:11:08 +02:00
Stefan Wahren
df06b93e97 Merge remote branch 'upstream/master' 
Conflicts:
	mbus/mbus-protocol.c
 2012-04-22 19:37:55 +02:00
Stefan Wahren
39e7b64ff4 Fixed special characters 2012-04-22 16:29:58 +02:00
Stefan Wahren
243564a275 Fixed return value for packing error frame 2012-04-22 16:12:01 +02:00
Stefan Wahren
1db372e7ab Improved error message in case of unknown Control Code 2012-04-22 16:09:38 +02:00
Stefan Wahren
e2400f5c27 Added new defines for decoding dif 2012-04-22 16:06:54 +02:00
Stefan Wahren
5ce9a540ed Added error frames for testing 2012-04-22 15:53:54 +02:00
Robert Johansson
281394c092 attempt to unify the XML output for sequences of multi-telegram frames (single XML document, global record counts, no repeat of frame headers) 2012-04-21 08:34:01 +09:00
Robert Johansson
1d0159c531 Merge branch 'master' of github.com:rscada/libmbus 2012-04-21 07:18:21 +09:00
Robert Johansson
7c476ef924 updated mbus usb schematics from Tomas 2012-04-21 07:17:25 +09:00