updated packaging
This commit is contained in:
Steffen Vogel
parent
3eab1153db
commit
a0c3044515
6 changed files with 97 additions and 61 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,8 +1,8 @@
|
|||
*~
|
||||
|
||||
# Binaries
|
||||
/src/vzlogger/vzlogger
|
||||
/src/reader/reader
|
||||
/bin/logger/vzlogger
|
||||
/bin/reader/reader
|
||||
|
||||
# Compiled Object files
|
||||
*.slo
|
||||
|
|
|
|||
13
README
13
README
|
|
@ -1,10 +1,11 @@
|
|||
vzlogger...
|
||||
* is a tiny shell tool to log measurements of a wide variety of smartmeters, sensors & protocols against the volkszaehler.org middleware.
|
||||
* can run as a daemon or can be invoked periodically by cron.
|
||||
* includes a tiny onboard httpd to serve realtime readings to the ajax web frontend.
|
||||
* is written in pure ansi c and should run on most embedded devices.
|
||||
* is a tool to read and log measurements of a wide variety of smartmeters, sensors to the volkszaehler.org middleware.
|
||||
* can run as a daemon or via Cron.
|
||||
* includes a tiny onboard httpd to serve realtime readings to the AJAX web frontend.
|
||||
* is written in ANSI C and should run on most embedded devices which conform to the POSIX standard.
|
||||
|
||||
Feel free to add your own hardware ;)
|
||||
Feel free to implement support your own hardware ;)
|
||||
If you have questions, contact Steffen Vogel <info@steffenvogel.de>
|
||||
|
||||
More information are available in our wiki:
|
||||
More information is available in our wiki:
|
||||
http://wiki.volkszaehler.org/software/controller/vzlogger
|
||||
|
|
|
|||
7
debian/changelog
vendored
7
debian/changelog
vendored
|
|
@ -1,3 +1,10 @@
|
|||
vzlogger (0.2.1-1) stable; urgency=low
|
||||
|
||||
* A lot of rewrite
|
||||
* Added SML support
|
||||
|
||||
-- Steffen Vogel <info@steffenvogel.de> Thu, 15 Sep 2011 23:26:31 +0200
|
||||
|
||||
vzlogger (0.2-1) stable; urgency=low
|
||||
|
||||
* Fixed some bugs after porting to armel architecture
|
||||
|
|
|
|||
14
debian/control
vendored
14
debian/control
vendored
|
|
@ -2,7 +2,7 @@ Source: vzlogger
|
|||
Section: net
|
||||
Priority: optional
|
||||
Maintainer: Steffen Vogel <info@steffenvogel.de>
|
||||
Build-Depends: debhelper (>= 7.0.50~), pkg-config (>= 0.25), libjson0-dev (>= 0.9), libcurl4-openssl-dev (>= 7.19), libmicrohttpd-dev (>= 9.3)
|
||||
Build-Depends: debhelper (>= 7.0.50~), pkg-config (>= 0.25), libjson0-dev (>= 0.9), libcurl4-openssl-dev (>= 7.19), libmicrohttpd-dev (>= 0.4.6)
|
||||
Standards-Version: 3.9.1
|
||||
Homepage: http://wiki.volkszaehler.org/software/controller/vzlogger
|
||||
Vcs-Git: git://github.com/volkszaehler/volkszaehler.org.git
|
||||
|
|
@ -13,9 +13,11 @@ Architecture: any
|
|||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Description: program for logging measurements to an volkszaehler.org middelware
|
||||
vzlogger...
|
||||
* is a tiny shell tool to log measurements of a wide variety of
|
||||
smartmeters, sensors & protocols against the volkszaehler.org middleware.
|
||||
* can run as a daemon or can be invoked periodically by cron.
|
||||
* is a tool to read and log measurements of a wide variety of smartmeters and
|
||||
sensors to the volkszaehler.org middleware.
|
||||
* can run as a daemon or via Cron.
|
||||
* includes a tiny onboard httpd to serve
|
||||
realtime readings to the ajax web frontend.
|
||||
* is written in pure ansi c and should run on most embedded devices.
|
||||
realtime readings to the AJAX web frontend.
|
||||
* is written in ANSI C and should run on most embedded devices
|
||||
which conform to the POSIX standard.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,78 @@
|
|||
; vzlogger configuration
|
||||
; use tabs, spaces as delimiter
|
||||
; use ; to introduce a comment
|
||||
; look at the wiki for detailed information
|
||||
; http://wiki.volkszaehler.org/software/controller/vzlogger#configuration
|
||||
|
||||
;prot middleware uuid intval options
|
||||
;1wire http://demo.volkszaehler.org/middleware.php 371dd700-beb3-11e0-8dda-b961518a06f4 10 /mnt/1wire/10.12E6D3000800/temperature
|
||||
;obis http://volkszaehler.org/demo/middleware.php ef0e9adf-cd9e-4d9a-92c5-b4fb4c89ff98 10 /dev/ttyS0
|
||||
;rawS0 http://volkszaehler.org/demo/middleware.php 27a1b4c0-8f8a-11e0-ad82-db6efbc4ba2e 10 /dev/ttyUSB2
|
||||
;random http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware fde8f1d0-c5d0-11e0-856e-f9e4360ced10 5 40
|
||||
sml http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware c853d890-daf3-11e0-86c4-875e5bd610cf 76h9vv5835w5.dyndns.info:7331:power
|
||||
;sml http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware 5584d3e0-daf5-11e0-a1c8-3930962bdbf4 76h9vv5835w5.dyndns.info:7331:power-l1
|
||||
;sml http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware 6d17cd80-daf5-11e0-916c-bfb24b4b6f01 76h9vv5835w5.dyndns.info:7331:power-l2
|
||||
;sml http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware 78c09290-daf5-11e0-81e9-2f2eb65081d7 76h9vv5835w5.dyndns.info:7331:power-l3
|
||||
;prot middleware uuid connection options intval
|
||||
;onewire http://demo.volkszaehler.org/middleware.php 371dd700-beb3-11e0-8dda-b961518a06f4 /mnt/1wire/10.12E6D3000800/temperature 10
|
||||
;s0 http://volkszaehler.org/demo/middleware.php 27a1b4c0-8f8a-11e0-ad82-db6efbc4ba2e /dev/ttyUSB2 10
|
||||
;d0 http://volkszaehler.org/demo/middleware.php 27a1b4c0-8f8a-11e0-ad82-db6efbc4ba2e /dev/ttyUSB2 1-0:1.7.0*255
|
||||
;random http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware fde8f1d0-c5d0-11e0-856e-f9e4360ced10 /dev/random 40 5
|
||||
;sml http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware c853d890-daf3-11e0-86c4-875e5bd610cf 76h9vv5835w5.dyndns.info:7331 power
|
||||
;sml http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware 5584d3e0-daf5-11e0-a1c8-3930962bdbf4 76h9vv5835w5.dyndns.info:7331 power-l1
|
||||
;sml http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware 6d17cd80-daf5-11e0-916c-bfb24b4b6f01 76h9vv5835w5.dyndns.info:7331 power-l2
|
||||
;sml http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware 78c09290-daf5-11e0-81e9-2f2eb65081d7 76h9vv5835w5.dyndns.info:7331 power-l3
|
||||
|
||||
|
||||
==================== new format =========================
|
||||
|
||||
RetryPause 300
|
||||
Verbosity 10
|
||||
|
||||
<Local>
|
||||
Public true
|
||||
Enabled true
|
||||
Port 8080
|
||||
CometTimeout 30 // 0 disables comet
|
||||
BufferTime 600
|
||||
</Local>
|
||||
|
||||
<Sensor>
|
||||
Protocol sml
|
||||
Host 76h9vv5835w5.dyndns.info:7331
|
||||
Port /dev/ttyS0
|
||||
Interval 5
|
||||
|
||||
<Channel>
|
||||
Uuid fde8f1d0-c5d0-11e0-856e-f9e4360ced10
|
||||
Middleware http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware
|
||||
Identifier power
|
||||
</Channel>
|
||||
|
||||
<Channel>
|
||||
Uuid fde8f1d0-c5d0-11e0-856e-f9e4360ced10
|
||||
Middleware http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware
|
||||
Identifier power
|
||||
</Channel>
|
||||
|
||||
<Channel>
|
||||
Uuid fde8f1d0-c5d0-11e0-856e-f9e4360ced10
|
||||
Middleware http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware
|
||||
Identifier power
|
||||
</Channel>
|
||||
|
||||
<Channel>
|
||||
Uuid fde8f1d0-c5d0-11e0-856e-f9e4360ced10
|
||||
Middleware http://localhost/workspace/volkszaehler.org/volkszaehler.org/htdocs/middleware
|
||||
Identifier power
|
||||
</Channel>
|
||||
</Sensor>
|
||||
|
||||
|
||||
========================== available options ======================
|
||||
RetryPause
|
||||
Port
|
||||
CometTimeout
|
||||
BufferTime
|
||||
Public
|
||||
Protocol
|
||||
Host
|
||||
Port
|
||||
Uuid
|
||||
Middleware
|
||||
Identifier
|
||||
Enabled
|
||||
Verbosity
|
||||
Interval
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
/**
|
||||
* Meter readings
|
||||
*
|
||||
* @package vzlogger
|
||||
* @copyright Copyright (c) 2011, The volkszaehler.org project
|
||||
* @license http://www.gnu.org/licenses/gpl.txt GNU Public License
|
||||
* @author Steffen Vogel <info@steffenvogel.de>
|
||||
*/
|
||||
/*
|
||||
* This file is part of volkzaehler.org
|
||||
*
|
||||
* volkzaehler.org is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* any later version.
|
||||
*
|
||||
* volkzaehler.org is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with volkszaehler.org. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef _READING_H_
|
||||
#define _READING_H_
|
||||
|
||||
#include <sys/time.h>
|
||||
|
||||
typedef struct meter_reading {
|
||||
float value;
|
||||
struct timeval tv;
|
||||
|
||||
struct meter_reading *next; /* pointer for linked list */
|
||||
} meter_reading_t;
|
||||
|
||||
#endif /* _READING_H_ */
|
||||
Loading…
Add table
Reference in a new issue