f7c644bee6
Fixed output format of secondary address (always 16 digits, leading zeros)
Stefan Wahren
2012-05-15 23:06:14 +02:00
8e56943fc8
Merge remote branch 'upstream/master'
Stefan Wahren
2012-05-15 23:01:13 +02:00
90aec91bff
Added frame tracing (hex format) via debug switch
Stefan Wahren
2012-05-15 22:57:03 +02:00
29aab5b395
Merge pull request #8 from lategoodbye/master
Robert Johansson
2012-05-13 18:58:16 -07:00
61893a1b3d
Fixed gcc warnings
Stefan Wahren
2012-05-14 00:30:15 +02:00
4178ffceb1
Added access to DRH in xml output function for data records
Stefan Wahren
2012-05-14 00:26:41 +02:00
5a7e69f90d
Merge remote branch 'upstream/master'
Stefan Wahren
2012-05-14 00:09:05 +02:00
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)
Stefan Wahren
2012-05-13 23:57:24 +02:00
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)
Robert Johansson
2012-05-13 16:39:48 +09:00
dadf3b4823
added a debug/verbose flag to the primary address scan utils
Robert Johansson
2012-05-13 16:34:34 +09:00
726f837d2d
improved error handling
Robert Johansson
2012-05-13 16:34:12 +09:00
29201258e7
in mbus_frame_print for dumping frame in HEX format to stdout, now looping over all frames in a multi-telegram frame list
Robert Johansson
2012-05-13 16:33:53 +09:00
59fca0a709
added option to dump frame in HEX to stdout before writing it to the serial port
Robert Johansson
2012-05-13 16:32:55 +09:00
6f76632728
fix bug in breakout of loop due to max_frames condition
Robert Johansson
2012-05-13 16:32:17 +09:00
fd6e432213
Merge pull request #7 from lategoodbye/master
Robert Johansson
2012-05-06 23:53:33 -07:00
d617accea5
Added new function to generate XML with normalized values (equivalent to mbus_frame_data_xml)
Stefan Wahren
2012-05-06 23:00:59 +02:00
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
Stefan Wahren
2012-05-06 22:12:29 +02:00
6dd17954d2
Added check to avoid segmentation fault
Stefan Wahren
2012-05-06 21:55:39 +02:00
93ca82781c
Merge pull request #5 from lategoodbye/master
Robert Johansson
2012-04-28 19:44:56 -07:00
42ed80a5b0
- init slave to get always the beginning of the records - start read with FCB set - fixed double free in case of send failure
Stefan Wahren
2012-04-28 14:09:58 +02:00
41a3fa1a7b
Sample XSL to convert XML in HTML
Stefan Wahren
2012-04-28 13:52:23 +02:00
74bb173147
Added multi-telegram support for serial connection
Stefan Wahren
2012-04-23 20:56:26 +02:00
b8e3308779
restored lost kicad file
Robert Johansson
2012-04-23 10:33:43 +09:00
44eec2c92e
Merge pull request #4 from lategoodbye/master
Robert Johansson
2012-04-22 18:28:44 -07:00
e708c62550
Merge branch 'master' of git+ssh://git@github.com/lategoodbye/libmbus.git
Stefan Wahren
2012-04-22 22:34:40 +02:00
4d0afd161c
Restore files
Stefan Wahren
2012-04-22 22:24:47 +02:00
b9f8464448
Restore files
Stefan Wahren
2012-04-22 20:11:08 +02:00
df06b93e97
Merge remote branch 'upstream/master'
Stefan Wahren
2012-04-22 19:37:55 +02:00
39e7b64ff4
Fixed special characters
Stefan Wahren
2012-04-22 16:29:58 +02:00
243564a275
Fixed return value for packing error frame
Stefan Wahren
2012-04-22 16:12:01 +02:00
1db372e7ab
Improved error message in case of unknown Control Code
Stefan Wahren
2012-04-22 16:09:38 +02:00
e2400f5c27
Added new defines for decoding dif
Stefan Wahren
2012-04-22 16:06:54 +02:00
5ce9a540ed
Added error frames for testing
Stefan Wahren
2012-04-22 15:53:54 +02:00
281394c092
attempt to unify the XML output for sequences of multi-telegram frames (single XML document, global record counts, no repeat of frame headers)
Robert Johansson
2012-04-21 08:34:01 +09:00
1d0159c531
Merge branch 'master' of github.com:rscada/libmbus
Robert Johansson
2012-04-21 07:18:21 +09:00
7c476ef924
updated mbus usb schematics from Tomas
Robert Johansson
2012-04-21 07:17:25 +09:00
75ec694ae8
Merge pull request #3 from lategoodbye/master
Robert Johansson
2012-04-19 00:54:23 -07:00
65b04fc6cb
Added verification of control field
Stefan Wahren
2012-04-18 21:16:27 +02:00
1b69b1b51b
Added a new script to generate XML files from hex files in a specified directory
Stefan Wahren
2012-04-16 21:04:03 +02:00
a65a96e333
Fixed usage
Stefan Wahren
2012-04-16 21:01:29 +02:00
4958966797
Fixed usage
Stefan Wahren
2012-04-16 21:00:24 +02:00
bbdcac04b0
Fixed exit codes
Stefan Wahren
2012-04-16 00:33:03 +02:00
63593b5b91
moved .gitignore file to top directory
Robert
2012-04-15 10:52:11 +09:00
c10b37e53d
got rid of duplicate catalog libmbus/libmbus
Robert
2012-04-15 10:51:15 +09:00
a7b6f180a3
updated list of contributers
Robert Johansson
2012-04-15 10:32:55 +09:00
d00ba63215
Merge pull request #2 from lategoodbye/master
Robert Johansson
2012-04-14 18:31:32 -07:00
54e96f957a
Fixed medium decoding for 04, 0C, 0D, 0F
Stefan Wahren
2012-04-13 20:26:54 +02:00
e044a12e68
started on a readme file, as recommended by github
Robert Johansson
2012-04-13 11:16:54 +09:00
67dae99463
added gitignore file
Robert Johansson
2012-04-13 11:02:59 +09:00
748db590d7
resolved conflict
Robert Johansson
2012-04-13 11:00:10 +09:00
bd3c270621
restored filename after merge
Robert Johansson
2012-04-13 10:48:42 +09:00
00731c93e4
renamed file to avoid merge problems
Robert Johansson
2012-04-13 10:46:36 +09:00
f324e11eb6
added missing file
Robert Johansson
2012-04-12 13:34:28 +09:00
58c2bbe233
Merge remote-tracking branch 'old/multitelegram'
Stefan Wahren
2012-04-12 00:38:00 +02:00
e827f7ba0e
Merge remote-tracking branch 'old/multitelegram'
Stefan Wahren
2012-04-12 00:23:07 +02:00
0e0878f6c9
import libmbus 0.7.X from previous official HG repository
Robert Johansson
2012-04-11 10:46:09 +09:00
24649fa89e
Added support for multi telegram reply
Robert Johansson
2012-04-10 21:57:10 +02:00
3a04aedf59
Changed domain to rscada.se Changed exit code for errors
Stefan Wahren
2012-04-10 21:19:58 +02:00
30d1433ded
Removed old binary
Stefan Wahren
2012-04-09 21:14:08 +02:00
96fb4a9335
Added program to switch baudrate of M-Bus slave (untested)
Stefan Wahren
2012-04-08 18:43:13 +02:00
ef87360669
Added better error messsages for mbus_parse_hex
Stefan Wahren
2012-04-08 17:40:56 +02:00
bead41be92
Added function to switch parse debugging
Stefan Wahren
2012-04-08 17:37:25 +02:00
6a2a27328c
Added binary dump of manufacturer specific data
Stefan Wahren
2012-04-07 18:44:48 +02:00
b748a0f71a
Removed debug output
Stefan Wahren
2012-04-07 17:56:24 +02:00
0366737971
Fixed broken declaration of 2 functions
Stefan Wahren
2012-04-06 22:22:30 +02:00
ae8a5e017f
Removed unused variables
Stefan Wahren
2012-04-06 21:55:18 +02:00
16716d83c1
Added bugfix to stop parsing in frames with more data than specified
Stefan Wahren
2012-04-06 18:57:55 +02:00