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

Commit Graph

  • bc2c85c378 Add custom VIFE handling with a corrective factor (from Jakob Skov-Pedersen) Stefan Wahren 2012-10-21 11:21:07 +02:00
  • 0c26bc17a7 Add VIF for digital input and output Correct some cases Stefan Wahren 2012-10-21 11:09:21 +02:00
  • 99d48d27b2 Extended mbus_data_variable_print to print out VIF/VIFE Stefan Wahren 2012-10-21 11:05:08 +02:00
  • cf297a56c3 New test frame for Elvaco temperature / humidity meter (from Jakob Skov-Pedersen) Stefan Wahren 2012-10-21 10:55:48 +02:00
  • 8fb44554c5 Merge pull request #25 from lategoodbye/master Robert Johansson 2012-10-13 04:11:10 -07:00
  • 3de91c5eab Added product name mapping for Ista sensonic II mbus Stefan Wahren 2012-10-05 22:09:07 +02:00
  • 30ab8dd643 handle direction of ACK correctly Stefan Wahren 2012-10-04 23:20:28 +02:00
  • da28505323 revert last commit Stefan Wahren 2012-10-04 22:59:09 +02:00
  • 606d238a6d Merge branch 'master' of git+ssh://git@github.com/lategoodbye/libmbus.git Stefan Wahren 2012-10-04 22:43:06 +02:00
  • fef774d98d Purge behavior as new context parameter (default = purge master to slave) Stefan Wahren 2012-10-04 22:33:22 +02:00
  • 78f16f0248 New defines for purge behavior (echo cancelation) Stefan Wahren 2012-10-04 22:30:53 +02:00
  • f7e238afdd Extend mbus_recv_frame with simple echo cancelation Stefan Wahren 2012-10-03 23:31:37 +02:00
  • af80dda0d8 Revert "Extend mbus_recv_frame with simple echo cancelation" Stefan Wahren 2012-10-03 23:25:10 +02:00
  • 169e37d360 Extend mbus_recv_frame with simple echo cancelation Stefan Wahren 2012-10-03 23:06:11 +02:00
  • d211c3cbcb new function mbus_frame_direction to get the direction of a frame (slave to master or vice versa) Stefan Wahren 2012-10-03 23:03:05 +02:00
  • d6c5529247 new function mbus_frame_direction to get the direction of a frame (slave to master or vice versa) extended mbus_frame_data_parse to check the direction of a frame Stefan Wahren 2012-10-03 23:01:44 +02:00
  • 923858eaee Merge pull request #23 from lategoodbye/master Robert Johansson 2012-09-22 19:51:48 -07:00
  • fe4217772c Added product name mapping for Sensus PolluCom E Stefan Wahren 2012-09-17 21:01:53 +02:00
  • 1ae8869d7b convert all control chars into spaces to be xml 1.0 conform Stefan Wahren 2012-09-16 18:15:55 +02:00
  • b5e98ba1bc Merge pull request #22 from lategoodbye/master Robert Johansson 2012-09-15 18:37:34 -07:00
  • 564483e092 new error message in case of unknown vif Stefan Wahren 2012-09-15 02:11:14 +02:00
  • b55d038899 fixed typo in vif list Stefan Wahren 2012-09-15 02:06:08 +02:00
  • d05b7b6582 Merge pull request #21 from lategoodbye/master Robert Johansson 2012-09-04 17:18:27 -07:00
  • 501b105d01 unify m-bus slave init Stefan Wahren 2012-09-01 22:52:55 +02:00
  • 1a538e73aa New parameter for mbus_send_ping_frame to purge response Stefan Wahren 2012-09-01 22:51:44 +02:00
  • d2608d5de7 add allocation error handling Stefan Wahren 2012-09-01 22:14:21 +02:00
  • e653894bce Merge remote-tracking branch 'upstream/master' Stefan Wahren 2012-08-25 09:09:50 +02:00
  • dbd69e49f5 make sure that records are initialized to avoid potential core dumps after incomplete parsning and repacking Robert Johansson 2012-08-12 19:08:14 +09:00
  • 166b93a1b1 Added product name mapping for Kamstrup 382 Stefan Wahren 2012-07-25 00:09:11 +02:00
  • d816a1c30f Merge branch 'master' of github.com:rscada/libmbus Robert Johansson 2012-07-25 00:04:16 +09:00
  • 543d3493d7 added test frame with float point value that was incorrectly decoded (now fixed) Robert Johansson 2012-07-25 00:02:24 +09:00
  • ed61932579 fixed bug in float point decoding. previously failed when exponent<0. Robert Johansson 2012-07-24 23:59:20 +09:00
  • 989fdbd7ee added -lm in link flags (libmbus uses the pow function from libm) Robert Johansson 2012-07-24 23:55:56 +09:00
  • 4af9518ce5 correct fprintf format type for size_t Robert Johansson 2012-07-24 23:11:02 +09:00
  • 0ca0148bba Merge pull request #19 from lategoodbye/master Robert Johansson 2012-07-19 14:35:09 -07:00
  • 418e6741ae Merge pull request #18 from tmtom/tmtom_fixes Robert Johansson 2012-07-19 14:34:31 -07:00
  • 84dd8c2352 Expanded manpage Tmtom 2012-07-19 22:56:22 +02:00
  • 3bc701e995 Corrected pkgnames/dirnames Tmtom 2012-07-19 22:34:03 +02:00
  • db6a1954f0 Added share/doc to be distributed as well. Tmtom 2012-07-19 21:54:17 +02:00
  • 632ff8c921 Updated schema, added KiCAD project. Tmtom 2012-07-19 21:33:46 +02:00
  • 5467679f66 Reset retry counter after valid frame to be conform with M-Bus documentation Stefan Wahren 2012-07-19 21:08:07 +02:00
  • 7a83f7931d Fixed command args handling of mbus-serial-scan-secondary Stefan Wahren 2012-07-19 20:09:24 +02:00
  • 63959632e3 Added manpages to the deb package, added autottols call to build-deb.sh Tmtom 2012-07-18 21:06:03 +02:00
  • 67577dd2d9 Added cleanup script Tmtom 2012-07-18 19:33:56 +02:00
  • 1a449d8f36 Further cleanup. Need to check debian builds and possible provide cleanup script. Tmtom 2012-07-18 19:18:11 +02:00
  • a901d94b44 Cleaned up the GIT repository (expanded .gitignore, removed autogenerated files). Tmtom 2012-07-18 18:15:47 +02:00
  • db343cba2b First version of manpages. Added remaining baud rates for serial communication. Tmtom 2012-07-17 21:50:02 +02:00
  • 36c46d18c2 Merge pull request #17 from lategoodbye/master Robert Johansson 2012-07-14 08:40:04 -07:00
  • 555c627665 Removed unnecessary sleep Stefan Wahren 2012-07-14 16:25:52 +02:00
  • 08a4c55443 - Initialize maximum retry counter to 3 for serial and tcp connections - Retransmit request frame (just for mbus_sendrecv_request) in case of timeout or invalid response Stefan Wahren 2012-07-14 16:22:25 +02:00
  • 97f2ac34ba M-Bus handle extended by maximum retry counter (in case of transmission errors) Stefan Wahren 2012-07-14 16:15:45 +02:00
  • 3386f0a419 Merge pull request #16 from lategoodbye/master Robert Johansson 2012-07-13 16:59:51 -07:00
  • c86ed10af7 Fixed result check for mbus_connect Stefan Wahren 2012-07-13 23:01:29 +02:00
  • 5d724d9473 Initialize reply structures to avoid segmentation fault in debug Stefan Wahren 2012-07-13 22:59:26 +02:00
  • 198e9afcef Merge pull request #15 from lategoodbye/master Robert Johansson 2012-07-12 16:59:51 -07:00
  • e6a52f97ea Replaced magic resultcodes from mbus_recv_frame with defines Stefan Wahren 2012-07-11 23:33:52 +02:00
  • ff37c4af8c Added test frames: - ABB F95 - Allmess Megacontrol CF-50 - Elster TMP-A - EMH DIZ - NZR DMZ 5/63 Stefan Wahren 2012-07-11 22:41:13 +02:00
  • 9ef64d0fb5 added contributor Robert Johansson 2012-07-10 19:52:47 +09:00
  • 69373692b1 Merge pull request #14 from jakubovsky/master Robert Johansson 2012-07-09 08:03:41 -07:00
  • b95f29fcc8 mbus_connect() and mbus_disconnect() return 0 on success and -1 otherwise jakubovsky 2012-07-09 12:33:32 +02:00
  • 5f9052b284 Renamed mbus_recv_frame_dummy() to more descriptive mbus_purge_frames() jakubovsky 2012-07-09 10:48:13 +02:00
  • e70c07e8f3 TCP and serial specific data structs renamed. jakubovsky 2012-07-06 11:29:46 +02:00
  • 78a6013d75 mbus_recv_dummy() instead of while loop. jakubovsky 2012-07-06 11:21:24 +02:00
  • 6b2d43617f Merge remote-tracking branch 'upstream/master' jakubovsky 2012-07-06 11:14:47 +02:00
  • d7f63586c6 Merge pull request #13 from lategoodbye/master Robert Johansson 2012-07-05 06:30:52 -07:00
  • 433744c80a Fix problem with multiple selected devices (secondary address) - resend SND_NKE to ensure all devices are deselected, because the first SND_NKE could get lost Stefan Wahren 2012-07-04 21:21:01 +02:00
  • 736181b35e Revert "Fix problem with multiple selected devices (secondary address) resend " Stefan Wahren 2012-07-04 21:15:55 +02:00
  • 1fa5e202fb Fix problem with multiple selected devices (secondary address) resend Stefan Wahren 2012-07-04 21:14:00 +02:00
  • ec50ab9286 Examples from bin directory updated. API usage updated in mbus-protocol-aux.h. jakubovsky 2012-07-04 19:49:54 +02:00
  • 34255c7237 free_auxdata() added to mbus_handle interface for freeing context specific data jakubovsky 2012-07-04 19:08:51 +02:00
  • 645e5eb482 mbus_serial_connect() is ready jakubovsky 2012-07-04 18:38:50 +02:00
  • c848090f56 Rebuilding M-Bus context structs in progress - changed local library file includes from <> to "" - get rid of 'if (is_serial)' conditions - mbus_context_serial() and mbus_context_tcp() allocates memory and initialize context specific function pointers - simply mbus_connect() called instead of mbus_connect_tcp() or mbus_connect_serial() - context specific data can still be accessed via (void* auxdata) pointer - strdup(3) to copy host IP into TCP context struct jakubovsky 2012-07-04 17:18:36 +02:00
  • 9f9e0fc008 Fixed mbus_recv_frame() return value to -1 when invalid m-bus handle jakubovsky 2012-07-03 16:47:11 +02:00
  • 5d079254cc Extended mbus_recv_frame() error codes, improved collision handling - handling TCP connection reset and read(2) timeout jakubovsky 2012-07-03 14:35:07 +02:00
  • 2093b4a9c0 Merge remote-tracking branch 'upstream/master' Stefan Wahren 2012-06-23 14:29:14 +02:00
  • d025b27b07 - fixed check of mbus_sendrecv_request and mbus_recv_frame - initialized memory in mbus_sendrecv_request - used defines for special address instead of magic numbers Stefan Wahren 2012-06-20 00:23:25 +02:00
  • 0d610b6a27 - fixed check of mbus_sendrecv_request and mbus_recv_frame - initialize memory in mbus_sendrecv_request - used defines for special address instead of magic numbers Stefan Wahren 2012-06-20 00:21:28 +02:00
  • 82aec2ff97 repo cleanup, no need for .in files in the repository 0.8.0 Robert Johansson 2012-06-18 21:11:49 +09:00
  • d3e4decf59 maintenance updates for new release 0.8.0 Robert Johansson 2012-06-18 21:08:10 +09:00
  • 34e3e3f8f9 cleaned up debian packaging directory Robert Johansson 2012-06-18 21:06:44 +09:00
  • 9e637e7752 added debian packaging files Robert Johansson 2012-06-18 21:04:59 +09:00
  • d8819cb21f Merge pull request #12 from lategoodbye/master Robert Johansson 2012-06-11 20:40:00 -07:00
  • 7c304b34a0 Always wait until complete frame has been transmitted Stefan Wahren 2012-06-11 21:22:31 +02:00
  • 2f5476c3a5 Removed sleep workaround Stefan Wahren 2012-06-10 19:23:59 +02:00
  • f492e97186 Improved model mapping - added und fixed mapping Stefan Wahren 2012-06-10 19:19:46 +02:00
  • 1a742682c7 Merge pull request #11 from lategoodbye/master Robert Johansson 2012-05-29 17:59:53 -07:00
  • 49b49d077b Sync behaviour from serial to TCP connections Stefan Wahren 2012-05-29 21:34:20 +02:00
  • bf12395af9 Fixed segmentation fault in case of much XML output Stefan Wahren 2012-05-29 21:24:30 +02:00
  • c2f7c0d48e Improved wildcard search results (still not all meters were found) - sleep 1 second after each init frame - select secondary address with enabled FCB bit Stefan Wahren 2012-05-29 20:51:34 +02:00
  • 989eada28a Improved model mapping - initialize result buffer - added new mappings - added und fixed man codes Stefan Wahren 2012-05-29 20:33:09 +02:00
  • 0cb23161e7 Added receive timestamp for each data record in XML output Stefan Wahren 2012-05-29 20:17:05 +02:00
  • 9fd35b781b Improved collision detection for scan Stefan Wahren 2012-05-29 19:39:56 +02:00
  • ad4d307b57 Fixed endless loop in receive function in case of a incomplete frame (limit = 3 timeouts) Stefan Wahren 2012-05-29 19:15:52 +02:00
  • 198a0df8f0 Merge pull request #10 from lategoodbye/master Robert Johansson 2012-05-20 05:47:30 -07:00
  • dd97141f21 Removed directory test from building (not so good idea) Stefan Wahren 2012-05-20 13:03:03 +02:00
  • cc39adc36a Fixed bug in wildcard search - use valid reply to receive select result Stefan Wahren 2012-05-20 04:08:15 +02:00
  • 56bbccc0c1 Added a new function to select a device by it's secondary address Stefan Wahren 2012-05-20 03:58:16 +02:00
  • 69bc06eeb1 Improved readout by secondary address - save 1 REQ_UD2 by selecting instead of probing seconday address Stefan Wahren 2012-05-20 03:55:36 +02:00
  • ef630f2e5d Added a new function to select a device by it's secondary address Stefan Wahren 2012-05-20 03:52:15 +02:00
  • d12d7dd052 Fixed bug in multi telegram readout with secondary address - init slave before selecting secondary address Stefan Wahren 2012-05-20 03:44:06 +02:00