wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • c59f584937 Tests: Update XML files fixes in a8eaced. strongly-typed 2016-05-09 01:16:19 +02:00
  • ab59b56a49 Tests: add product strings added with ed87f62 strongly-typed 2016-05-09 00:01:37 +02:00
  • 1fc2323080 Run tests with Travis CI. gitignore test xml.new. strongly-typed 2016-05-08 23:43:55 +02:00
  • 0e5b5b46a8 Fix regression with XML output. strongly-typed 2016-05-09 01:10:36 +02:00
  • 8c232f3da3 Travis builds for OS X, too. And Travis badge. strongly-typed 2016-05-08 22:25:32 +02:00
  • a8eaceda40 Merge pull request #99 from rscada/bugfixes Stefan Wahren 2016-04-01 21:26:40 +02:00
  • 9edcc44eeb Fix several format string issues Stefan Wahren 2016-04-01 19:20:00 +00:00
  • 7fe67c8586 Fix format string in mbus_send_user_data_frame Stefan Wahren 2016-04-01 18:27:59 +00:00
  • 9906723447 Fix IEEE754 conversion Stefan Wahren 2016-04-01 18:19:32 +00:00
  • 78298bc68e Merge pull request #93 from arska/feature-ignoretestbinaries Stefan Wahren 2016-03-26 11:43:42 +01:00
  • b6cbb1de1e merge rscada/master with arska/feature-ignoretestbinaries Aarno Aukia 2016-03-25 23:20:34 +01:00
  • b9b131d064 Order device detection by manufacurer merging ELS so that TMP-A is detected again Aarno Aukia 2016-02-08 14:06:24 +01:00
  • ee2c4bada8 Merge pull request #96 from lategoodbye/upstream-merge2 Stefan Wahren 2016-02-06 13:37:12 +01:00
  • ed87f62a87 Add product strings for devices from ABB, Elster and Relay Stefan Wahren 2016-02-06 12:04:13 +00:00
  • a659ca0494 Add some hexdumps of M-Bus frames Stefan Wahren 2016-02-06 11:06:03 +00:00
  • cf4d11b0fc Merge pull request #92 from arska/feature-macosxbuild Stefan Wahren 2016-02-06 00:54:25 +01:00
  • 8af6b97647 Add MacOS X build support Sam Krew 2016-02-05 18:51:02 +01:00
  • eaeb6e5502 retab and remove trailing whitespace Aarno Aukia 2016-02-05 14:30:28 +01:00
  • c11ef4b830 add XML output for existing test cases Aarno Aukia 2016-02-05 14:15:03 +01:00
  • 9fb9f30a58 add new test cases from my lab Aarno Aukia 2016-02-05 14:05:45 +01:00
  • 7eaadad124 update existing test-case-output with the changes introduced in 781736fe4c Aarno Aukia 2016-02-05 14:03:37 +01:00
  • 0751e0d88f remove exec bit from test cases Aarno Aukia 2016-02-05 14:42:12 +01:00
  • b55422b034 move error test cases to their own folder Aarno Aukia 2016-02-05 14:41:05 +01:00
  • 89195f627a retab and remove trailing whitespace Aarno Aukia 2016-02-05 14:36:19 +01:00
  • 2170faa357 gitignore test binaries and testing temp files Aarno Aukia 2016-02-01 20:46:20 +01:00
  • 8b1c012a91 Add product strings of Janitza UMG 96S Stefan Wahren 2016-02-02 18:57:57 +00:00
  • 012dc5ba36 Merge pull request #91 from lategoodbye/upstream-merge Stefan Wahren 2016-01-31 19:19:03 +01:00
  • db40010b93 Add product strings of Berg DCMi, BLMi and BMB-10S0 Stefan Wahren 2016-01-31 18:09:21 +00:00
  • 04eae740b4 Add product strings of Carlo Gavazzi EM21,EM24,EM33 Stefan Wahren 2016-01-31 18:00:02 +00:00
  • 0927f23ee7 Let mbus_str_xml_encode return a resultcode Stefan Wahren 2016-01-31 17:55:09 +00:00
  • 3699d25b10 Fix uninitialized strings Stefan Wahren 2014-05-10 15:54:17 +02:00
  • f6dcf6e8d1 Fixed naming in declaration Stefan Wahren 2014-02-06 20:15:12 +01:00
  • 5674b30a6c Make use of package version from autotools Stefan Wahren 2014-02-06 19:25:41 +01:00
  • bce4c6959b Merge pull request #87 from vrtsystems/ieee754-conversion Robert 2015-12-30 10:17:24 +09:00
  • ef6c4be655 Safer IEEE754 conversion. Stuart Longland 2015-12-03 08:08:22 +10:00
  • 583a397e8e Needless math.h include jakubovsky 2012-08-21 06:56:36 +02:00
  • 7e1be93dbd Needless IEEE754 conversion, float pointer cast instead jakubovsky 2012-08-21 06:08:23 +02:00
  • 61f6942448 Fix Frame Count Bit handling fix-fcb-handling Stefan Wahren 2015-06-27 12:55:12 +02:00
  • 716d712314 Merge pull request #74 from schnurksel/hex_dump Stefan Wahren 2015-04-11 12:36:03 +02:00
  • 90bb12f9b0 Merge pull request #72 from schnurksel/beautify_tabs_spaces Stefan Wahren 2015-04-11 12:35:45 +02:00
  • 1bc9f72c27 Merge pull request #71 from schnurksel/add_meter_strings Stefan Wahren 2015-04-11 11:57:16 +02:00
  • 576cefe80a Merge pull request #70 from schnurksel/add_codepage_to_xml_output Stefan Wahren 2015-04-11 11:55:41 +02:00
  • 53d66c3dd5 Merge pull request #79 from mhei/master Robert 2015-03-07 17:52:06 +09:00
  • 2dea1b99f3 Add hint file for Travis CI Michael Heimpold 2015-01-25 11:28:28 +01:00
  • 00d0fc0aaf add hex dump for regression tests as requested by lategoodbye Dirk Zenker 2014-03-13 13:33:28 +01:00
  • 5f0b5d5dd1 Beautify: replace tabs with spaces and remove trailing spaces Dirk Zenker 2014-02-24 15:20:32 +01:00
  • f47caf151e add manufacturer id / product string of some meters: Aquametro CALEC MB Aquametro CALEC ST Elster SensoStar 2 Elster F96 Plus Elster F4 EMU Professional 3/75 M-Bus Deltamess F2 Sensus PolluTherm Sensus PolluStat E NZR IC-M2 Saia-Burgess ALE3 Saia-Burgess AWD3 Dirk Zenker 2014-02-24 11:22:40 +01:00
  • 781736fe4c add codepage to XML output Dirk Zenker 2014-02-24 11:02:26 +01:00
  • 57fceeb09a Merge pull request #69 from schnurksel/fix_storage_unit_tariff_calculation Robert 2014-02-22 12:49:41 +09:00
  • 8197874fe7 bugfix, the functions mbus_data_record_storage_number() mbus_data_record_tariff() mbus_data_record_device() did return bogus random values, because of uninitialized variables Dirk Zenker 2014-02-20 11:26:31 +01:00
  • 3062c797a9 Merge pull request #66 from mhei/fixes Robert 2014-02-06 23:34:05 +09:00
  • 9e81912a20 Merge pull request #65 from mhei/manufacturer-id Robert 2014-02-06 23:33:47 +09:00
  • f262138572 mbus_manufacturer_id: add error checking code Michael Heimpold 2014-01-18 20:43:57 +01:00
  • 0fccc0e337 Add a function to calculate the manufacturer ID from the 3 byte ASCII code. The formula can be found at http://www.m-bus.com/files/w4b21021.pdf, chapter 3.3 at page 6. Michael Heimpold 2014-01-18 13:44:01 +01:00
  • 6abc6cd15d gitignore: add mbus-tcp-application-reset Michael Heimpold 2014-01-18 13:23:33 +01:00
  • 0102dc6ae5 Merge pull request #64 from lategoodbye/master Robert 2013-11-12 05:36:49 -08:00
  • a32e325979 Update XML files because of storage number, tariff and device Stefan Wahren 2013-11-07 12:06:09 +01:00
  • f42c56f19c fix 2nd address scanning bug, add some comments Aarno Aukia 2013-11-07 11:14:15 +01:00
  • 0d9f83ba88 Extend XML output with storage number, tariff and device Stefan Wahren 2013-11-07 00:32:01 +01:00
  • e1ca652bf0 Extend mbus_record with storage number, tariff and device Stefan Wahren 2013-11-07 00:31:03 +01:00
  • 58778ba9bc Add functions to decode storage number, tariff and device from DIF Stefan Wahren 2013-11-07 00:24:11 +01:00
  • d79cb1c998 Fix BCD decoding bug Stefan Wahren 2013-11-07 00:13:56 +01:00
  • e9d39d4708 Extend DIF debug output (storage number LSB) Fix DIFE debug output (storage number, tariff, device unit) Fix typos in comments Replace magic bit masks with defines Stefan Wahren 2013-11-06 11:11:43 +01:00
  • 3aa81cfb23 Add DIF extension bit masks Stefan Wahren 2013-11-06 10:15:15 +01:00
  • 7f00f72b69 Add missing VIF=7Eh / FEh Stefan Wahren 2013-11-01 17:17:57 +01:00
  • 6021f3cc65 Fix VIF extension mappings for VIF=0FBh Stefan Wahren 2013-11-01 17:13:49 +01:00
  • 887d6a2914 Add test frame for GMC EMMOD 206 Stefan Wahren 2013-10-31 23:05:39 +01:00
  • 4b82502c06 Add product name mapping for GMC-I EMMOD206 Stefan Wahren 2013-10-31 23:01:06 +01:00
  • 9d84318631 Add manufacturer ID for GMC Stefan Wahren 2013-10-31 22:59:59 +01:00
  • 6ffa521473 Update XML after fixing bug with signed integer Stefan Wahren 2013-10-31 22:27:48 +01:00
  • 6afe7a10dc fix wrong decoding of integer / type B (now handle signedness correctly) separate result code und decoded value for integer decoding (new parameter) refactor variable names Stefan Wahren 2013-10-31 22:25:34 +01:00
  • 663642b7ec Adopt retransmission for secondary address probing Stefan Wahren 2013-10-19 13:56:58 +02:00
  • e6173103e2 Avoid unnecessary data request in mbus_read_slave Stefan Wahren 2013-10-19 13:43:00 +02:00
  • b674dfcf24 Use new retransmission option and handle member Stefan Wahren 2013-10-19 11:44:37 +02:00
  • 31016929bc Seperate retransmission maximum in two parameters one for data requests and another for search requests - add new handle member for max search retransmission - set default maximum for search retransmission to one - rename define for retransmission option Stefan Wahren 2013-10-18 20:15:53 +02:00
  • 7ca329ee40 Add product name mapping for Rossweiner Modularis Stefan Wahren 2013-10-18 17:32:22 +02:00
  • fc8392de91 Merge remote-tracking branch 'upstream/master' Stefan Wahren 2013-10-17 15:55:57 +02:00
  • d54b594696 Sync behavior to mbus-serial-request-data-multi-reply - init slaves before requesting data - free ressources before exit - refactor data request - fix comments Stefan Wahren 2013-10-17 14:17:57 +02:00
  • 28b73bf9d8 Add manufacturer ID for Rossweiner Stefan Wahren 2013-10-17 13:45:45 +02:00
  • ef0f05c460 Merge pull request #60 from lategoodbye/master Robert 2013-10-15 09:37:35 -07:00
  • c2a3f4b871 Fix event handling after moving callbacks to mbus handle Stefan Wahren 2013-10-13 21:56:15 +02:00
  • 0cf57bfc35 Move event handling from global variable to handle - remove global event function pointer - add event function pointer to handle structure - add handle parameter to register functions - move all register functions to mbus-protocol-aux.c Stefan Wahren 2013-10-13 21:49:40 +02:00
  • 9e23818152 Add new function to send a user data packet from master to slave Stefan Wahren 2013-10-13 14:52:45 +02:00
  • d5f06ec910 Replace magic number for M-Bus frame data length with define Stefan Wahren 2013-10-05 10:38:07 +02:00
  • 3e24215e51 Merge pull request #59 from lategoodbye/master Robert 2013-10-02 06:58:45 -07:00
  • 55d4c0fba2 Remove trailing whitespace Stefan Wahren 2013-09-13 17:53:33 +02:00
  • 654905a94d bug fix in timeout config Robert Johansson 2013-08-30 00:20:35 +09:00
  • fd5c9adffb made it possible to configure the TCP read timeout parameter Robert Johansson 2013-08-30 00:05:22 +09:00
  • 84ffacadff Merge pull request #57 from lategoodbye/master Robert Johansson 2013-08-03 19:35:59 -07:00
  • d9dd055bea Fix mbus_vib_unit_lookup remove unreachable code add missing unit password fix typo Stefan Wahren 2013-08-03 16:35:09 +02:00
  • c8aaa8dc32 Add new test frames from Elster Falcon and Relay Padpuls Stefan Wahren 2013-08-03 16:23:20 +02:00
  • fb84fd11a8 Add additional check if directory is empty or hex file doesn't exists Stefan Wahren 2013-08-03 15:51:34 +02:00
  • 55c2bf0dee Add normalized values option -n Add file pointer check after fread Stefan Wahren 2013-07-17 22:21:07 +02:00
  • 8f61edc85d remove the CUnit based unit test, since it does not work well (does not show which test that is failing...). instead we can use Stefan's nice generate-xml.sh which show exactly which test frames fails and the diff. Robert Johansson 2013-07-05 00:12:38 +09:00
  • 87cadafea0 updated XML files for test frames Robert Johansson 2013-07-05 00:07:03 +09:00
  • 5160a10211 fixed warning Robert Johansson 2013-07-04 23:59:41 +09:00
  • b1473adc46 fixed warning Robert Johansson 2013-07-04 23:49:42 +09:00
  • 5b83cad8fb only show timestamp in XML output if it is set (not all frames that goes into mbus_parse passes through timestamp), to avoid a lot of '<Timestamp>1970-01-01T00:00:00</Timestamp>' Robert Johansson 2013-07-04 23:47:06 +09:00
  • 1fee3d9a5a bug fix: don't assume that frame->next is zeroed before mbus_parse is called Robert Johansson 2013-07-04 23:30:27 +09:00
  • a8f5c07fcf Merge pull request #56 from lategoodbye/master Robert Johansson 2013-07-04 07:04:58 -07:00