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 |
|
Robert Johansson
|
75ec694ae8
|
Merge pull request #3 from lategoodbye/master
A new script to generate XML
|
2012-04-19 00:54:23 -07:00 |
|
Stefan Wahren
|
65b04fc6cb
|
Added verification of control field
|
2012-04-18 21:16:27 +02:00 |
|
Stefan Wahren
|
1b69b1b51b
|
Added a new script to generate XML files from hex files in a specified
directory
|
2012-04-16 21:04:03 +02:00 |
|
Stefan Wahren
|
a65a96e333
|
Fixed usage
|
2012-04-16 21:01:29 +02:00 |
|
Stefan Wahren
|
4958966797
|
Fixed usage
|
2012-04-16 21:00:24 +02:00 |
|
Stefan Wahren
|
bbdcac04b0
|
Fixed exit codes
|
2012-04-16 00:33:03 +02:00 |
|
Robert
|
63593b5b91
|
moved .gitignore file to top directory
|
2012-04-15 10:52:11 +09:00 |
|
Robert
|
c10b37e53d
|
got rid of duplicate catalog libmbus/libmbus
|
2012-04-15 10:51:15 +09:00 |
|
Robert Johansson
|
a7b6f180a3
|
updated list of contributers
|
2012-04-15 10:32:55 +09:00 |
|
Robert Johansson
|
d00ba63215
|
Merge pull request #2 from lategoodbye/master
Fixed medium decoding
|
2012-04-14 18:31:32 -07:00 |
|
Stefan Wahren
|
54e96f957a
|
Fixed medium decoding for 04, 0C, 0D, 0F
|
2012-04-13 20:26:54 +02:00 |
|
Robert Johansson
|
e044a12e68
|
started on a readme file, as recommended by github
|
2012-04-13 11:16:54 +09:00 |
|
Robert Johansson
|
67dae99463
|
added gitignore file
|
2012-04-13 11:02:59 +09:00 |
|
Robert Johansson
|
748db590d7
|
resolved conflict
|
2012-04-13 11:00:10 +09:00 |
|
Robert Johansson
|
bd3c270621
|
restored filename after merge
|
2012-04-13 10:48:42 +09:00 |
|
Robert Johansson
|
00731c93e4
|
renamed file to avoid merge problems
|
2012-04-13 10:46:36 +09:00 |
|
Robert Johansson
|
f324e11eb6
|
added missing file
|
2012-04-12 13:34:28 +09:00 |
|
Stefan Wahren
|
58c2bbe233
|
Merge remote-tracking branch 'old/multitelegram'
|
2012-04-12 00:38:00 +02:00 |
|
Stefan Wahren
|
e827f7ba0e
|
Merge remote-tracking branch 'old/multitelegram'
|
2012-04-12 00:23:07 +02:00 |
|
Robert Johansson
|
0e0878f6c9
|
import libmbus 0.7.X from previous official HG repository
|
2012-04-11 10:46:09 +09:00 |
|
Robert Johansson
|
24649fa89e
|
Added support for multi telegram reply
|
2012-04-10 21:57:10 +02:00 |
|
Stefan Wahren
|
3a04aedf59
|
Changed domain to rscada.se
Changed exit code for errors
|
2012-04-10 21:19:58 +02:00 |
|