stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
89 commits 2 branches 5 tags 5.4 MiB
Commit graph

89 commits

This branch
This branch
All branches
Author SHA1 Message Date
Justin Otherguy
f950fe7e37 Merge pull request #2 from stv0g/master 
new configuration scheme and protocol: "file"
 2011-12-05 14:10:34 -08:00
Steffen Vogel
9452422f4b Merge branch 'master' of github.com:volkszaehler/vzlogger 
Conflicts:
	src/meter.c
 2011-12-05 21:51:23 +01:00
Steffen Vogel
d1c826bf06 added dtotv() 2011-12-05 21:46:06 +01:00
Steffen Vogel
3625c5cf2e added output for diffrent identifier types 2011-12-05 21:45:41 +01:00
Steffen Vogel
b082350454 added new meter protocol: file 2011-12-05 21:45:19 +01:00
Steffen Vogel
eb09fd5a62 moved protocol dependent configuration to protocol sources 2011-12-05 21:42:57 +01:00
Steffen Vogel
7cafc0f450 incremented version 2011-12-05 21:39:18 +01:00
Steffen Vogel
f0f36ab142 changed example configuration to new format 2011-12-05 21:38:35 +01:00
Steffen Vogel
b998412f06 seperated routine to compare two reading identifiers (obis, string, uuid) 
each metering protocol has its own identifier type (sml,d0 => obis, file,exec => string)
 2011-12-05 21:36:58 +01:00
Justin Otherguy
3cb49f9d6a timestamp -> ts (thx to JayD) 2011-11-30 22:57:56 +01:00
Justin Otherguy
daad0a5327 Merge pull request #1 from stv0g/master 
Thats enough for today
 2011-11-25 16:34:49 -08:00
Steffen Vogel
7649863508 added function to convert double to struct timeval 2011-11-22 01:48:45 +01:00
Steffen Vogel
0a44949239 added more identifier types (strings and uuids) 
- 1-wire IDs
- UUIDs from fluksousb
- ...
 2011-11-22 01:02:57 +01:00
Steffen Vogel
2328ba49bb fixed calculation for relative consumption 2011-11-22 01:02:05 +01:00
Steffen Vogel
b31e457f79 removed empty source file (is now obsolte) 2011-11-22 01:01:01 +01:00
Steffen Vogel
0eb37cd777 Merge branch 'master' of github.com:volkszaehler/vzlogger 
Conflicts:
	src/d0.c
	src/obis.c
 2011-11-21 00:47:47 +01:00
Steffen Vogel
bdabc5c518 huge changes: a lot of code refactoring, coding standards, a improved configuration system, support for absolute counters etc... 2011-11-21 00:38:05 +01:00
Justin Otherguy
c0f4a5b034 fixed the OBIS/d0 parser 2011-11-05 22:20:55 +01:00
Steffen Vogel
4da2811f34 added d0 support (some testing required) 2011-11-02 09:19:42 +01:00
Steffen Vogel
a3ce5cadee adapted sml parser to new obis interface 2011-11-02 09:19:05 +01:00
Steffen Vogel
4d6e903733 adapted configuration parser to new interface of obis parser 2011-11-02 09:18:09 +01:00
Steffen Vogel
f1bc1c5269 added ids for Hager eHz 
replaced regex parser
 2011-11-02 09:16:53 +01:00
Justin Otherguy
933e7507d5 Revert "added switches and comments for d0 protocol" 
This reverts commit 0b4117ccd5.
 2011-10-24 23:03:55 +02:00
Justin Otherguy
0b4117ccd5 added switches and comments for d0 protocol 2011-10-24 22:52:43 +02:00
Justin Otherguy
e09dc70749 brief description for "connection" in config 2011-10-24 08:49:40 +03:00
Steffen Vogel
269b80c13d fixed list_pop 2011-10-24 00:38:43 +02:00
Steffen Vogel
58f2955b35 fixed some memory leaks 2011-10-24 00:38:18 +02:00
Steffen Vogel
7f78729f09 fixed division by zero and interval 2011-10-24 00:36:58 +02:00
Steffen Vogel
f8b378e2c0 Merge branch 'master' of github.com:volkszaehler/vzlogger 
Conflicts:
	configure.ac
 2011-10-23 19:22:32 +02:00
Steffen Vogel
44b21c3160 fixed version and init.d script 2011-10-23 19:21:24 +02:00
Justin Otherguy
f1787af107 one more occurrence of old version info (0.2 -> 0.3.1) 2011-10-23 20:17:42 +03:00
Justin Otherguy
40e807645a updated vzlogger version (still said "0.2" in HTTP requests) 2011-10-23 17:51:39 +03:00
Justin Otherguy
01e3e6011e added '"'s for DESC 2011-10-23 12:48:04 +03:00
Steffen Vogel
2b61bc63c8 do not fork in brackground twice when using inti.d script 2011-10-16 14:44:57 +02:00
Steffen Vogel
5f8d170deb updated version 2011-10-16 14:44:44 +02:00
Steffen Vogel
9240d179ab fixed version number in autotools configuration 2011-10-16 14:38:12 +02:00
Steffen Vogel
9550bf8879 fixed typo in description 2011-10-16 14:32:52 +02:00
Steffen Vogel
5215ff8ff0 fixed bug while parsing meters with multiple channels 2011-10-16 14:32:32 +02:00
Steffen Vogel
c5e69ae52f fixed some compiler warnings (D0 support still incomplete) 2011-10-16 00:12:53 +02:00
Steffen Vogel
300f9b9b62 added new configuration example 2011-10-16 00:00:38 +02:00
Steffen Vogel
668812aff9 introduced new JSON configuration format and some structural changes (meter => channel mapping) 2011-10-15 23:58:50 +02:00
Steffen Vogel
a0c3044515 updated packaging 2011-10-08 17:21:58 +02:00
Steffen Vogel
3eab1153db updated build system 2011-10-08 17:21:34 +02:00
Steffen Vogel
df091b1d6b changed a lot.. (configuration parsing still not finished: bin/logger/src/options.c) 2011-10-07 22:26:03 +02:00
Steffen Vogel
21344c9afa untightened dependencies for libcurl (in regard to Ubuntu Lucid 10.3 LTS) 2011-09-15 23:24:41 +02:00
Steffen Vogel
88d2905fe2 removed unfinished stuff 2011-09-15 23:21:56 +02:00
Steffen Vogel
44f9784732 updated buildsystem (fixes missing install-sh) 2011-09-15 21:44:00 +02:00
Steffen Vogel
d11ac57848 seperated source and header files 2011-09-15 21:41:20 +02:00
Steffen Vogel
d339266ac2 cleanup build environment and repository 2011-09-14 12:12:24 +02:00
Steffen Vogel
2970881d3f updated gitignore file 2011-09-10 00:05:00 +02:00