openautomation-svn — Mailinglist that shows all subversion commits

[Openautomation-svn] SF.net SVN: openautomation:[430] wiregate/plugin/generic/emx_uhr.pl

[<e....@us...>]

Revision: 430
          http://openautomation.svn.sourceforge.net/openautomation/?rev=430&view=rev
Author:   e.max
Date:     2011-10-01 09:00:10 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
id aktiviert

Property Changed:
----------------
    wiregate/plugin/generic/emx_uhr.pl


Property changes on: wiregate/plugin/generic/emx_uhr.pl
___________________________________________________________________
Added: svn:keywords
   + Id

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[429] wiregate/plugin/generic/Unwetterzentrale. pl

[<j-...@us...>]

Revision: 429
          http://openautomation.svn.sourceforge.net/openautomation/?rev=429&view=rev
Author:   j-n-k
Date:     2011-09-29 18:30:24 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
Added Plugin Unwetterzentrale

Added Paths:
-----------
    wiregate/plugin/generic/Unwetterzentrale.pl

Added: wiregate/plugin/generic/Unwetterzentrale.pl
===================================================================
--- wiregate/plugin/generic/Unwetterzentrale.pl	                        (rev 0)
+++ wiregate/plugin/generic/Unwetterzentrale.pl	2011-09-29 18:30:24 UTC (rev 429)
@@ -0,0 +1,93 @@
+# Plugin zum Auslesen der Unwettermeldungen
+# Version 0.1 29.09.2011
+# Copyright: JNK (http://knx-user-forum.de/members/jnk.html)
+# In Anlehnung an HS/FS Logigbaustein 19909 by Michael Grosalski
+# License: GPL (v2)
+# Aufbau m\xF6glichst so, dass man unterhalb der Einstellungen nichts ver\xE4ndern muss!
+
+
+####################
+###Einstellungen:###
+####################
+
+my $unwetter_txt_GA = '0/1/1'; # sendet Textmeldung DPT 16
+my $unwetter_max_stufe_GA  = '0/1/2'; # sendet h\xF6chste Warnstufe als DPT 5.005
+my $unwetter_max_typ_GA = '0/1/3'; # sendet h\xF6chsten Warntyp als DPT 5.005
+my $unwetter_max_neu_GA = '0/1/4'; # sendet 1=neue Meldungen, 0=alte Meldungen, DPT 1
+
+my $plz = '45886'; #PLZ
+my $baseurl = 'http://www.unwetterzentrale.de/uwz/getwarning_de.php?plz='; # Basis-URL
+my $country = 'DE'; # Land
+my $lang = 'de';  # deutsch
+
+
+######################
+##ENDE Einstellungen##
+######################
+
+use LWP::Simple;
+
+my %warnstufen = ( gelb => 1, orange => 2, rot => 3, violett => 4 );
+my %warntyp = ( gewitter => 1, glatteisregen => 2, regen => 3, schnee => 4, sturm => 5, temperatur => 6 );
+
+my @warnstufen_txt = ( 'keine Meldung', 'Vorwarn.', '', 'stark. ', 'extr. ' );
+my @warntyp_txt = ( '', 'Gewitter', 'Glatteis', 'Regen', 'Schnee', 'Sturm', 'Temperatur' );
+
+$plugin_info{$plugname.'_cycle'} = 900;
+
+# Abfrage
+
+my $url = $baseurl.$plz.'&uwz=UWZ-'.$country.'&lang='.$lang;
+my $content = get($url);
+
+if ($content eq undef) {
+  return 'HTTP failed.';
+}
+
+my @LINES = split (/\n/, $content);
+
+my $high_typ = 0;
+my $high_stufe = 0;
+my $all_str = '';
+my $typ;
+my $stufe;
+
+for (my $i=0;$i<@LINES;$i++)  {
+  if ($LINES[$i] =~ /<div style="float:left;display:block;width:117px;height:110px;padding-top:6px;"><img src="..\/images\/icons\/(.*?)-(.*?).gif" width="117" height="104"><\/div>/i) {
+    $typ = $warntyp{$1};
+    $stufe = $warnstufen{$2};
+    my $str = $stufe.$typ;
+    if ($stufe>$high_stufe) {
+      $high_stufe = $stufe;
+      $high_typ = $typ;
+    }
+    $all_str .= $str;
+  }
+}
+
+
+
+if ($unwetter_txt_GA) {
+  knx_write($unwetter_txt_GA, $warnstufen_txt[$high_stufe].$warntyp_txt[$high_typ], 16);
+}
+
+if ($unwetter_max_stufe_GA) {
+  knx_write($unwetter_max_stufe_GA, $high_stufe, 5.005);
+}
+
+if ($unwetter_max_typ_GA) {
+  knx_write($unwetter_max_typ_GA, $high_typ, 5.005);
+}
+
+if ($plugin_info{$plugname.'_allstr'} == $all_str) {
+  if ($unwetter_max_neu_GA) {
+    knx_write($unwetter_max_neu_GA, 0, 1);
+  }
+} else {
+  if ($unwetter_max_neu_GA) {
+    knx_write($unwetter_max_neu_GA, 1, 1);
+  }
+  $plugin_info{$plugname.'_allstr'} = $all_str;
+}
+
+return $all_str;
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[428] wiregate/plugin/generic/mpd_Player2.pl

[<vl...@us...>]

Revision: 428
          http://openautomation.svn.sourceforge.net/openautomation/?rev=428&view=rev
Author:   vlamers
Date:     2011-09-27 14:03:14 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
Plugin to control mpd via GA?\197?\189s

Modified Paths:
--------------
    wiregate/plugin/generic/mpd_Player2.pl

Modified: wiregate/plugin/generic/mpd_Player2.pl
===================================================================
--- wiregate/plugin/generic/mpd_Player2.pl	2011-09-25 16:48:13 UTC (rev 427)
+++ wiregate/plugin/generic/mpd_Player2.pl	2011-09-27 14:03:14 UTC (rev 428)
@@ -126,11 +126,11 @@
 { if ($msg{'data'} == 01) {
 	knx_write($kueche,00,1);
 	knx_write($wohnz,1,1);
-	 my $debug = `amixer -c $cardnum set $Speaker $Kanal $vol_party`;
+	 my $debug = `amixer -c $cardnum set $Speaker $Kanal2 $vol_party`;
     return "Party"; }
 
 if ($msg{'value'} == 00) {
-   my $debug = `amixer -c $cardnum set $Speaker $Kanal $volume_anfang`;
+   my $debug = `amixer -c $cardnum set $Speaker $Kanal2 $volume_anfang%`;
    knx_write($kueche,01,1);
     return "Party ende"; }
 else{

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[427] wiregate/plugin/generic/mpd_Player2.pl

[<vl...@us...>]

Revision: 427
          http://openautomation.svn.sourceforge.net/openautomation/?rev=427&view=rev
Author:   vlamers
Date:     2011-09-25 16:48:13 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
plugin to control mpd via GAs (Volume,Playlist, start/stop...

Added Paths:
-----------
    wiregate/plugin/generic/mpd_Player2.pl

Added: wiregate/plugin/generic/mpd_Player2.pl
===================================================================
--- wiregate/plugin/generic/mpd_Player2.pl	                        (rev 0)
+++ wiregate/plugin/generic/mpd_Player2.pl	2011-09-25 16:48:13 UTC (rev 427)
@@ -0,0 +1,208 @@
+# Plugin um eine mpd Instanz mit mehreren Outputs zu steuern, inkl. verschiedener Playlists
+# und verschiedenen lautst\xE4rken der unterschiedlichen Ausg\xE4ngen von Tastern oder sonstigen EIB Geraeten zu kontrollieren
+# Version 0.3    25.11.2011
+# Copyright: vlamers (http://knx-user-forum.de/members/vlamers.html)
+# License: GPL (v2)
+# Aufbau m�glichst so, dass man unterhalb der Einstellungen nichts ver�ndern muss!
+
+#################################
+##########Einstellungen##########
+#################################
+# Aktuelle Einstellungen arbeiten mit einer gesplitteten 7.1 USB Soundkarte
+# Sehr viele Einstellungen, die aber n\xF6tig sind :-)
+# Alsa Sound
+my $vol_alsa = "100%";	# Volume for amixer (alsa volume)
+my $Kanal = "Front";	# Channel of 7.1 soundcard
+my $Kanal2 = "Rear";	# Channel of the second speaker pair
+my $volkanal2 = "40%";	# The volume of the 2nd Speaker
+my $cardnum = "1";		# Hardware Number of the Sound card
+my $Speaker = "Speaker,1";	# Name of the output ( My soundcard is defined as following: Speaker,1 Front; Speaker,1 Rear
+## mpd 
+my $mpdname = "mpd2";		# the name of the mpd instance
+my $IP = "192.168.178.33";    # The IP where the mpd Instanz is running
+my $Port = "6601";        # Port of the mpd Instanz
+my $volume_anfang = "35";     # This Volume will be set for mpd
+# Aus wenn Fernseher an
+my $Fernseher = '3/0/0';	# Fernseher
+# Verstaerker
+my $verstaerker = '13/1/2';	# Verstaerker on/off GA
+#Radio GA
+my $knx_addr_player2 = '13/1/0';# mpd Player on/off GA
+#Volume
+## Vol Receive
+my $Vol_addr = '13/1/7'; # knx_address for volume up/down (receive)
+my $volumestep = "3";    # The stepsize for volume
+my $vol_up_data = "9";	# Data that ETS Busmonitor shows when you send a telegram from a switch to this GA
+my $vol_down_data = "1";
+#Vol send (brightness-value / helligkeitswert)
+my $knx_addr_vol = '13/1/22'; # The Volume will be send here from the plugin
+my $laut_GA = '13/1/23';    #the volume can be send here as brightness-value
+# GA for recorded message
+my $info_wz = '3/1/2';        # Info Switch wz
+# Partymodus
+my $Partymodus = '13/1/21';	# GA for Partymodus
+my $vol_party = "100%"; 	# With % Symbol
+# Quellen
+my $kueche = '13/1/5';		# k\xFCche enable/disable	
+my $kueche_nr = "1";		# mpd output number
+my $wohnz = '13/1/8';		# Wohnzimmer enable/disable
+my $wohnz_nr = "3";	# number of mpd output
+my $Bad = '13/1/15';		# enable/disable bathroom output
+my $Bad_nr = "2";		# mpd output number
+# Prev / next
+my $addr_pn= '13/1/14';	# Prev / Next
+# Playlist
+my $playlist = '13/1/24';	# the playlist number will be send here (value 1 - 255)
+my $playlist1 = "Antenne";
+my $playlist2 = "Christina";
+my $playlist3 = "Volker";
+my $playlist4 = "Kinderlieder";
+
+
+##################################################
+################Ende Einstellungen################
+##################################################
+
+#######################################################
+# do not change anything below, all config stays above#
+#######################################################
+
+# subscribe plugins and call it only when necessary
+$plugin_subscribe{$knx_addr_player2}{$plugname} = 1;
+$plugin_subscribe{$Fernseher}{$plugname} = 1;
+$plugin_subscribe{$Vol_addr}{$plugname} = 1;
+$plugin_subscribe{$Partymodus}{$plugname} = 1;
+$plugin_subscribe{$addr_pn}{$plugname} = 1;
+$plugin_subscribe{$laut_GA}{$plugname} = 1;
+$plugin_subscribe{$knx_addr_vol}{$plugname} = 1;
+$plugin_subscribe{$wohnz}{$plugname} = 1;
+$plugin_subscribe{$kueche}{$plugname} = 1;
+$plugin_subscribe{$Bad}{$plugname} = 1;
+$plugin_subscribe{$playlist}{$plugname} = 1;
+$plugin_info{$plugname.'_cycle'} = 0;
+
+# Radio on/off
+if ($msg{'dst'} eq ($knx_addr_player2))
+{ if ($msg{'apci'} eq 'A_GroupValue_Write') # change volume
+{ if ($msg{'value'} == 01) {
+	knx_write($verstaerker,1,1);
+	knx_write($Bad,0,1);
+	knx_write($wohnz,1,1);
+	knx_write($kueche,1,1);
+	my $debug = `/etc/init.d/$mpdname restart`;
+        my $debug = `amixer -c $cardnum set $Speaker $Kanal $vol_alsa && amixer -c $cardnum set $Speaker $Kanal2 $volkanal2`;
+        knx_write($playlist,1,1);
+        knx_write($knx_addr_vol ,$volume_anfang,5);
+        return "Player 2 l\xE4uft";
+}
+if ($msg{'value'} == 00) {
+	knx_write($verstaerker,0,1);  # Verstaerker aus
+    my $debug = `MPD_HOST=$IP MPD_PORT=$Port mpc stop`;
+    return "Player 2 aus";}}}
+# Aus wenn Fernseher an
+if ($msg{'dst'} eq ($Fernseher) && ($msg{'apci'} eq 'A_GroupValue_Write') && ($msg{'value'} == 1))	{
+	knx_write( $knx_addr_player2, 0,1 );
+    return "Player 2 aus Fernseher";    }
+#################### Volume step ################################
+if ($msg{'dst'} eq ($Vol_addr))
+{ if ($msg{'apci'} eq 'A_GroupValue_Write')  # change volume
+{ if ($msg{'data'} == $vol_up_data) {
+    my $debug = `MPD_PORT=$Port MPD_HOST=$IP mpc volume +$volumestep`;
+    return; }
+
+if ($msg{'data'} == $vol_down_data) {
+    my $debug = `MPD_PORT=$Port MPD_HOST=$IP mpc volume -$volumestep`;
+    return;}}}
+###################### Vol receive ####################################
+if ($msg{'dst'} eq ($laut_GA) && ($msg{'apci'} eq 'A_GroupValue_Write'))
+{   my $vol1 = decode_dpt5($msg{'data'});
+    my $vol = round($vol1);
+    my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc volume $vol`; 
+    my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc volume > /tmp/test.txt`;
+    knx_write($knx_addr_vol,$vol,5);
+    return $vol1;}
+###################### Partymodus ##########################################
+if ($msg{'dst'} eq ($Partymodus) && ($msg{'apci'} eq 'A_GroupValue_Write'))
+{ if ($msg{'data'} == 01) {
+	knx_write($kueche,00,1);
+	knx_write($wohnz,1,1);
+	 my $debug = `amixer -c $cardnum set $Speaker $Kanal $vol_party`;
+    return "Party"; }
+
+if ($msg{'value'} == 00) {
+   my $debug = `amixer -c $cardnum set $Speaker $Kanal $volume_anfang`;
+   knx_write($kueche,01,1);
+    return "Party ende"; }
+else{
+return;}}
+######################### prev / next #####################################################
+if ($msg{'dst'} eq ($addr_pn))
+{ if ($msg{'apci'} eq 'A_GroupValue_Write') # change volume
+{ if ($msg{'value'} == 1) {
+    my $debug = `MPD_PORT=$Port MPD_HOST=$IP mpc next`;
+    return "next"; }
+
+if ($msg{'value'} == 0) {
+    my $debug = `MPD_PORT=$Port MPD_HOST=$IP mpc prev`;
+    return "prev";}}}
+####################### Quellen ########################################
+# wohnz
+     if ($msg{'dst'} eq $wohnz && ($msg{'apci'} eq 'A_GroupValue_Write'))
+     {  if (($msg{'value'} == 01)) {
+        my $debug = `MPD_HOST=$IP MPD_PORT=$Port mpc enable $wohnz_nr`;
+        return; }
+        
+        if (($msg{'value'} == 00)) {
+        my $debug = `MPD_HOST=$IP MPD_PORT=$Port mpc disable $wohnz_nr`;
+        return; }}
+  
+    # kueche
+      if ($msg{'dst'} eq $kueche && ($msg{'apci'} eq 'A_GroupValue_Write'))
+     {  if (($msg{'data'} == 01)) {
+        my $debug = `MPD_HOST=$IP MPD_PORT=$Port mpc enable $kueche_nr`;
+        return "OK"; }
+        if (($msg{'data'} == 00)) {
+        my $debug = `MPD_HOST=$IP MPD_PORT=$Port mpc disable $kueche_nr`;
+        return "nOK";}else {return 0;}}
+   
+    # Bad
+     if ($msg{'dst'} eq $Bad && ($msg{'apci'} eq 'A_GroupValue_Write'))
+     {
+        if (($msg{'value'} == 01)) {
+        my $debug = `MPD_HOST=$IP MPD_PORT=$Port mpc enable $Bad_nr`;
+        return; }
+          if (($msg{'value'} == 00)) {
+        my $debug = `MPD_HOST=$IP MPD_PORT=$Port mpc disable $Bad_nr`;
+        return; }
+          else {return;}}
+###################### Playlist #########################################
+
+if ($msg{'dst'} eq ($playlist) && ($msg{'apci'} eq 'A_GroupValue_Write'))
+{	if ($msg{'data'} == 01){
+	my $playlist = $playlist1;
+	my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc clear`; 
+	my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc load $playlist`;
+	my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc play`; 
+	return "1";}
+if ($msg{'data'} == 02){
+	my $playlist = $playlist2;
+	my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc clear`; 
+	my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc load $playlist`;
+	my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc play`; 
+	return "2";}
+if ($msg{'data'} == 03){
+	my $playlist = $playlist3;
+	my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc clear`; 
+	my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc load $playlist`;
+	my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc play`; 
+	return "3";}
+if ($msg{'data'} == 04){
+	my $playlist = $playlist4;
+	my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc clear`; 
+	my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc load $playlist`;
+	my $debug = `MPD_PORT=$Port MPD_IP=$IP mpc play`; 
+	return "4";}
+else {
+my $pl = ($msg{'data'});
+return $pl;
+}}
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[426] wiregate/plugin/generic

[<j-...@us...>]

Revision: 426
          http://openautomation.svn.sourceforge.net/openautomation/?rev=426&view=rev
Author:   j-n-k
Date:     2011-09-24 19:32:35 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
Kleinere Fixes Heizung.pl Fensterstatus.pl

Modified Paths:
--------------
    wiregate/plugin/generic/Fensterstatus.pl

Added Paths:
-----------
    wiregate/plugin/generic/Heizung.pl

Removed Paths:
-------------
    wiregate/plugin/generic/Heizung

Modified: wiregate/plugin/generic/Fensterstatus.pl
===================================================================
--- wiregate/plugin/generic/Fensterstatus.pl	2011-09-24 19:05:53 UTC (rev 425)
+++ wiregate/plugin/generic/Fensterstatus.pl	2011-09-24 19:32:35 UTC (rev 426)
@@ -1,34 +1,43 @@
+# Plugin zum Erfassen des Gesamt-Fenster-Status
+# Version 0.3 / 24.09.2011
+# Copyright: JNK (http://knx-user-forum.de/members/jnk.html)
+# License: GPL (v2)
 #
-# Fensterstatus v0.2
-#
-# by JNK, 2011-09-19
 
+####################
+###Einstellungen:###
+####################
 
 my @Fenster_GA = ('7/7/7', '7/7/8'); # hier alle Fenster-Einzel-GA
 my $Sammel_GA = '7/7/9'; # hier die Sammel-GA
 my $zustand_geschlossen = 01;    # auf richtige polarit\xE4t achten!
 my $zustand_offen = 00;
 
- 
+######################
+##ENDE Einstellungen##
+######################
+
+#
 # Flossen weg, der Rest geht automatisch
+#
 $plugin_info{$plugname.'_cycle'} = 0; # nur bei Telegramm aufrufen
 
 if (($msg{'apci'} eq 'A_GroupValue_Write') && (grep {$_ eq $msg{'dst'};} @Fenster_GA)) {
-   # Telegramm auf einer Einzel-GA erhalten
-   my $status = $zustand_geschlossen; # mit geschlossen anfangen
-   my $old_status = $plugin_info{$plugname.'_oldstatus'};
-   foreach my $GA (@Fenster_GA) {
-     if (knx_read($GA, 0, 1) == $zustand_offen) { # da war eine 'offen', also Status auf 1 setzen
-       $status = $zustand_offen;
-       last;
-     }
-   }
-   if ($old_status != $status){ #
-       knx_write($Sammel_GA, $status, 1); # Status hat sich geaendert, senden
-       $plugin_info{$plugname.'_oldstatus'} = $status; # neuen Status speichern
-   }
-   
-   return 'Sent Value'.$status;
+    # Telegramm auf einer Einzel-GA erhalten
+    my $status = $zustand_geschlossen; # mit geschlossen anfangen
+    my $old_status = $plugin_info{$plugname.'_oldstatus'};
+    foreach my $GA (@Fenster_GA) {
+        if (knx_read($GA, 0, 1) == $zustand_offen) { # da war eine 'offen', also Status auf 1 setzen
+            $status = $zustand_offen;
+            last;
+        }
+    }
+    if ($old_status != $status){ #
+        knx_write($Sammel_GA, $status, 1); # Status hat sich geaendert, senden
+        $plugin_info{$plugname.'_oldstatus'} = $status; # neuen Status speichern
+	    return 'Sent Value'.$status;
+    } 
+    return 0; # nichts gesendet, Also
 }
 
 # keine Telegramme, also Init

Deleted: wiregate/plugin/generic/Heizung
===================================================================
--- wiregate/plugin/generic/Heizung	2011-09-24 19:05:53 UTC (rev 425)
+++ wiregate/plugin/generic/Heizung	2011-09-24 19:32:35 UTC (rev 426)
@@ -1,53 +0,0 @@
-# Heizungsregelung
-# Plugin h\xF6rt auf GA des Auf/Ab-Befehles und schickt neuen Sollwert
-# V0.1 2011-05-18
-# by Jan N. Klug
-
-### Definitionen 
-my $schritt_ga = '4/1/3';  # Gruppenadresse Sollwert Auf = 1 / Ab = 0
-my $sollwert_ga  = '4/2/3';   # Gruppenadresse Sollwert
-my $sollwert = 15;
-my $sollwertmin = 10; # Sollwert Minimum
-my $sollwertmax = 25; # Sollwert Maximum
-### Ende Definitionen
-
-# Eigenen Aufruf-Zyklus auf 1x st\xFCndlich setzen, h\xF6rt ja auf GA
-$plugin_info{$plugname.'_cycle'} = 3600;
-$sollwert = $plugin_info{$plugname.'_sollwert'};
-
-# Plugin an Gruppenadresse "anmelden"
-$plugin_subscribe{$schritt_ga}{$plugname} = 1;
-$plugin_subscribe{$sollwert_ga}{$plugname} = 1;
-
-# 1=auf, 0=ab
-if ($msg{'apci'} eq "A_GroupValue_Write" && $msg{'dst'} eq $schritt_ga && defined $msg{'value'} && $msg{'value'} == "0" ) {
-   if($sollwert>$sollwertmin) { 
-      $sollwert -= 0.5;
-      knx_write($sollwert_ga,$sollwert,9);
-      $plugin_info{$plugname.'_sollwert'} = $sollwert;
-      return 1;
-   }
-}
-
-if ($msg{'apci'} eq "A_GroupValue_Write" && $msg{'dst'} eq $schritt_ga && defined $msg{'value'} && $msg{'value'} == "1" ) {
-   if($sollwert<$sollwertmax) { 
-      $sollwert += 0.5;
-      knx_write($sollwert_ga,$sollwert,9);
-      $plugin_info{$plugname.'_sollwert'} = $sollwert;
-      return 1;
-   }
-}
-
-#Sollwert vom Bus lesen, wenn von dort gesendet
-if ($msg{'apci'} eq "A_GroupValue_Write" && $msg{'dst'} eq $sollwert_ga ) {
-#   if (!defined $msg{'value'}) { 
-      # falls GA/DPT nicht importiert
-      $msg{'value'} = decode_dpt9($msg{'data'}); 
-#   } 
-   $plugin_info{$plugname.'_sollwert'} = $msg{'value'};
-   return 2;
-}
-
-knx_write($sollwert_ga,$sollwert,9);
-
-return 0;

Added: wiregate/plugin/generic/Heizung.pl
===================================================================
--- wiregate/plugin/generic/Heizung.pl	                        (rev 0)
+++ wiregate/plugin/generic/Heizung.pl	2011-09-24 19:32:35 UTC (rev 426)
@@ -0,0 +1,58 @@
+# Plugin zum Erfassen des Gesamt-Fenster-Status
+# Version 0.1 / 18.05.2011
+# Copyright: JNK (http://knx-user-forum.de/members/jnk.html)
+# License: GPL (v2)
+#
+
+####################
+###Einstellungen:###
+####################
+
+my $schritt_ga = '4/1/3';  # Gruppenadresse Sollwert Auf = 1 / Ab = 0
+my $sollwert_ga  = '4/2/3';   # Gruppenadresse Sollwert
+my $sollwert = 15;
+my $sollwertmin = 10; # Sollwert Minimum
+my $sollwertmax = 25; # Sollwert Maximum
+
+
+######################
+##ENDE Einstellungen##
+######################
+
+# Eigenen Aufruf-Zyklus auf 1x st\xFCndlich setzen, h\xF6rt ja auf GA
+$plugin_info{$plugname.'_cycle'} = 3600;
+$sollwert = $plugin_info{$plugname.'_sollwert'};
+
+# Plugin an Gruppenadresse "anmelden"
+$plugin_subscribe{$schritt_ga}{$plugname} = 1;
+$plugin_subscribe{$sollwert_ga}{$plugname} = 1;
+
+# 1=auf, 0=ab
+if ($msg{'apci'} eq "A_GroupValue_Write" && $msg{'dst'} eq $schritt_ga && defined $msg{'value'} && $msg{'value'} == "0" ) {
+   if($sollwert>$sollwertmin) { 
+      $sollwert -= 0.5;
+      knx_write($sollwert_ga,$sollwert,9);
+      $plugin_info{$plugname.'_sollwert'} = $sollwert;
+      return 1;
+   }
+}
+
+if ($msg{'apci'} eq "A_GroupValue_Write" && $msg{'dst'} eq $schritt_ga && defined $msg{'value'} && $msg{'value'} == "1" ) {
+   if($sollwert<$sollwertmax) { 
+      $sollwert += 0.5;
+      knx_write($sollwert_ga,$sollwert,9);
+      $plugin_info{$plugname.'_sollwert'} = $sollwert;
+      return 1;
+   }
+}
+
+#Sollwert vom Bus lesen, wenn von dort gesendet
+if ($msg{'apci'} eq "A_GroupValue_Write" && $msg{'dst'} eq $sollwert_ga ) {
+      $msg{'value'} = decode_dpt9($msg{'data'}); 
+   $plugin_info{$plugname.'_sollwert'} = $msg{'value'};
+   return 2;
+}
+
+knx_write($sollwert_ga,$sollwert,9);
+
+return 0;


Property changes on: wiregate/plugin/generic/Heizung.pl
___________________________________________________________________
Added: svn:executable
   + *

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[425] wiregate/plugin/generic/Garagentor.pl

[<vl...@us...>]

Revision: 425
          http://openautomation.svn.sourceforge.net/openautomation/?rev=425&view=rev
Author:   vlamers
Date:     2011-09-24 19:05:53 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    wiregate/plugin/generic/Garagentor.pl

Modified: wiregate/plugin/generic/Garagentor.pl
===================================================================
--- wiregate/plugin/generic/Garagentor.pl	2011-09-24 09:21:52 UTC (rev 424)
+++ wiregate/plugin/generic/Garagentor.pl	2011-09-24 19:05:53 UTC (rev 425)
@@ -1,4 +1,4 @@
-# Plugin um komfortabel Befehle \xFCber den IRTrans auszul\xF6sen
+# Plugin um ein Garagentor \xFCber einen Schaltaktor-Kanal und 2 Reed Kontakten zu bedienen
 # Version 0.1 24.11.2011
 # Copyright: vlamers (http://knx-user-forum.de/members/vlamers.html)
 # License: GPL (v2)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[424] wiregate/plugin/generic/Garagentor.pl

[<vl...@us...>]

Revision: 424
          http://openautomation.svn.sourceforge.net/openautomation/?rev=424&view=rev
Author:   vlamers
Date:     2011-09-24 09:21:52 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    wiregate/plugin/generic/Garagentor.pl

Modified: wiregate/plugin/generic/Garagentor.pl
===================================================================
--- wiregate/plugin/generic/Garagentor.pl	2011-09-24 07:33:30 UTC (rev 423)
+++ wiregate/plugin/generic/Garagentor.pl	2011-09-24 09:21:52 UTC (rev 424)
@@ -1,8 +1,13 @@
-##########################################################
+# Plugin um komfortabel Befehle \xFCber den IRTrans auszul\xF6sen
+# Version 0.1 24.11.2011
+# Copyright: vlamers (http://knx-user-forum.de/members/vlamers.html)
+# License: GPL (v2)
+# Aufbau m\xF6glichst so, dass man unterhalb der Einstellungen nichts ver\xE4ndern muss!
 
-#################################################################
-# do not change anything below, all config stays above
-#################################################################
+
+####################
+###Einstellungen:###
+####################
 ## GA\xB4s
 my $Garage_zu ='14/0/1';
 my $Garage_zu_rueck = '14/0/4';
@@ -11,6 +16,10 @@
 my $Garage_schalten = '14/0/6';
 
 
+######################
+##ENDE Einstellungen##
+######################
+
 # subscribe plugin and call it only when necessary, script will be activated if telegrams to the deffined GA are send.
 $plugin_subscribe{$Garage_zu}{$plugname} = 1;
 $plugin_subscribe{$Garage_auf}{$plugname} = 1;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[423] wiregate/plugin/generic/Garagentor.pl

[<vl...@us...>]

Revision: 423
          http://openautomation.svn.sourceforge.net/openautomation/?rev=423&view=rev
Author:   vlamers
Date:     2011-09-24 07:33:30 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
Plugin to control a garage door with 2 Reeds and 1 switch module

Added Paths:
-----------
    wiregate/plugin/generic/Garagentor.pl

Added: wiregate/plugin/generic/Garagentor.pl
===================================================================
--- wiregate/plugin/generic/Garagentor.pl	                        (rev 0)
+++ wiregate/plugin/generic/Garagentor.pl	2011-09-24 07:33:30 UTC (rev 423)
@@ -0,0 +1,92 @@
+##########################################################
+
+#################################################################
+# do not change anything below, all config stays above
+#################################################################
+## GA\xB4s
+my $Garage_zu ='14/0/1';
+my $Garage_zu_rueck = '14/0/4';
+my $Garage_auf = '14/0/0';
+my $Garage_auf_rueck = '14/0/3';
+my $Garage_schalten = '14/0/6';
+
+
+# subscribe plugin and call it only when necessary, script will be activated if telegrams to the deffined GA are send.
+$plugin_subscribe{$Garage_zu}{$plugname} = 1;
+$plugin_subscribe{$Garage_auf}{$plugname} = 1;
+$plugin_subscribe{$Garage_zu_rueck}{$plugname} = 1;
+$plugin_subscribe{$Garage_auf_rueck}{$plugname} = 1;
+$plugin_info{$plugname.'_cycle'} = 0;
+
+
+
+ 
+ 
+ 
+## tor zu
+     if (($msg{'dst'} eq ($Garage_zu)) && ($msg{'apci'} eq 'A_GroupValue_Write'))
+     {
+      ## Status der GA\xB4s holen
+     my $status = knx_read($Garage_zu_rueck,0,1);
+   
+          if (($msg{'value'} == 01) && ($status == 00)) {
+         knx_write($Garage_schalten,1,1);
+          return "zu";
+          }
+          if (($msg{'value'} == 01) && ($status == 01)) {
+         knx_write($Garage_zu,0,1);
+          return "zu";
+          }
+    
+   else {
+          return;
+     }}
+# zu reset
+   if (($msg{'dst'} eq ($Garage_zu_rueck)) && ($msg{'apci'} eq 'A_GroupValue_Write'))  
+	{
+	my $garage_soll = knx_read($Garage_zu,0,1);
+	
+	 if (($msg{'data'} == 01) && ($garage_soll == 01)) {
+	 knx_write($Garage_zu ,0,1);
+	}
+	if (($msg{'data'} == 01) && ($garage_soll == 00)) {
+	 knx_write($Garage_schalten ,1,1);
+	}
+	
+	}
+
+## auf reset 
+	if (($msg{'dst'} eq ($Garage_auf_rueck)) && ($msg{'apci'} eq 'A_GroupValue_Write'))  
+	{
+	my $garage_soll = knx_read($Garage_auf,0,1);
+	
+	 if (($msg{'data'} == 01) && ($garage_soll == 01)) {
+	 knx_write($Garage_auf ,0,1);
+	}
+	if (($msg{'data'} == 01) && ($garage_soll == 00)) {
+	 knx_write($Garage_schalten ,1,1);}
+	 
+	}
+	
+## tor auf
+if (($msg{'dst'} eq ($Garage_auf)) && ($msg{'apci'} eq 'A_GroupValue_Write'))
+     {
+      ## Status der GA\xB4s holen
+     my $status = knx_read($Garage_auf_rueck,0,1);
+     
+     
+          if (($msg{'value'} == 01) && ($status == 00)) {
+         knx_write($Garage_schalten,1,1);
+          return "auf";
+          }
+          
+           if (($msg{'value'} == 01) && ($status == 01)) {
+         knx_write($Garage_auf,0,1);
+          return "auf";
+          }
+         
+      else {
+          return;
+     }
+     }
+   
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[422] wiregate/plugin/generic/Fensterstatus.pl

[<j-...@us...>]

Revision: 422
          http://openautomation.svn.sourceforge.net/openautomation/?rev=422&view=rev
Author:   j-n-k
Date:     2011-09-20 15:49:14 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Commit Fensterstatus Plugin

Added Paths:
-----------
    wiregate/plugin/generic/Fensterstatus.pl

Added: wiregate/plugin/generic/Fensterstatus.pl
===================================================================
--- wiregate/plugin/generic/Fensterstatus.pl	                        (rev 0)
+++ wiregate/plugin/generic/Fensterstatus.pl	2011-09-20 15:49:14 UTC (rev 422)
@@ -0,0 +1,42 @@
+#
+# Fensterstatus v0.2
+#
+# by JNK, 2011-09-19
+
+
+my @Fenster_GA = ('7/7/7', '7/7/8'); # hier alle Fenster-Einzel-GA
+my $Sammel_GA = '7/7/9'; # hier die Sammel-GA
+my $zustand_geschlossen = 01;    # auf richtige polarit\xE4t achten!
+my $zustand_offen = 00;
+
+ 
+# Flossen weg, der Rest geht automatisch
+$plugin_info{$plugname.'_cycle'} = 0; # nur bei Telegramm aufrufen
+
+if (($msg{'apci'} eq 'A_GroupValue_Write') && (grep {$_ eq $msg{'dst'};} @Fenster_GA)) {
+   # Telegramm auf einer Einzel-GA erhalten
+   my $status = $zustand_geschlossen; # mit geschlossen anfangen
+   my $old_status = $plugin_info{$plugname.'_oldstatus'};
+   foreach my $GA (@Fenster_GA) {
+     if (knx_read($GA, 0, 1) == $zustand_offen) { # da war eine 'offen', also Status auf 1 setzen
+       $status = $zustand_offen;
+       last;
+     }
+   }
+   if ($old_status != $status){ #
+       knx_write($Sammel_GA, $status, 1); # Status hat sich geaendert, senden
+       $plugin_info{$plugname.'_oldstatus'} = $status; # neuen Status speichern
+   }
+   
+   return 'Sent Value'.$status;
+}
+
+# keine Telegramme, also Init
+
+foreach my $GA (@Fenster_GA) {  # an allen Fenster-Einzel-GA anmelden
+    $plugin_subscribe{$GA}{$plugname} = 1; 
+}
+# bis zum Beweis des Gegenteils sind alle Fenster zu
+$plugin_info{$plugname.'_oldstatus'} = $zustand_geschlossen;
+
+return 'Init';
\ No newline at end of file


Property changes on: wiregate/plugin/generic/Fensterstatus.pl
___________________________________________________________________
Added: svn:executable
   + *

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[421] tools/rsslog/rsslog.php

[<ma...@us...>]

Revision: 421
          http://openautomation.svn.sourceforge.net/openautomation/?rev=421&view=rev
Author:   mayerch
Date:     2011-09-19 22:10:46 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Updated version which can dump its content in HTML as well as delete old content.
Also UTF-8 fixes to work with picky RSS readers.

Modified Paths:
--------------
    tools/rsslog/rsslog.php

Modified: tools/rsslog/rsslog.php
===================================================================
--- tools/rsslog/rsslog.php	2011-09-19 15:58:09 UTC (rev 420)
+++ tools/rsslog/rsslog.php	2011-09-19 22:10:46 UTC (rev 421)
@@ -13,72 +13,75 @@
 // 2. Recieve the log as RSS:
 //    URL parameter "f":   The (optional) filter, only log lines with a tag
 //                         that fit this string are sent
+// 3. Dump all the content in a HTML page:
+//    URL parameter "dump" - no value needed
+// 4. Remove old content:
+//    URL parameter "r":   the timestamp (seconds since 1970) of the oldest log
+//                         line to keep
+
+// create database connection
+$db = sqlite_open('rsslog.db', 0666, $error);
+if (!$db) die ($error);
+
+// create table if it doesn't exists
+create( $db );
+
 if( isset($_GET['c']) )
 { 
   // store a new log
   $store = true;
   $log_content = $_GET['c'] ? $_GET['c'] : '<no content>';
+  if( mb_detect_encoding($log_content, 'UTF-8', true) != 'UTF-8' )
+    $log_content = utf8_encode($log_content);
   $log_tags    = $_GET['t'] ? $_GET['t'] : array();
+  
+  insert( $db, $log_content, $log_tags );
+} else if( isset($_GET['dump']) )
+{
+  $result = retrieve( $db, $log_filter );
+  ?>
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" /></head><body>
+<table border="1">
+  <?php
+  while( sqlite_has_more($result) )
+  {
+    $row = sqlite_fetch_array($result, SQLITE_ASSOC ); 
+    echo '<tr>';
+    echo '<td>' . date( DATE_RFC822, $row['t'] ) . '</td>';
+    echo '<td>' . $row['content'] . '</td>';
+    echo "</tr>\n";
+  }
+  ?>
+</table>
+</body></html>
+  <?php
+} else if( isset($_GET['r']) )
+{
+  $timestamp  = $_GET['r'] ? $_GET['r'] : '';
+  delete( $db, $timestamp );
 } else {
   // send logs
-  $store = false;
   $log_filter  = $_GET['f'] ? $_GET['f'] : '';
-}
 
-// create database connection
-$db = sqlite_open('rsslog.db', 0666, $error);
-if (!$db) die ($error);
-
-// create table if it doesn't exists
-$q = "SELECT name FROM sqlite_master WHERE type='table' AND name='Logs';";
-$result = sqlite_query( $db, $q, SQLITE_NUM);
-if (!$result) die("Cannot execute query.");
-if( !sqlite_has_more($result) )
-{
-  // no table found - create it
-  $q = "CREATE TABLE Logs(" .
-       "  id INTEGER PRIMARY KEY," . 
-       "  content TEXT NOT NULL," .
-       "  t TIMESTAMP" .
-       ");";
-  $ok = sqlite_exec($db, $q, $error);
-  
-  if (!$ok)
-    die("Cannot execute query. $error");
-}
-
-if( $store )
-{
-  // store a new log line
-  $q = "INSERT INTO Logs(content, t) VALUES( " .
-       "  '" . sqlite_escape_string( $log_content ) . "'," .
-       "  datetime('now','localtime')" .
-       ")";
-  
-  $ok = sqlite_exec($db, $q, $error);
-  
-  if (!$ok)
-    die("Cannot execute query. $error");
-} else {
   // retrieve data
-  $q = "SELECT * FROM Logs";
-  $result = sqlite_query( $db, $q, SQLITE_ASSOC);
-// phpinfo(); 
+  $result = retrieve( $db, $log_filter );
   echo '<?xml version="1.0"?>';
   ?>
 <rss version="2.0">
   <channel>
     <title>RSS supplied logs</title>
     <link><?php echo 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; ?></link>
+    <description>RSS supplied logs</description>
   <?php
   // echo '<description>foo</description>';
   while( sqlite_has_more($result) )
   {
-    $row = sqlite_fetch_array($result, SQLITE_ASSOC); 
+    $row = sqlite_fetch_array($result, SQLITE_ASSOC ); 
     echo '<item>';
     echo '<title>' . $row['content'] . '</title>';
-    echo '<pubDate>' . $row['t'] . '</pubDate>';
-    echo '</item>';
+    echo '<description>' . $row['content'] . '</description>';
+    echo '<pubDate>' . date( DATE_RFC822, $row['t'] ) . '</pubDate>';
+    echo '</item>' . "\n";
   }
   ?>
   </channel>
@@ -87,4 +90,58 @@
 }
 
 sqlite_close($db);
+
+///////////////////////////////////////////////////////////////////////////////
+// create tables if they don't exist
+function create( $db )
+{
+  $q = "SELECT name FROM sqlite_master WHERE type='table' AND name='Logs';";
+  $result = sqlite_query( $db, $q, SQLITE_NUM );
+  if (!$result) die("Cannot execute query.");
+  if( !sqlite_has_more($result) )
+  {
+    // no table found - create it
+    $q = 'CREATE TABLE Logs(' .
+        '  id INTEGER PRIMARY KEY,' . 
+        '  content TEXT NOT NULL,' .
+        '  t TIMESTAMP' .
+        ');';
+    $ok = sqlite_exec($db, $q, $error);
+    
+    if (!$ok)
+      die("Cannot execute query. $error");
+  }
+}
+
+// insert a new log line
+function insert( $db, $content, $tags )
+{
+  // store a new log line
+  $q = 'INSERT INTO Logs(content, t) VALUES( ' .
+       "  '" . sqlite_escape_string( $content ) . "'," .
+       "  datetime('now','localtime')" .
+       ')';
+  
+  $ok = sqlite_exec($db, $q, $error);
+  
+  if (!$ok)
+    die("Cannot execute query. $error");
+}
+
+// return a handle to all the data
+function retrieve( $db, $filter )
+{
+  $q = "SELECT content, strftime('%s', t, 'localtime') AS t FROM Logs";
+  return sqlite_query( $db, $q, SQLITE_ASSOC );
+}
+
+// delete all log lines older than the timestamp
+function delete( $db, $timestamp )
+{
+  $q = "DELETE from Logs WHERE t < datetime($timestamp, 'unixepoch', 'localtime')";
+  $ok = sqlite_exec($db, $q, $error);
+  
+  if (!$ok)
+    die("Cannot execute query. $error");
+}
 ?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[420] CometVisu/trunk/visu

[<ma...@us...>]

Revision: 420
          http://openautomation.svn.sourceforge.net/openautomation/?rev=420&view=rev
Author:   mayerch
Date:     2011-09-19 15:58:09 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
New Feature: widgets can be (optionally) marked by a maturity value, so the editor can ignore them if they or itself isn't mature enough.

The maturity level can be set through the optional URL parameter "maturity". This can either be the number directly or one of the maturity ENUM values. These are currently: "release" and "development"

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/structure_pure.js
    CometVisu/trunk/visu/edit/visuconfig_edit.js
    CometVisu/trunk/visu/lib/templateengine.js

Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js	2011-09-18 13:06:41 UTC (rev 419)
+++ CometVisu/trunk/visu/designs/structure_pure.js	2011-09-19 15:58:09 UTC (rev 420)
@@ -15,6 +15,13 @@
  * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
 */
 
+// Define ENUM of maturity levels for features, so that e.g. the editor can 
+// ignore some widgets when they are not supported yet
+var Maturity = {
+  release     : 0,
+  development : 1
+};
+
 /**
  * This class defines all the building blocks for a Visu in the "Pure" design
  */
@@ -86,6 +93,7 @@
   });
   
   this.addCreator('group', {
+    maturity: Maturity.development,
     create: function( page, path, flavour ) {
       var $p = $(page);
       var ret_val = $('<div class="widget group" />');

Modified: CometVisu/trunk/visu/edit/visuconfig_edit.js
===================================================================
--- CometVisu/trunk/visu/edit/visuconfig_edit.js	2011-09-18 13:06:41 UTC (rev 419)
+++ CometVisu/trunk/visu/edit/visuconfig_edit.js	2011-09-19 15:58:09 UTC (rev 420)
@@ -138,6 +138,11 @@
                 // "unknown" is not a good choice for a new widget :)
                 return;
             }
+            if( design.creators[index].maturity > use_maturity )
+            {
+                // widget is not mature enough to show in the edior
+                return;
+            }
             $("#addMaster").find("select#add_type").append(
                 $("<option />").attr("value", index).html(index)
             );

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2011-09-18 13:06:41 UTC (rev 419)
+++ CometVisu/trunk/visu/lib/templateengine.js	2011-09-19 15:58:09 UTC (rev 420)
@@ -62,6 +62,18 @@
   forceReload = $.getUrlVar('forceReload') != 'false'; // true unless set to false
 }
 
+// Disable features that aren't ready yet
+// This can be overwritten in the URL with the parameter "maturity"
+var use_maturity; 
+if( $.getUrlVar('maturity') ) {
+  var url_maturity = $.getUrlVar('maturity');
+  if( !isNaN ( url_maturity - 0 ) )
+    use_maturity = url_maturity - 0;         // given directly as number
+  else
+    use_maturity = Maturity[ url_maturity ]; // or as the ENUM name
+}
+if( isNaN( use_maturity ) ) use_maturity = Maturity.release; // default to release
+
 $(document).ready(function() {
   // get the data once the page was loaded
   $.ajaxSetup({cache: !forceReload});

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[419] wiregate/plugin/generic/StateSave

[<ma...@us...>]

Revision: 419
          http://openautomation.svn.sourceforge.net/openautomation/?rev=419&view=rev
Author:   mayerch
Date:     2011-09-18 13:06:41 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
New (demo) plugin store states on the bus to keep them over restarts

Added Paths:
-----------
    wiregate/plugin/generic/StateSave

Added: wiregate/plugin/generic/StateSave
===================================================================
--- wiregate/plugin/generic/StateSave	                        (rev 0)
+++ wiregate/plugin/generic/StateSave	2011-09-18 13:06:41 UTC (rev 419)
@@ -0,0 +1,88 @@
+#############################################################################
+# Plugin StateSave
+# V0.5 2011-09-18
+# Copyright: Christian Mayer (mail at ChristianMayer.de)
+# License: GPL (v3)
+#
+# Plugin to remember states on the bus if over power failures
+#
+# TODO: DPT is currently required - but it should be optional
+#############################################################################
+
+#############################################################################
+# Configuration:
+
+# The %states hash defines the global names to use in the plugins in the form of
+#   $plugin_info{'Global_...'}
+# as well as the KNX GA
+
+# Syntax:
+# 'Global_Name' => [ 'KNX GA', 'Initial Value', 'DPT (optional)' ],
+my %states = (
+  'Global_ErzwingeWochenende'             => [ '0/3/20', 0    ],
+  'Global_WeihnachtsbeleuchtungAutomatik' => [ '0/3/21', 0, 1 ], 
+);
+
+my $reset_states = 0; # set to 1 to reset the states, run script and change to 0 again
+my $show_debug   = 1; # switches debug information that will be shown in the log
+
+#############################################################################
+# Do NOT change anything below!
+#############################################################################
+
+#############################################################################
+# Initialisation
+for my $this_state ( keys %states ) 
+{ 
+  # Initialise global variable an the bus
+  if( $reset_states or not exists $plugin_info{ $this_state } )
+  {
+    $plugin_info{ $this_state } = $states{ $this_state }[1];
+    knx_write( $states{ $this_state }[0], $plugin_info{ $this_state }, $states{ $this_state }[2] );
+  }
+  
+  # subscribe GA
+  $plugin_subscribe{ $states{ $this_state }[0] }{ $plugname } = 1;
+}
+
+# No cycling, run only on request
+$plugin_info{$plugname.'_cycle'} = 0;
+
+my $ret_val = '';
+
+#############################################################################
+# Handle the bus traffic
+
+# Early exit during a response messeage - it's usually from us...
+if( $msg{'apci'} eq 'A_GroupValue_Response' )
+{
+  return;
+}
+
+# a linear search isn't smart but OK for only a few states:
+for my $this_state ( keys %states ) 
+{ 
+  my $GA  = $states{ $this_state }[0];
+  my $DPT = $states{ $this_state }[2];
+  
+  if( $msg{'dst'} eq $GA )
+  {
+    $ret_val .= $GA . '[' . $DPT . ']:';
+    
+    if(   $msg{'apci'} eq 'A_GroupValue_Read' ) 
+    {
+      $ret_val .= 'read <- "' . $plugin_info{ $this_state } . '";';
+      knx_write( $GA, $plugin_info{ $this_state }, $DPT, 1 ); # send response
+    } 
+    elsif($msg{'apci'} eq 'A_GroupValue_Write')
+    {
+      # read from eibd cache, so we'll the cast for free:
+      my $v = knx_read( $GA, 0, $DPT ) > 0 || 0; 
+      $ret_val .= 'write: "' . $plugin_info{ $this_state } . '" -> "' . $v . '";';
+      $plugin_info{ $this_state } = $v;
+    }
+  }
+}
+
+if( $show_debug ) { return $ret_val; }
+return;
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[418] CometVisu/trunk/visu

[<chr...@us...>]

Revision: 418
          http://openautomation.svn.sourceforge.net/openautomation/?rev=418&view=rev
Author:   chris_ace
Date:     2011-09-17 07:37:37 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Change all DOS line endings to Unix line endings using:
fgrep -rl "^M" . | fgrep -v svn | egrep "js|css|php|csv|svg" | xargs dos2unix

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/alaska/basic.css
    CometVisu/trunk/visu/designs/alaska/mobile.css
    CometVisu/trunk/visu/designs/alaska_slim/basic.css
    CometVisu/trunk/visu/designs/alaska_slim/mobile.css
    CometVisu/trunk/visu/designs/discreet/basic.css
    CometVisu/trunk/visu/designs/discreet/mobile.css
    CometVisu/trunk/visu/designs/discreet_sand/basic.css
    CometVisu/trunk/visu/designs/discreet_sand/mobile.css
    CometVisu/trunk/visu/designs/discreet_slim/basic.css
    CometVisu/trunk/visu/designs/discreet_slim/mobile.css
    CometVisu/trunk/visu/designs/pure/basic.css
    CometVisu/trunk/visu/designs/pure/mobile.css
    CometVisu/trunk/visu/edit/dpt_list.csv
    CometVisu/trunk/visu/edit/dpt_list.json
    CometVisu/trunk/visu/icon/comet_opt.svg
    CometVisu/trunk/visu/lib/jquery.jnotify.js
    CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.pie.js
    CometVisu/trunk/visu/plugins/gweather/gweather.php
    CometVisu/trunk/visu/plugins/gweather/structure_plugin.js
    CometVisu/trunk/visu/plugins/rss/structure_plugin.js
    CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.vticker.js
    CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.js
    CometVisu/trunk/visu/plugins/rss/zrssfeed/jquery.zrssfeed.min.js

Modified: CometVisu/trunk/visu/designs/alaska/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/basic.css	2011-09-11 20:49:21 UTC (rev 417)
+++ CometVisu/trunk/visu/designs/alaska/basic.css	2011-09-17 07:37:37 UTC (rev 418)
@@ -1,384 +1,384 @@
-@import "colors.css";
-@font-face { font-family: new_cicle; src:url(fonts/new_cicle_fina.ttf); }
-@font-face { font-family: new_cicle; font-weight: bold; src:url(fonts/new_cicle_gordita.ttf); }
-
-body 
-{ 
-  font-family: new_cicle,sans-serif;
-  font-size: 5.5mm;
-  overflow: hidden;
-  margin:0;
-}
-
-h1
-{
-  font-size: 1.5em;
-  padding-left: 15px;
-}
-
-h2
-{
-  font-size: 1.1em;
-  margin-left: 15px;
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
-
-body hr
-{
-  clear:both;
-  height: 1px;
-  border: none;
-  padding: 0;
-  margin:0.1em;
-}
-
-#pages hr 
-{
-  /* margin: 15px 0.1em 15px 0.1em; */
-  margin: 4px 1px 4px 1px;
-  border: 0; /* for Firefox and Opera */
-  border-top-style: solid;
-  border-top-width: 1px;
-  border-bottom: transparent;  
-  clear: both;
-}
-
-
-body br
-{
-  clear:both;
-}
-
-div#top {
-  padding-top: 8px;
-  border-bottom-style: solid;
-  border-width: 1px;
-  padding-bottom: 2px;
-}
-
-.page h1 
-{
-  margin-top: 0;
-  padding-top: 1em;
-}
-
-.nav_path 
-{
-  margin-left: 15px;
-}
-
-.nav_path a 
-{
-  text-decoration:none;
-}
-
-.footer, .footer * 
-{
-  font-size: 0.9em;
-  vertical-align: middle;
-  border-top-style: solid;
-  border-width: 1px;
-}
-
-.footer * 
-{
-  border-style: none;
-  text-decoration: none;
-}
-
-.widget 
-{
-  float:left;
-  width:48%;
-  margin: 0.2em;
-  padding: 0.2em;
-  border-style: solid none none none; /* oben rechts unten links */
-  border-width: 1px;
-  min-height: 2em;
-  background: transparent;
-}
-
-.widget .widget 
-{
-  width:98%;
-}
-
-.text > div, .link > a 
-{
-  float:left;
-  text-align:left;
-  padding-left: 1em;
-}
-
-.widget .label, .widget.info .actor, .text > div, .link > a 
-{
-    line-height: 2em;
-}
-
-.widget .label 
-{
-  float:left; 
-  width:49%;
-  text-align:left;
-  padding-left: 1em;
-}
-.widget .actor 
-{
-  float:left;
-  margin-left:1em;
-  text-align:left;
-}
-.widget .actor div 
-{
-  float:left;
-  white-space: pre-wrap;
-}
-
-.link a 
-{
-  width: 49%;
-}
-
-.page 
-{
-  float:left;
-  width: 900px;
-  overflow: auto;
-  position: relative;
-}
-
-.switchPressed, .switchUnpressed, .widget.link.pagelink div a
-{
-  overflow: hidden;
-  text-align: center;
-  white-space: nowrap;
-  font: 14px/100%;
-  padding: 1px;
-  -webkit-border-radius: .5em; 
-  -moz-border-radius: .5em;
-  border-radius: .5em;
-  border-style: solid;
-  border-width: 1px;
-  margin: 5px;
-}
-
-.switchPressed, .switchUnpressed:active
-{
-  position: relative;
-  top: 1px;
-}
-.switchPressed:active 
-{
-  position: relative;
-  top: 2px;
-}
-
-.switchUnpressed div, .switchPressed div
-{
-  padding: 2px;
-  width: 6em;
-  float: left;
-  background: transparent;
-  text-align: center;
-  cursor: pointer;
-}
-
-.ui-slider { position: relative; text-align: left;}
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }
-.ui-widget-content 
-{ 
-  border-style: solid;
-  border-width: 1px;
-}
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default 
-{ 
-  border-style: solid;
-  border-width: 1px; 
-  font-weight: bold; 
-}
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { text-decoration: none; }
-
-.dim .actor
-{
-  width: 3em;
-}
-
-.widget .ui-slider
-{
-  width: 30%;
-  float: left;
-  margin-left: 1em;
-  margin-top: 0.5em;
-  border-style: solid; 
-  border-width: 1px;
-  -webkit-border-radius: .5em; 
-  -moz-border-radius: .5em;
-  border-radius: .5em;
-}
-
-.widget .ui-slider-handle
-{
-  padding: 1px;
-  /*height: 0.9em; /* Slider small */
-  /* width: 0.9em; /* Slider small */
-  /* margin: 0em 0em 0em -0.4em; /* Slider small top */
-  /* margin: 0.38em 0em 0em -0.4em; /* Slider small middle */
-  -webkit-border-radius: 50%; 
-  -moz-border-radius: 50%;
-  border-radius: 50%;
-  border-style: solid;
-  border-width: 1px;
-}
-/* Clearfix */
-.clearfix:after 
-{
-  content: ".";
-  display: block;
-  clear: both;
-  visibility: hidden;
-  line-height: 0;
-  height: 0;
-}
-
-.clearfix
-{
-  display: inline-block;
-  -webkit-border-radius: .5em; 
-  -moz-border-radius: .5em;
-  border-radius: .5em;
-  border-style: solid;
-  border-width: 1px;
-}
-
-html[xmlns] .clearfix 
-{
-  display: block;
-}
-
-*:first-child+html .clearfix 
-{
-  min-height: 0;
-}
-
-* html .clearfix 
-{
-  height: 1%;
-}
-
-* html>body .clearfix 
-{
-  display: inline-block;
-  width: 100%;
-}
-
-* html .clearfix 
-{
-  /* Hides from IE-mac \*/ 
-  height: 1%;
-  /* End hide from IE-mac */
-}
-
-.loading 
-{
-  display: block !important;
-}
-
-div#loading 
-{
-  display: none !important;
-}
-
-.popup, .popup_background 
-{
-  position: absolute;
-  width: 90%;
-  height: 90%;
-  top: 5%;
-  left: 5%;
-}
-
-.popup 
-{
-  z-index: 101;
-  background: transparent;
-}
-
-
-.popup_background 
-{
-  z-index: 100;
-  -webkit-border-radius: .5em; 
-  -moz-border-radius: .5em;
-  border-radius: .5em;
-  border-style: solid;
-  border-width: 1px;
-  opacity: .98;
-}
-
-.popup div 
-{
-  margin: 4px;
-}
-
-.popup div.head 
-{
-  border-bottom-style: solid;
-  border-bottom-width: 1px;
-}
-
-.clickable 
-{
-  cursor: pointer;
-}
-
-.diagram_inline 
-{
-  width: 320px; 
-  height: 180px;
-}
-
-.diagram_preview 
-{
-  width: 240px;
-  height: 2em;
-}
-
-#diagramTooltip 
-{
-  z-index: 1000;
-  border-style: solid; 
-  border-width: 1px;
-  padding: 2px;
-  opacity: 0.80;
-}
-
-.widget IFRAME 
-{
-  -webkit-border-radius: .5em; 
-  -moz-border-radius: .5em;
-  border-radius: .5em;
-  border-style: solid;
-  border-width: 1px;
-}
-
-/* Pagelinks as Button */
-.widget.link.pagelink div a
-{
-  display: inline-block;
-  width: 100%;
-  text-decoration: none;
-}
+@import "colors.css";
+@font-face { font-family: new_cicle; src:url(fonts/new_cicle_fina.ttf); }
+@font-face { font-family: new_cicle; font-weight: bold; src:url(fonts/new_cicle_gordita.ttf); }
+
+body 
+{ 
+  font-family: new_cicle,sans-serif;
+  font-size: 5.5mm;
+  overflow: hidden;
+  margin:0;
+}
+
+h1
+{
+  font-size: 1.5em;
+  padding-left: 15px;
+}
+
+h2
+{
+  font-size: 1.1em;
+  margin-left: 15px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+body hr
+{
+  clear:both;
+  height: 1px;
+  border: none;
+  padding: 0;
+  margin:0.1em;
+}
+
+#pages hr 
+{
+  /* margin: 15px 0.1em 15px 0.1em; */
+  margin: 4px 1px 4px 1px;
+  border: 0; /* for Firefox and Opera */
+  border-top-style: solid;
+  border-top-width: 1px;
+  border-bottom: transparent;  
+  clear: both;
+}
+
+
+body br
+{
+  clear:both;
+}
+
+div#top {
+  padding-top: 8px;
+  border-bottom-style: solid;
+  border-width: 1px;
+  padding-bottom: 2px;
+}
+
+.page h1 
+{
+  margin-top: 0;
+  padding-top: 1em;
+}
+
+.nav_path 
+{
+  margin-left: 15px;
+}
+
+.nav_path a 
+{
+  text-decoration:none;
+}
+
+.footer, .footer * 
+{
+  font-size: 0.9em;
+  vertical-align: middle;
+  border-top-style: solid;
+  border-width: 1px;
+}
+
+.footer * 
+{
+  border-style: none;
+  text-decoration: none;
+}
+
+.widget 
+{
+  float:left;
+  width:48%;
+  margin: 0.2em;
+  padding: 0.2em;
+  border-style: solid none none none; /* oben rechts unten links */
+  border-width: 1px;
+  min-height: 2em;
+  background: transparent;
+}
+
+.widget .widget 
+{
+  width:98%;
+}
+
+.text > div, .link > a 
+{
+  float:left;
+  text-align:left;
+  padding-left: 1em;
+}
+
+.widget .label, .widget.info .actor, .text > div, .link > a 
+{
+    line-height: 2em;
+}
+
+.widget .label 
+{
+  float:left; 
+  width:49%;
+  text-align:left;
+  padding-left: 1em;
+}
+.widget .actor 
+{
+  float:left;
+  margin-left:1em;
+  text-align:left;
+}
+.widget .actor div 
+{
+  float:left;
+  white-space: pre-wrap;
+}
+
+.link a 
+{
+  width: 49%;
+}
+
+.page 
+{
+  float:left;
+  width: 900px;
+  overflow: auto;
+  position: relative;
+}
+
+.switchPressed, .switchUnpressed, .widget.link.pagelink div a
+{
+  overflow: hidden;
+  text-align: center;
+  white-space: nowrap;
+  font: 14px/100%;
+  padding: 1px;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  border-style: solid;
+  border-width: 1px;
+  margin: 5px;
+}
+
+.switchPressed, .switchUnpressed:active
+{
+  position: relative;
+  top: 1px;
+}
+.switchPressed:active 
+{
+  position: relative;
+  top: 2px;
+}
+
+.switchUnpressed div, .switchPressed div
+{
+  padding: 2px;
+  width: 6em;
+  float: left;
+  background: transparent;
+  text-align: center;
+  cursor: pointer;
+}
+
+.ui-slider { position: relative; text-align: left;}
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-widget-content 
+{ 
+  border-style: solid;
+  border-width: 1px;
+}
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default 
+{ 
+  border-style: solid;
+  border-width: 1px; 
+  font-weight: bold; 
+}
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { text-decoration: none; }
+
+.dim .actor
+{
+  width: 3em;
+}
+
+.widget .ui-slider
+{
+  width: 30%;
+  float: left;
+  margin-left: 1em;
+  margin-top: 0.5em;
+  border-style: solid; 
+  border-width: 1px;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+}
+
+.widget .ui-slider-handle
+{
+  padding: 1px;
+  /*height: 0.9em; /* Slider small */
+  /* width: 0.9em; /* Slider small */
+  /* margin: 0em 0em 0em -0.4em; /* Slider small top */
+  /* margin: 0.38em 0em 0em -0.4em; /* Slider small middle */
+  -webkit-border-radius: 50%; 
+  -moz-border-radius: 50%;
+  border-radius: 50%;
+  border-style: solid;
+  border-width: 1px;
+}
+/* Clearfix */
+.clearfix:after 
+{
+  content: ".";
+  display: block;
+  clear: both;
+  visibility: hidden;
+  line-height: 0;
+  height: 0;
+}
+
+.clearfix
+{
+  display: inline-block;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  border-style: solid;
+  border-width: 1px;
+}
+
+html[xmlns] .clearfix 
+{
+  display: block;
+}
+
+*:first-child+html .clearfix 
+{
+  min-height: 0;
+}
+
+* html .clearfix 
+{
+  height: 1%;
+}
+
+* html>body .clearfix 
+{
+  display: inline-block;
+  width: 100%;
+}
+
+* html .clearfix 
+{
+  /* Hides from IE-mac \*/ 
+  height: 1%;
+  /* End hide from IE-mac */
+}
+
+.loading 
+{
+  display: block !important;
+}
+
+div#loading 
+{
+  display: none !important;
+}
+
+.popup, .popup_background 
+{
+  position: absolute;
+  width: 90%;
+  height: 90%;
+  top: 5%;
+  left: 5%;
+}
+
+.popup 
+{
+  z-index: 101;
+  background: transparent;
+}
+
+
+.popup_background 
+{
+  z-index: 100;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  border-style: solid;
+  border-width: 1px;
+  opacity: .98;
+}
+
+.popup div 
+{
+  margin: 4px;
+}
+
+.popup div.head 
+{
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+}
+
+.clickable 
+{
+  cursor: pointer;
+}
+
+.diagram_inline 
+{
+  width: 320px; 
+  height: 180px;
+}
+
+.diagram_preview 
+{
+  width: 240px;
+  height: 2em;
+}
+
+#diagramTooltip 
+{
+  z-index: 1000;
+  border-style: solid; 
+  border-width: 1px;
+  padding: 2px;
+  opacity: 0.80;
+}
+
+.widget IFRAME 
+{
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  border-style: solid;
+  border-width: 1px;
+}
+
+/* Pagelinks as Button */
+.widget.link.pagelink div a
+{
+  display: inline-block;
+  width: 100%;
+  text-decoration: none;
+}

Modified: CometVisu/trunk/visu/designs/alaska/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/mobile.css	2011-09-11 20:49:21 UTC (rev 417)
+++ CometVisu/trunk/visu/designs/alaska/mobile.css	2011-09-17 07:37:37 UTC (rev 418)
@@ -1,14 +1,14 @@
-.widget
-{
-  width:98%;
-}
-
-#bottom 
-{
-  display: none;
-}
-
-.page 
-{
-  overflow: visible;
-}
+.widget
+{
+  width:98%;
+}
+
+#bottom 
+{
+  display: none;
+}
+
+.page 
+{
+  overflow: visible;
+}

Modified: CometVisu/trunk/visu/designs/alaska_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/basic.css	2011-09-11 20:49:21 UTC (rev 417)
+++ CometVisu/trunk/visu/designs/alaska_slim/basic.css	2011-09-17 07:37:37 UTC (rev 418)
@@ -1,364 +1,364 @@
-@import "colors.css";
-@font-face { font-family: new_cicle; src:url(fonts/new_cicle_fina.ttf); }
-@font-face { font-family: new_cicle; font-weight: bold; src:url(fonts/new_cicle_gordita.ttf); }
-
-body 
-{ 
-  font-family: new_cicle,sans-serif;
-  font-size: 5mm;
-  overflow: hidden;
-  margin:0;
-}
-
-h1
-{
-  font-size: 1.5em;
-  padding-left: 15px;
-}
-
-h2
-{
-  font-size: 1.1em;
-  margin-left: 15px;
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
-
-body hr
-{
-  clear:both;
-  height: 1px;
-  border: none;
-  padding: 0;
-  margin: 0.1em;
-}
-
-#pages hr {
- margin: 4px 1px 4px 1px;
- border: 0; /* Für Firefox und Opera */
- border-top: solid 1px;
- border-bottom: transparent;  
- clear: both;
-}
-
-
-body br
-{
-  clear:both;
-}
-
-div#top {
-  padding-top: 8px;
-  border-bottom: 1px solid;
-  padding-bottom: 2px;
-}
-
-.page h1 {
-  margin-top: 0;
-  padding-top: 1em;
-}
-
-.nav_path 
-{
-  margin-left: 15px;
-}
-
-.nav_path a
-{
-  text-decoration:none;
-}
-
-.footer, .footer * 
-{
-  font-size: 0.9em;
-  vertical-align: middle;
-  border-top-style: solid;
-  border-width: 1px;
-}
-
-.footer * 
-{
-  border-style: none;
-  text-decoration: none;
-}
-
-.widget
-{
-  float:left;
-  width:32%;
-  margin: 0.2em;
-  padding: 0.2em;
-  border-style: solid none none none; /* oben rechts unten links */
-  border-width: 1px;
-  min-height: 2em;
-  background: transparent;
-}
-
-.widget .widget
-{
-  width:98%;
-}
-
-.text > div, .link > a {
-  float:left;
-  text-align:left;
-  padding-left: 1em;
-  text-decoration: none;
-}
-
-.widget .label, .widget.info .actor, .text > div, .link > a 
-{
-  line-height: 2em;
-}
-
-.widget .label
-{
-  float:left; 
-  width:49%;
-  text-align:left;
-  padding-left: 1em;
-}
-.widget .actor
-{
-  float:left;
-  margin-left:1em;
-  text-align:left;
-}
-.widget .actor div
-{
-  float:left;
-  white-space: pre-wrap;
-}
-
-.link a
-{
-  width: 49%;
-}
-
-.page
-{
-  float:left;
-  width: 900px;
-  overflow: auto;
-  position: relative;
-}
-
-.switchPressed, .switchUnpressed, .widget.link.pagelink div a
-{
-  overflow: hidden;
-  text-align: center;
-  white-space: nowrap;
-  font: 14px/100%;
-  padding: 1px;
-  -webkit-border-radius: .5em; 
-  -moz-border-radius: .5em;
-  border-radius: .5em;
-  border-style: solid;
-  border-width: 1px;
-  margin: 5px;
-}
-
-.switchPressed, .switchUnpressed:active
-{
-   position: relative;
-	top: 1px;
-}
-
-.switchPressed:active {
-   position: relative;
-   top: 2px;
-}
-
-.switchUnpressed div, .switchPressed div
-{
-  padding: 2px;
-  width: 6em;
-  float: left;
-  background: transparent;
-  text-align: center;
-  cursor: pointer;
-}
-
-.ui-slider { position: relative; text-align: left;}
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }
-.ui-widget-content { border: 0px solid; }
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 0px solid; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { text-decoration: none; }
-
-.dim .actor
-{
-  width: 3em;
-}
-.widget .ui-slider
-{
-  width: 30%;
-  float: left;
-  margin-left: 1em;
-  margin-top: 0.5em;
-  border: solid 1px;
-  -webkit-border-radius: .5em; 
-  -moz-border-radius: .5em;
-  border-radius: .5em;
-}
-
-.widget .ui-slider-handle
-{
-  padding: 1px;
-  /*height: 0.9em; /* Slider small */
-  /* width: 0.9em; /* Slider small */
-  /* margin: 0em 0em 0em -0.4em; /* Slider small top */
-  /* margin: 0.38em 0em 0em -0.4em; /* Slider small middle */
-  border: solid 1px;
-  -webkit-border-radius: 50%; 
-  -moz-border-radius: 50%;
-  border-radius: 50%;
-}
-/* Clearfix */
-.clearfix:after {
-   content: ".";
-   display: block;
-   clear: both;
-   visibility: hidden;
-   line-height: 0;
-   height: 0;
-}
-
-.clearfix {
-  display: inline-block;
-  -webkit-border-radius: .5em; 
-  -moz-border-radius: .5em;
-  border-radius: .5em;
-  border: solid 1px;
-}
-
-html[xmlns] .clearfix 
-{
-  display: block;
-}
-
-*:first-child+html .clearfix 
-{
-  min-height: 0;
-}
-
-* html .clearfix 
-{
-  height: 1%;
-}
-
-* html>body .clearfix 
-{
-  display: inline-block;
-  width: 100%;
-}
-
-* html .clearfix 
-{
-  /* Hides from IE-mac \*/
-  height: 1%;
-  /* End hide from IE-mac */
-}
-
-.loading 
-{
-  display: block !important;
-}
-
-div#loading 
-{
-  display: none !important;
-}
-
-.popup, .popup_background 
-{
-  position: absolute;
-  width: 90%;
-  height: 90%;
-  top: 5%;
-  left: 5%;
-}
-
-.popup 
-{
-  z-index: 101;
-  background: transparent;
-}
-
-
-.popup_background 
-{
-  z-index: 100;
-  -webkit-border-radius: .5em; 
-  -moz-border-radius: .5em;
-  border-radius: .5em;
-  opacity: .98;
-}
-
-.popup div 
-{
-  margin: 4px;
-}
-
-.popup div.head 
-{
-  border-bottom: 1px solid;
-}
-
-.popup_background.error 
-{
-  background: #ececec;
-  border: solid 1px;
-}
-
-.clickable 
-{
-  cursor: pointer;
-}
-
-.diagram_inline 
-{
-  width: 320px;
-  height: 180px;
-}
-
-.diagram_preview 
-{
-  width: 240px;
-  height: 2em;
-}
-
-#diagramTooltip 
-{
-  z-index: 1000;
-  border: solid 1px;
-	padding: 2px;
-	opacity: 0.80;
-}
-
-.widget IFRAME 
-{
-  -webkit-border-radius: .5em; 
-  -moz-border-radius: .5em;
-  border-radius: .5em;
-}
-
-/* Pagelinks as Button */
-.widget.link.pagelink div a
-{
-  display: inline-block;
-  width: 100%;
-  text-decoration: none;
-}
+@import "colors.css";
+@font-face { font-family: new_cicle; src:url(fonts/new_cicle_fina.ttf); }
+@font-face { font-family: new_cicle; font-weight: bold; src:url(fonts/new_cicle_gordita.ttf); }
+
+body 
+{ 
+  font-family: new_cicle,sans-serif;
+  font-size: 5mm;
+  overflow: hidden;
+  margin:0;
+}
+
+h1
+{
+  font-size: 1.5em;
+  padding-left: 15px;
+}
+
+h2
+{
+  font-size: 1.1em;
+  margin-left: 15px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+body hr
+{
+  clear:both;
+  height: 1px;
+  border: none;
+  padding: 0;
+  margin: 0.1em;
+}
+
+#pages hr {
+ margin: 4px 1px 4px 1px;
+ border: 0; /* Für Firefox und Opera */
+ border-top: solid 1px;
+ border-bottom: transparent;  
+ clear: both;
+}
+
+
+body br
+{
+  clear:both;
+}
+
+div#top {
+  padding-top: 8px;
+  border-bottom: 1px solid;
+  padding-bottom: 2px;
+}
+
+.page h1 {
+  margin-top: 0;
+  padding-top: 1em;
+}
+
+.nav_path 
+{
+  margin-left: 15px;
+}
+
+.nav_path a
+{
+  text-decoration:none;
+}
+
+.footer, .footer * 
+{
+  font-size: 0.9em;
+  vertical-align: middle;
+  border-top-style: solid;
+  border-width: 1px;
+}
+
+.footer * 
+{
+  border-style: none;
+  text-decoration: none;
+}
+
+.widget
+{
+  float:left;
+  width:32%;
+  margin: 0.2em;
+  padding: 0.2em;
+  border-style: solid none none none; /* oben rechts unten links */
+  border-width: 1px;
+  min-height: 2em;
+  background: transparent;
+}
+
+.widget .widget
+{
+  width:98%;
+}
+
+.text > div, .link > a {
+  float:left;
+  text-align:left;
+  padding-left: 1em;
+  text-decoration: none;
+}
+
+.widget .label, .widget.info .actor, .text > div, .link > a 
+{
+  line-height: 2em;
+}
+
+.widget .label
+{
+  float:left; 
+  width:49%;
+  text-align:left;
+  padding-left: 1em;
+}
+.widget .actor
+{
+  float:left;
+  margin-left:1em;
+  text-align:left;
+}
+.widget .actor div
+{
+  float:left;
+  white-space: pre-wrap;
+}
+
+.link a
+{
+  width: 49%;
+}
+
+.page
+{
+  float:left;
+  width: 900px;
+  overflow: auto;
+  position: relative;
+}
+
+.switchPressed, .switchUnpressed, .widget.link.pagelink div a
+{
+  overflow: hidden;
+  text-align: center;
+  white-space: nowrap;
+  font: 14px/100%;
+  padding: 1px;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  border-style: solid;
+  border-width: 1px;
+  margin: 5px;
+}
+
+.switchPressed, .switchUnpressed:active
+{
+   position: relative;
+	top: 1px;
+}
+
+.switchPressed:active {
+   position: relative;
+   top: 2px;
+}
+
+.switchUnpressed div, .switchPressed div
+{
+  padding: 2px;
+  width: 6em;
+  float: left;
+  background: transparent;
+  text-align: center;
+  cursor: pointer;
+}
+
+.ui-slider { position: relative; text-align: left;}
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-widget-content { border: 0px solid; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 0px solid; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { text-decoration: none; }
+
+.dim .actor
+{
+  width: 3em;
+}
+.widget .ui-slider
+{
+  width: 30%;
+  float: left;
+  margin-left: 1em;
+  margin-top: 0.5em;
+  border: solid 1px;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+}
+
+.widget .ui-slider-handle
+{
+  padding: 1px;
+  /*height: 0.9em; /* Slider small */
+  /* width: 0.9em; /* Slider small */
+  /* margin: 0em 0em 0em -0.4em; /* Slider small top */
+  /* margin: 0.38em 0em 0em -0.4em; /* Slider small middle */
+  border: solid 1px;
+  -webkit-border-radius: 50%; 
+  -moz-border-radius: 50%;
+  border-radius: 50%;
+}
+/* Clearfix */
+.clearfix:after {
+   content: ".";
+   display: block;
+   clear: both;
+   visibility: hidden;
+   line-height: 0;
+   height: 0;
+}
+
+.clearfix {
+  display: inline-block;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  border: solid 1px;
+}
+
+html[xmlns] .clearfix 
+{
+  display: block;
+}
+
+*:first-child+html .clearfix 
+{
+  min-height: 0;
+}
+
+* html .clearfix 
+{
+  height: 1%;
+}
+
+* html>body .clearfix 
+{
+  display: inline-block;
+  width: 100%;
+}
+
+* html .clearfix 
+{
+  /* Hides from IE-mac \*/
+  height: 1%;
+  /* End hide from IE-mac */
+}
+
+.loading 
+{
+  display: block !important;
+}
+
+div#loading 
+{
+  display: none !important;
+}
+
+.popup, .popup_background 
+{
+  position: absolute;
+  width: 90%;
+  height: 90%;
+  top: 5%;
+  left: 5%;
+}
+
+.popup 
+{
+  z-index: 101;
+  background: transparent;
+}
+
+
+.popup_background 
+{
+  z-index: 100;
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+  opacity: .98;
+}
+
+.popup div 
+{
+  margin: 4px;
+}
+
+.popup div.head 
+{
+  border-bottom: 1px solid;
+}
+
+.popup_background.error 
+{
+  background: #ececec;
+  border: solid 1px;
+}
+
+.clickable 
+{
+  cursor: pointer;
+}
+
+.diagram_inline 
+{
+  width: 320px;
+  height: 180px;
+}
+
+.diagram_preview 
+{
+  width: 240px;
+  height: 2em;
+}
+
+#diagramTooltip 
+{
+  z-index: 1000;
+  border: solid 1px;
+	padding: 2px;
+	opacity: 0.80;
+}
+
+.widget IFRAME 
+{
+  -webkit-border-radius: .5em; 
+  -moz-border-radius: .5em;
+  border-radius: .5em;
+}
+
+/* Pagelinks as Button */
+.widget.link.pagelink div a
+{
+  display: inline-block;
+  width: 100%;
+  text-decoration: none;
+}

Modified: CometVisu/trunk/visu/designs/alaska_slim/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/mobile.css	2011-09-11 20:49:21 UTC (rev 417)
+++ CometVisu/trunk/visu/designs/alaska_slim/mobile.css	2011-09-17 07:37:37 UTC (rev 418)
@@ -1,14 +1,14 @@
-.widget
-{
-  width:98%;
-}
-
-#bottom 
-{
-  display: none;
-}
-
-.page 
-{
-  overflow: visible;
-}
+.widget
+{
+  width:98%;
+}
+
+#bottom 
+{
+  display: none;
+}
+
+.page 
+{
+  overflow: visible;
+}

Modified: CometVisu/trunk/visu/designs/discreet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/basic.css	2011-09-11 20:49:21 UTC (rev 417)
+++ CometVisu/trunk/visu/designs/discreet/basic.css	2011-09-17 07:37:37 UTC (rev 418)
@@ -1,385 +1,385 @@
-@font-face { font-family: Liberation; src:url(fonts/liberationsans-regular.ttf); }
-@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/liberationsans-bold.ttf); }
-
-body 
-{ 
-  color: white;
-  font-family: Liberation;
-  font-size: 5.5mm;
-  overflow: hidden;
-  margin:0;
-  background: #1d1d1d; /* url(images/body_bg.png) repeat-x; */
-}
-
-h1
-{
-  font-size: 2em;
-  padding-left: 15px;
-}
-
-h2
-{
-  font-size: 1.25em;
-  margin-left: 15px;
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
-
-body hr
-{
-  clear:both;
-  color: #81664b;
-  background-color: #81664b;
-  height: 1px;
-  border:none;
-  padding:0px;
-  margin:0.1em;
-}
-
-#pages hr {
- border: 0; height: 30px; margin: 0 .1em;
- background: transparent url(images/hr_bg.png) 50% repeat-x;
- clear: both;
-}
-
-
-body br
-{
-  clear:both;
-}
-
-div#top {
-    padding-top: 8px;
-    border-top: 3px solid #1d1d1d;
-    border-bottom: 1px solid #0a0a0a;
-    background-color: #121212;
-    padding-bottom: 2px;
-}
-
-.page h1 {
-    margin-top: 0;
-    padding-top: 1em;
-    background: #121212 url(images/head_bg.png) scroll repeat-x bottom;
-}
-
-.nav_path 
-{
-  color: #81664b;
-  margin-left: 15px;
-}
-.nav_path a
-{
-  color: white;
-  text-decoration:none;
-}
-
-.footer,
-.footer *
-{
-  color: #000000;
-  font-size: 0.9em;
-  vertical-align: middle;
-}
-
-.widget
-{
-  float:left;
-  width:48%;
-  margin: .2em;
-  padding: 0.3em;
- /* border:yellow 1px solid; */
-  border-color: #020202;
-  border-style: solid;
-  border-width: 2px 0px 0px 2px;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  border-radius: 8px;
-  min-height: 2em;
-  background-color: #101010;
-}
-
-.widget .widget
-{
-  width:98%;
-}
-
-.text > div,
-.link > a {
-  float:left;
-  text-align:left;
-  padding-left: 1em;
-}
-
-.widget .label,
-.widget.info .actor,
-.text > div,
-.link > a {
-    line-height: 2em;
-}
-
-.widget .label
-{
-  float:left; 
-  width:49%;
-/*  color:red; */
-/*  padding-right:0.25em; */
-  text-align:left;
-  padding-left: 1em;
-/*  border:blue 1px solid; */
-}
-.widget .actor
-{
-  float:left;
-  margin-left:1em;
-  text-align:left;
-}
-.widget .actor div
-{
-  float:left;
-  white-space: pre-wrap;
-}
-
-
-.green.switchPressed div, .green.switchUnpressed div{
-    background: transparent url(images/dot_green.png) no-repeat center center;
-    color: white !important;
-}
-.red.switchPressed div, .red.switchUnpressed div{
-    background: transparent url(images/dot_red.png) no-repeat center center;
-    color: white !important;
-}
-
-
-.red 
-{
-  color:#f44;
-  font-weight:bold;
-}
-
-.green
-{
-  color:#4f4;
-}
-
-.blue
-{
-  color:#44f;
-}
-
-.purple
-{
-  color:#f4f;
-}
-
-.link a
-{
-  color: #81664b;
-  width: 49%;
-}
-
-.page
-{
-  float:left;
-  width: 900px;
-  overflow: auto;
-  position: relative;
-}
-
-.switchPressed, .switchUnpressed {
-  border-style:  solid;
-  -moz-border-radius: 12px;
-  -webkit-border-radius: 12px;
-  border-radius: 12px;
-  padding: 1px;
-  background: url(images/button_bg.png) #171717 repeat-x;
-}
-
-.switchUnpressed
-{
-  border-width:  1px 2px 2px 1px;
-  border-color: #282828 #010101 #010101 #282828;
-  margin-top: 0px;
-  background-color: #3A3A3A;
-  background-position: center +2px;
-}
-.switchUnpressed div, .switchPressed div
-{
-  padding: 5px;
-  width: 5em;
-  float: left;
-  background: transparent;
-  text-align: center;
-  cursor: pointer;
-}
-
-.switchPressed
-{
-  border-width:  2px 1px 1px 2px;
-  border-color: #010101 #282828 #282828 #010101;
-  margin-top: 1px;
-  background-position: center -2px;
-}
-
-.switchUnpressed div {
-    margin-left: -1px;
-}
-
-.switchPressed div {
-    margin-top: -1px;
-}
-
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }
-.ui-widget-content { border: 1px solid #dddddd; background: #000 ; color: #000; }
-.ui-widget-content a { color: #333333; }
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #000 ; font-weight: bold; color: #1c94c4; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
-
-.dim .actor
-{
-  width: 3em;
-}
-.widget .ui-slider
-{
-  width: 30%;
-  float: left;
-  margin-left: 10px;
-  margin-left: 1em;
-  margin-top: 0.5em;
-  border-color:  #010101 #282828 #282828 #010101;
-  background: url(images/gradient.png) #a7a7a7 repeat-y;
-}
-
-.widget .ui-slider-handle
-{
-  border-style:  solid;
-  -moz-border-radius: 12px;
-  -webkit-border-radius: 12px;
-  border-radius: 12px;
-  padding: 1px;
-  background: url(images/button_bg.png) #171717 repeat-x;
-  border-width:  1px 2px 2px 1px;
-  border-color: #282828 #010101 #010101 #282828;
-}
-/* Clearfix */
-.clearfix:after {
-    content: ".";
-    display: block;
-    clear: both;
-    visibility: hidden;
-    line-height: 0;
-    height: 0;
-}
-
-.clearfix {
-    display: inline-block;
-}
-
-html[xmlns] .clearfix {
-    display: block;
-}
-
-*:first-child+html .clearfix {
-    min-height: 0;
-}
-
-* html .clearfix {
-    height: 1%;
-}
-
-* html>body .clearfix {
-    display: inline-block;
-    width: 100%;
-}
-
-* html .clearfix {
-    /* Hides from IE-mac \*/
-    height: 1%;
-    /* End hide from IE-mac */
-}
-
-.loading {
-    display: block !important;
-}
-
-div#loading {
-    display: none !important;
-}
-
-
-.popup,
-.popup_background {
-  position: absolute;
-  width: 90%;
-  height: 90%;
-  top: 5%;
-  left: 5%;
-}
-
-.popup {
-  z-index: 101;
-  background: transparent;
-}
-
-
-.popup_background {
-  z-index: 100;
-  border-color: #020202;
-  border-style: solid;
-  border-width: 2px 0px 0px 2px;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  border-radius: 8px;
-  background: #101010;
-  opacity: .98;
-}
-
-.popup div {
-  margin: 4px;
-}
-
-.popup div.head {
-  border-bottom: 1px solid;
-}
-
-.popup_background.error {
-  background: #800000;
-  border: #f00;
-}
-
-.clickable {
-    cursor: pointer;
-}
-
-.diagram_inline {
-    width: 320px;
-    height: 180px;
-}
-
-.diagram_preview {
-    width: 240px;
-    height: 2em;
-}
-
-#diagramTooltip {
-	z-index: 1000;
-	color: black;
-	border: 1px solid #fdd;
-	padding: 2px;
-	background-color: #fee;
-	opacity: 0.80;
+@font-face { font-family: Liberation; src:url(fonts/liberationsans-regular.ttf); }
+@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/liberationsans-bold.ttf); }
+
+body 
+{ 
+  color: white;
+  font-family: Liberation;
+  font-size: 5.5mm;
+  overflow: hidden;
+  margin:0;
+  background: #1d1d1d; /* url(images/body_bg.png) repeat-x; */
+}
+
+h1
+{
+  font-size: 2em;
+  padding-left: 15px;
+}
+
+h2
+{
+  font-size: 1.25em;
+  margin-left: 15px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+body hr
+{
+  clear:both;
+  color: #81664b;
+  background-color: #81664b;
+  height: 1px;
+  border:none;
+  padding:0px;
+  margin:0.1em;
+}
+
+#pages hr {
+ border: 0; height: 30px; margin: 0 .1em;
+ background: transparent url(images/hr_bg.png) 50% repeat-x;
+ clear: both;
+}
+
+
+body br
+{
+  clear:both;
+}
+
+div#top {
+    padding-top: 8px;
+    border-top: 3px solid #1d1d1d;
+    border-bottom: 1px solid #0a0a0a;
+    background-color: #121212;
+    padding-bottom: 2px;
+}
+
+.page h1 {
+    margin-top: 0;
+    padding-top: 1em;
+    background: #121212 url(images/head_bg.png) scroll repeat-x bottom;
+}
+
+.nav_path 
+{
+  color: #81664b;
+  margin-left: 15px;
+}
+.nav_path a
+{
+  color: white;
+  text-decoration:none;
+}
+
+.footer,
+.footer *
+{
+  color: #000000;
+  font-size: 0.9em;
+  vertical-align: middle;
+}
+
+.widget
+{
+  float:left;
+  width:48%;
+  margin: .2em;
+  padding: 0.3em;
+ /* border:yellow 1px solid; */
+  border-color: #020202;
+  border-style: solid;
+  border-width: 2px 0px 0px 2px;
+  -moz-border-radius: 8px;
+  -webkit-border-radius: 8px;
+  border-radius: 8px;
+  min-height: 2em;
+  background-color: #101010;
+}
+
+.widget .widget
+{
+  width:98%;
+}
+
+.text > div,
+.link > a {
+  float:left;
+  text-align:left;
+  padding-left: 1em;
+}
+
+.widget .label,
+.widget.info .actor,
+.text > div,
+.link > a {
+    line-height: 2em;
+}
+
+.widget .label
+{
+  float:left; 
+  width:49%;
+/*  color:red; */
+/*  padding-right:0.25em; */
+  text-align:left;
+  padding-left: 1em;
+/*  border:blue 1px solid; */
+}
+.widget .actor
+{
+  float:left;
+  margin-left:1em;
+  text-align:left;
+}
+.widget .actor div
+{
+  float:left;
+  white-space: pre-wrap;
+}
+
+
+.green.switchPressed div, .green.switchUnpressed div{
+    background: transparent url(images/dot_green.png) no-repeat center center;
+    color: white !important;
+}
+.red.switchPressed div, .red.switchUnpressed div{
+    background: transparent url(images/dot_red.png) no-repeat center center;
+    color: white !important;
+}
+
+
+.red 
+{
+  color:#f44;
+  font-weight:bold;
+}
+
+.green
+{
+  color:#4f4;
+}
+
+.blue
+{
+  color:#44f;
+}
+
+.purple
+{
+  color:#f4f;
+}
+
+.link a
+{
+  color: #81664b;
+  width: 49%;
+}
+
+.page
+{
+  float:left;
+  width: 900px;
+  overflow: auto;
+  position: relative;
+}
+
+.switchPressed, .switchUnpressed {
+  border-style:  solid;
+  -moz-border-radius: 12px;
+  -webkit-border-radius: 12px;
+  border-radius: 12px;
+  padding: 1px;
+  background: url(images/button_bg.png) #171717 repeat-x;
+}
+
+.switchUnpressed
+{
+  border-width:  1px 2px 2px 1px;
+  border-color: #282828 #010101 #010101 #282828;
+  margin-top: 0px;
+  background-color: #3A3A3A;
+  background-position: center +2px;
+}
+.switchUnpressed div, .switchPressed div
+{
+  padding: 5px;
+  width: 5em;
+  float: left;
+  background: transparent;
+  text-align: center;
+  cursor: pointer;
+}
+
+.switchPressed
+{
+  border-width:  2px 1px 1px 2px;
+  border-color: #010101 #282828 #282828 #010101;
+  margin-top: 1px;
+  background-position: center -2px;
+}
+
+.switchUnpressed div {
+    margin-left: -1px;
+}
+
+.switchPressed div {
+    margin-top: -1px;
+}
+
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-widget-content { border: 1px solid #dddddd; background: #000 ; color: #000; }
+.ui-widget-content a { color: #333333; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #000 ; font-weight: bold; color: #1c94c4; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+.dim .actor
+{
+  width: 3em;
+}
+.widget .ui-slider
+{
+  width: 30%;
+  float: left;
+  margin-left: 10px;
+  margin-left: 1em;
+  margin-top: 0.5em;
+  border-color:  #010101 #282828 #282828 #010101;
+  background: url(images/gradient.png) #a7a7a7 repeat-y;
+}
+
+.widget .ui-slider-handle
+{
+  border-style:  solid;
+  -moz-border-radius: 12px;
+  -webkit-border-radius: 12px;
+  border-radius: 12px;
+  padding: 1px;
+  background: url(images/button_bg.png) #171717 repeat-x;
+  border-width:  1px 2px 2px 1px;
+  border-color: #282828 #010101 #010101 #282828;
+}
+/* Clearfix */
+.clearfix:after {
+    content: ".";
+    display: block;
+    clear: both;
+    visibility: hidden;
+    line-height: 0;
+    height: 0;
+}
+
+.clearfix {
+    display: inline-block;
+}
+
+html[xmlns] .clearfix {
+    display: block;
+}
+
+*:first-child+html .clearfix {
+    min-height: 0;
+}
+
+* html .clearfix {
+    height: 1%;
+}
+
+* html>body .clearfix {
+    display: inline-block;
+    width: 100%;
+}
+
+* html .clearfix {
+    /* Hides from IE-mac \*/
+    height: 1%;
+    /* End hide from IE-mac */
+}
+
+.loading {
+    display: block !important;
+}
+
+div#loading {
+    display: none !important;
+}
+
+
+.popup,
+.popup_background {
+  position: absolute;
+  width: 90%;
+  height: 90%;
+  top: 5%;
+  left: 5%;
+}
+
+.popup {
+  z-index: 101;
+  background: transparent;
+}
+
+
+.popup_background {
+  z-index: 100;
+  border-color: #020202;
+  border-style: solid;
+  border-width: 2px 0px 0px 2px;
+  -moz-border-radius: 8px;
+  -webkit-border-radius: 8px;
+  border-radius: 8px;
+  background: #101010;
+  opacity: .98;
+}
+
+.popup div {
+  margin: 4px;
+}
+
+.popup div.head {
+  border-bottom: 1px solid;
+}
+
+.popup_background.error {
+  background: #800000;
+  border: #f00;
+}
+
+.clickable {
+    cursor: pointer;
+}
+
+.diagram_inline {
+    width: 320px;
+    height: 180px;
+}
+
+.diagram_preview {
+    width: 240px;
+    height: 2em;
+}
+
+#diagramTooltip {
+	z-index: 1000;
+	color: black;
+	border: 1px solid #fdd;
+	padding: 2px;
+	background-color: #fee;
+	opacity: 0.80;
 }
\ No newline at end of file

Modified: CometVisu/trunk/visu/designs/discreet/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/mobile.css	2011-09-11 20:49:21 UTC (rev 417)
+++ CometVisu/trunk/visu/designs/discreet/mobile.css	2011-09-17 07:37:37 UTC (rev 418)
@@ -1,12 +1,12 @@
-.widget
-{
-  width:98%;
-}
-
-#bottom {
-    display: none;
-}
-
-.page {
-    overflow: visible;
-}
+.widget
+{
+  width:98%;
+}
+
+#bottom {
+    display: none;
+}
+
+.page {
+    overflow: visible;
+}

Modified: CometVisu/trunk/visu/designs/discreet_sand/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/basic.css	2011-09-11 20:49:21 UTC (rev 417)
+++ CometVisu/trunk/visu/designs/discreet_sand/basic.css	2011-09-17 07:37:37 UTC (rev 418)
@@ -1,377 +1,377 @@
-@font-face { font-family: Liberation; src:url(fonts/liberationsans.ttf); }
-@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/liberationsans-bold.ttf); }
-
-body 
-{ 
-  color: #453420; /*#2F2A20;*/
-  font-family: Arial, Liberation;
-  font-size: 5.5mm;
-  overflow: hidden;
-  margin:0;
-  background: #CFC8B5; /* url(images/body_bg.png) repeat-x; */
-}
-
-h1
-{
-  font-size: 2em;
-  padding-left: 15px;
-}
-
-body hr
-{
-  clear:both;
-  color: #7F735F;
-  background-color: #7F735F;
-  height: 1px;
-  border:none;
-  padding:0px;
-  margin:0.1em;
-}
-
-#pages hr {
- border: 0; height: 30px; margin: 0 .5%;
- background: transparent url(images/hr_bg.png) 50% repeat-x;
- clear: both;
-}
-
-
-body br
-{
-  clear:both;
-}
-
-div#top {
-    padding-top: 8px;
-    border-top: 3px solid #BAAF98;
-    background: #165D7E url(images/nav_bg.png) bottom repeat-x;
-    padding-bottom: 8px;
-}
-
-.page h1 {
-    margin-top: 0;
-    padding-top: .1em;
-    background: #CFC8B5;
-    color: #2F2A20;
-    /*background: #7F735F url(images/head_bg.png) scroll repeat-x bottom;*/
-}
-
-.nav_path 
-{
-  color: #EFEBE0; /*#81664b;*/
-  margin-left: 15px;
-}
-.nav_path a
-{
-  color: #EFEBE0; /*#3F3327;*/
-  text-decoration:none;
-}
-
-.footer,
-.footer *
-{
-  color: #000000;
-  font-size: 0.9em;
-  vertical-align: middle;
-}
-
-.widget
-{
-  float:left;
-  width:48%;
-  margin: .2em;
-  padding: 0.3em;
- /* border:yellow 1px solid; */
-  border-color: #7F735F;
-  border-style: solid;
-  border-width: 2px 0px 0px 2px;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  border-radius: 8px;
-  min-height: 2em;
-  background-color: #BAAF98;
-}
-
-.text > div,
-.link > a {
-  float:left;
-  text-align:left;
-  padding-left: 1em;
-}
-
-.widget .label,
-.widget.info .actor,
-.text > div,
-.link > a {
-    line-height: 2em;
-}
-
-.widget .label
-{
-  float:left; 
-  width:49%;
-/*  color:red; */
-/*  padding-right:0.25em; */
-  text-align:left;
-  padding-left: 1em;
-/*  border:blue 1px solid; */
-}
-.widget .actor
-{
-  float:left;
-  margin-left:1em;
-  text-align:left;
-}
-.widget .actor div
-{
-  float:left;
-  white-space: pre-wrap;
-}
-
-
-.green.switchPressed div, .green.switchUnpressed div{
-    background: transparent url(images/dot_green.png) no-repeat center center;
-    color: #3F2F1F !important;
-}
-.red.switchPressed div, .red.switchUnpressed div{
-    background: transparent url(images/dot_red.png) no-repeat center center;
-    color: #3F2F1F !important;
-}
-
-
-.red 
-{
-  color:#f44;
-  font-weight:bold;
-}
-
-.green
-{
-  color:#4f4;
-}
-
-.blue
-{
-  color:#44f;
-}
-
-.purple
-{
-  color:#f4f;
-}
-
-.link a
-{
-  color: #165d7e; /*#3F2F1F;*/
-  width: 49%;
-}
-
-.page
-{
-  float:left;
-  width: 900px;
-  overflow: auto;
-  position: relative;
-}
-
-.switchPressed, .switchUnpressed {
-  border-style:  solid;
-  -moz-border-radius: 12px;
-  -webkit-border-radius: 12px;
-  border-radius: 12px;
-  padding: 1px;
-  background: url(images/button_bg.png) #A79367 repeat-x;
-}
-
-.switchUnpressed
-{
-  border-width:  1px 2px 2px 1px;
-  border-color: #6C6251 #4F483B #4F483B #6C6251;
-  margin-top: 0px;
-  background-color: #EFE6D1;
-  background-position: center +2px;
-}
-.switchUnpressed div, .switchPressed div
-{
-  padding: 5px;
-  width: 5em;
-  float: left;
-  background: transparent;
-  text-align: center;
-  cursor: pointer;
-}
-
-.switchPressed
-{
-  border-width:  2px 1px 1px 2px;
-  border-color: #4F483B #6C6251 #6C6251 #4F483B;
-  margin-top: 1px;
-  background-position: center -2px;
-}
-
-.switchUnpressed div {
-    margin-left: -1px;
-}
-
-.switchPressed div {
-    margin-top: -1px;
-}
-
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }
-.ui-widget-content { border: 1px solid #dddddd; background: #000 ; color: #000; }
-.ui-widget-content a { color: #333333; }
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #000 ; font-weight: bold; color: #1c94c4; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
-
-.dim .actor
-{
-  width: 3em;
-}
-.widget .ui-slider
-{
-  width: 30%;
-  float: left;
-  margin-left: 10px;
-  margin-left: 1em;
-  margin-top: 0.5em;
-  border-color: #4F483B #6C6251 #6C6251 #4F483B;
-  background: url(images/gradient.png) #F8EFC6 repeat-y;
-}
-
-.widget .ui-slider-handle
-{
-  border-style:  solid;
-  -moz-border-radius: 12px;
-  -webkit-border-radius: 12px;
-  border-radius: 12px;
-  padding: 1px;
-  background: url(images/button_bg.png) #A79367 repeat-x;
-  border-width:  1px 2px 2px 1px;
-  border-color: #6C6251 #4F483B #4F483B #6C6251;
-}
-/* Clearfix */
-.clearfix:after {
-    content: ".";
-    display: block;
-    clear: both;
-    visibility: hidden;
-    line-height: 0;
-    height: 0;
-}
-
-.clearfix {
-    display: inline-block;
-}
-
-html[xmlns] .clearfix {
-    display: block;
-}
-
-*:first-child+html .clearfix {
-    min-height: 0;
-}
-
-* html .clearfix {
-    height: 1%;
-}
-
-* html>body .clearfix {
-    display: inline-block;
-    width: 100%;
-}
-
-* html .clearfix {
-    /* Hides from IE-mac \*/
-    height: 1%;
-    /* End hide from IE-mac */
-}
-
-.loading {
-    display: block !important;
-}
-
-div#loading {
-    display: none !important;
-}
-
-
-.popup,
-.popup_background {
-  position: absolute;
-  width: 90%;
-  height: 90%;
-  top: 5%;
-  left: 5%;
-}
-
-.popup {
-  z-index: 101;
-  background: transparent;
-}
-
-
-.popup_background {
-  z-index: 100;
-  border-color: #7F735F;
-  border-style: solid;
-  border-width: 2px 0px 0px 2px;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  border-radius: 8px;
-  background: #BAAF98;
-  opacity: .98;
-}
-
-.popup div {
-  margin: 4px;
-}
-
-.popup div.head {
-  border-bottom: 1px solid;
-}
-
-.popup_background.error {
-  background: #800000;
-  border: #f00;
-}
-
-.clickable {
-    cursor: pointer;
-}
-
-.diagram_inline {
-    width: 320px;
-    height: 180px;
-}
-
-.diagram_preview {
-    width: 320px;
-    height: 2em;
-}
-
-.tickLabel {
-    color: #453420;
-}
-
-#diagramTooltip {
-	z-index: 1000;
-	color: black;
-	border: 1px solid #fdd;
-	padding: 2px;
-	background-color: #fee;
-	opacity: 0.80;
+@font-face { font-family: Liberation; src:url(fonts/liberationsans.ttf); }
+@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/liberationsans-bold.ttf); }
+
+body 
+{ 
+  color: #453420; /*#2F2A20;*/
+  font-family: Arial, Liberation;
+  font-size: 5.5mm;
+  overflow: hidden;
+  margin:0;
+  background: #CFC8B5; /* url(images/body_bg.png) repeat-x; */
+}
+
+h1
+{
+  font-size: 2em;
+  padding-left: 15px;
+}
+
+body hr
+{
+  clear:both;
+  color: #7F735F;
+  background-color: #7F735F;
+  height: 1px;
+  border:none;
+  padding:0px;
+  margin:0.1em;
+}
+
+#pages hr {
+ border: 0; height: 30px; margin: 0 .5%;
+ background: transparent url(images/hr_bg.png) 50% repeat-x;
+ clear: both;
+}
+
+
+body br
+{
+  clear:both;
+}
+
+div#top {
+    padding-top: 8px;
+    border-top: 3px solid #BAAF98;
+    background: #165D7E url(images/nav_bg.png) bottom repeat-x;
+    padding-bottom: 8px;
+}
+
+.page h1 {
+    margin-top: 0;
+    padding-top: .1em;
+    background: #CFC8B5;
+    color: #2F2A20;
+    /*background: #7F735F url(images/head_bg.png) scroll repeat-x bottom;*/
+}
+
+.nav_path 
+{
+  color: #EFEBE0; /*#81664b;*/
+  margin-left: 15px;
+}
+.nav_path a
+{
+  color: #EFEBE0; /*#3F3327;*/
+  text-decoration:none;
+}
+
+.footer,
+.footer *
+{
+  color: #000000;
+  font-size: 0.9em;
+  vertical-align: middle;
+}
+
+.widget
+{
+  float:left;
+  width:48%;
+  margin: .2em;
+  padding: 0.3em;
+ /* border:yellow 1px solid; */
+  border-color: #7F735F;
+  border-style: solid;
+  border-width: 2px 0px 0px 2px;
+  -moz-border-radius: 8px;
+  -webkit-border-radius: 8px;
+  border-radius: 8px;
+  min-height: 2em;
+  background-color: #BAAF98;
+}
+
+.text > div,
+.link > a {
+  float:left;
+  text-align:left;
+  padding-left: 1em;
+}
+
+.widget .label,
+.widget.info .actor,
+.text > div,
+.link > a {
+    line-height: 2em;
+}
+
+.widget .label
+{
+  float:left; 
+  width:49%;
+/*  color:red; */
+/*  padding-right:0.25em; */
+  text-align:left;
+  padding-left: 1em;
+/*  border:blue 1px solid; */
+}
+.widget .actor
+{
+  float:left;
+  margin-left:1em;
+  text-align:left;
+}
+.widget .actor div
+{
+  float:left;
+  white-space: pre-wrap;
+}
+
+
+.green.switchPressed div, .green.switchUnpressed div{
+    background: transparent url(images/dot_green.png) no-repeat center center;
+    color: #3F2F1F !important;
+}
+.red.switchPressed div, .red.switchUnpressed div{
+    background: transparent url(images/dot_red.png) no-repeat center center;
+    color: #3F2F1F !important;
+}
+
+
+.red 
+{
+  color:#f44;
+  font-weight:bold;
+}
+
+.green
+{
+  color:#4f4;
+}
+
+.blue
+{
+  color:#44f;
+}
+
+.purple
+{
+  color:#f4f;
+}
+
+.link a
+{
+  color: #165d7e; /*#3F2F1F;*/
+  width: 49%;
+}
+
+.page
+{
+  float:left;
+  width: 900px;
+  overflow: auto;
+  position: relative;
+}
+
+.switchPressed, .switchUnpressed {
+  border-style:  solid;
+  -moz-border-radius: 12px;
+  -webkit-border-radius: 12px;
+  border-radius: 12px;
+  padding: 1px;
+  background: url(images/button_bg.png) #A79367 repeat-x;
+}
+
+.switchUnpressed
+{
+  border-width:  1px 2px 2px 1px;
+  border-color: #6C6251 #4F483B #4F483B #6C6251;
+  margin-top: 0px;
+  background-color: #EFE6D1;
+  background-position: center +2px;
+}
+.switchUnpressed div, .switchPressed div
+{
+  padding: 5px;
+  width: 5em;
+  float: left;
+  background: transparent;
+  text-align: center;
+  cursor: pointer;
+}
+
+.switchPressed
+{
+  border-width:  2px 1px 1px 2px;
+  border-color: #4F483B #6C6251 #6C6251 #4F483B;
+  margin-top: 1px;
+  background-position: center -2px;
+}
+
+.switchUnpressed div {
+    margin-left: -1px;
+}
+
+.switchPressed div {
+    margin-top: -1px;
+}
+
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-widget-content { border: 1px solid #dddddd; background: #000 ; color: #000; }
+.ui-widget-content a { color: #333333; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #000 ; font-weight: bold; color: #1c94c4; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+.dim .actor
+{
+  width: 3em;
+}
+.widget .ui-slider
+{
+  width: 30%;
+  float: left;
+  margin-left: 10px;
+  margin-left: 1em;
+  margin-top: 0.5em;
+  border-color: #4F483B #6C6251 #6C6251 #4F483B;
+  background: url(images/gradient.png) #F8EFC6 repeat-y;
+}
+
+.widget .ui-slider-handle
+{
+  border-style:  solid;
+  -moz-border-radius: 12px;
+  -webkit-border-radius: 12px;
+  border-radius: 12px;
+  padding: 1px;
+  background: url(images/button_bg.png) #A79367 repeat-x;
+  border-width:  1px 2px 2px 1px;
+  border-color: #6C6251 #4F483B #4F483B #6C6251;
+}
+/* Clearfix */
+.clearfix:after {
+    content: ".";
+    display: block;
+    clear: both;
+    visibility: hidden;
+    line-height: 0;
+    height: 0;
+}
+
+.clearfix {
+    display: inline-block;
+}
+
+html[xmlns] .clearfix {
+    display: block;
+}
+
+*:first-child+html .clearfix {
+    min-height: 0;
+}
+
+* html .clearfix {
+    height: 1%;
+}
+
+* html>body .clearfix {
+    display: inline-block;
+    width: 100%;
+}
+
+* html .clearfix {
+    /* Hides from IE-mac \*/
+    height: 1%;
+    /* End hide from IE-mac */
+}
+
+.loading {
+    display: block !important;
+}
+
+div#loading {
+    display: none !important;
+}
+
+
+.popup,
+.popup_background {
+  position: absolute;
+  width: 90%;
+  height: 90%;
+  top: 5%;
+  left: 5%;
+}
+
+.popup {
+  z-index: 101;
+  background: transparent;
+}
+
+
+.popup_background {
+  z-index: 100;
+  border-color: #7F735F;
+  border-style: solid;
+  border-width: 2px 0px 0px 2px;
+  -moz-border-radius: 8px;
+  -webkit-border-radius: 8px;
+  border-radius: 8px;
+  background: #BAAF98;
+  opacity: .98;
+}
+
+.popup div {
+  margin: 4px;
+}
+
+.popup div.head {
+  border-bottom: 1px solid;
+}
+
+.popup_background.error {
+  background: #800000;
+  border: #f00;
+}
+
+.clickable {
+    cursor: pointer;
+}
+
+.diagram_inline {
+    width: 320px;
+    height: 180px;
+}
+
+.diagram_preview {
+    width: 320px;
+    height: 2em;
+}
+
+.tickLabel {
+    color: #453420;
+}
+
+#diagramTooltip {
+	z-index: 1000;
+	color: black;
+	border: 1px solid #fdd;
+	padding: 2px;
+	background-color: #fee;
+	opacity: 0.80;
 }
\ No newline at end of file

Modified: CometVisu/trunk/visu/designs/discreet_sand/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/mobile.css	2011-09-11 20:49:21 UTC (rev 417)
+++ CometVisu/trunk/visu/designs/discreet_sand/mobile.css	2011-09-17 07:37:37 UTC (rev 418)
@@ -1,12 +1,12 @@
-.widget
-{
-  width:98%;
-}
-
-#bottom {
-    display: none;
-}
-
-.page {
-    overflow: visible;
-}
+.widget
+{
+  width:98%;
+}
+
+#bottom {
+    display: none;
+}
+
+.page {
+    overflow: visible;
+}

Modified: CometVisu/trunk/visu/designs/discreet_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_slim/basic.css	2011-09-11 20:49:21 UTC (rev 417)
+++ CometVisu/trunk/visu/designs/discreet_slim/basic.css	2011-09-17 07:37:37 UTC (rev 418)
@@ -1,366 +1,366 @@
-@font-face { font-family: Liberation; src:url(fonts/liberationsans-regular.ttf); }
-@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/liberationsans-bold.ttf); }
-
-body 
-{ 
-  color: white;
-  font-family: Liberation;
-  font-size: 5mm;
-  overflow: hidden;
-  margin:0;
-  background: #1d1d1d; /* url(images/body_bg.png) repeat-x; */
-}
-
-h1
-{
-  font-size: 2em;
-  padding-left: 15px;
-}
-
-body hr
-{
-  clear:both;
-  color: #81664b;
-  background-color: #81664b;
-  height: 1px;
-  border:none;
-  padding:0px;
-  margin:0.1em;
-}
-
-#pages hr {
- border: 0; height: 4px; margin: 0px 1px 4px 1px;
- background: transparent;
- border-bottom: 1px solid #121212;
- clear: both;
-}
-
-
-body br
-{
-  clear:both;
-}
-
-div#top {
-    padding-top: 8px;
-    border-top: 3px solid #1d1d1d;
-    border-bottom: 1px solid #0a0a0a;
-    background-color: #121212;
-    padding-bottom: 2px;
-}
-
-.page h1 {
-    margin-top: 0;
-    padding-top: 1em;
-    background: #121212 url(images/head_bg.png) scroll repeat-x botto...
 
[truncated message content]

[Openautomation-svn] SF.net SVN: openautomation:[417] tools/rsslog/rsslog.php

[<ma...@us...>]

Revision: 417
          http://openautomation.svn.sourceforge.net/openautomation/?rev=417&view=rev
Author:   mayerch
Date:     2011-09-11 20:49:21 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
Initial version of rsslog

Added Paths:
-----------
    tools/rsslog/rsslog.php

Added: tools/rsslog/rsslog.php
===================================================================
--- tools/rsslog/rsslog.php	                        (rev 0)
+++ tools/rsslog/rsslog.php	2011-09-11 20:49:21 UTC (rev 417)
@@ -0,0 +1,90 @@
+<?php
+/*****************************************************************************/
+/* rsslog.php - A simple log message reciever and sender via RSS             */
+/*                                                                           */
+/* (c) 2011 by Christian Mayer                                               */
+/* Licenced under the GPLv3                                                  */
+/*****************************************************************************/
+
+// There are diffentent modes of operation
+// 1. Creating a new log line:
+//    URL parameter "c":   the content of the log
+//    URL parameter "t[]": a tag for later filtering. Multiple might be given
+// 2. Recieve the log as RSS:
+//    URL parameter "f":   The (optional) filter, only log lines with a tag
+//                         that fit this string are sent
+if( isset($_GET['c']) )
+{ 
+  // store a new log
+  $store = true;
+  $log_content = $_GET['c'] ? $_GET['c'] : '<no content>';
+  $log_tags    = $_GET['t'] ? $_GET['t'] : array();
+} else {
+  // send logs
+  $store = false;
+  $log_filter  = $_GET['f'] ? $_GET['f'] : '';
+}
+
+// create database connection
+$db = sqlite_open('rsslog.db', 0666, $error);
+if (!$db) die ($error);
+
+// create table if it doesn't exists
+$q = "SELECT name FROM sqlite_master WHERE type='table' AND name='Logs';";
+$result = sqlite_query( $db, $q, SQLITE_NUM);
+if (!$result) die("Cannot execute query.");
+if( !sqlite_has_more($result) )
+{
+  // no table found - create it
+  $q = "CREATE TABLE Logs(" .
+       "  id INTEGER PRIMARY KEY," . 
+       "  content TEXT NOT NULL," .
+       "  t TIMESTAMP" .
+       ");";
+  $ok = sqlite_exec($db, $q, $error);
+  
+  if (!$ok)
+    die("Cannot execute query. $error");
+}
+
+if( $store )
+{
+  // store a new log line
+  $q = "INSERT INTO Logs(content, t) VALUES( " .
+       "  '" . sqlite_escape_string( $log_content ) . "'," .
+       "  datetime('now','localtime')" .
+       ")";
+  
+  $ok = sqlite_exec($db, $q, $error);
+  
+  if (!$ok)
+    die("Cannot execute query. $error");
+} else {
+  // retrieve data
+  $q = "SELECT * FROM Logs";
+  $result = sqlite_query( $db, $q, SQLITE_ASSOC);
+// phpinfo(); 
+  echo '<?xml version="1.0"?>';
+  ?>
+<rss version="2.0">
+  <channel>
+    <title>RSS supplied logs</title>
+    <link><?php echo 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; ?></link>
+  <?php
+  // echo '<description>foo</description>';
+  while( sqlite_has_more($result) )
+  {
+    $row = sqlite_fetch_array($result, SQLITE_ASSOC); 
+    echo '<item>';
+    echo '<title>' . $row['content'] . '</title>';
+    echo '<pubDate>' . $row['t'] . '</pubDate>';
+    echo '</item>';
+  }
+  ?>
+  </channel>
+</rss>
+  <?php
+}
+
+sqlite_close($db);
+?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[416] tools/rsslog/

[<ma...@us...>]

Revision: 416
          http://openautomation.svn.sourceforge.net/openautomation/?rev=416&view=rev
Author:   mayerch
Date:     2011-09-11 20:49:00 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
Initial version of rsslog

Added Paths:
-----------
    tools/rsslog/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[415] wiregate/plugin/generic/emx_uhr.pl

[<e....@us...>]

Revision: 415
          http://openautomation.svn.sourceforge.net/openautomation/?rev=415&view=rev
Author:   e.max
Date:     2011-09-10 15:15:22 +0000 (Sat, 10 Sep 2011)
Log Message:
-----------
Zykluszeit wurde nicht korrekt verarbeitet, Zyklus-Anpassung nun exakt in Sekunden, dadurch keine 1-Sekunden leer-Zyklen mehr, weniger Systemlast. Alte plugin_info eintr?\195?\164ge werden bei neuer Versionsnummer nun bereinigt.

Modified Paths:
--------------
    wiregate/plugin/generic/emx_uhr.pl

Modified: wiregate/plugin/generic/emx_uhr.pl
===================================================================
--- wiregate/plugin/generic/emx_uhr.pl	2011-09-10 08:29:05 UTC (rev 414)
+++ wiregate/plugin/generic/emx_uhr.pl	2011-09-10 15:15:22 UTC (rev 415)
@@ -1,6 +1,10 @@
 # Plugin zum Zeitabhaengigen Schalten von GA's (Schaltuhr)
 # License: GPL (v2)
 # version von emax
+
+# Plugin zum Zeitabhaengigen Schalten von GA's (Schaltuhr)
+# License: GPL (v2)
+# version von emax
 #
 # $Id$
 #
@@ -10,111 +14,125 @@
 #  ##  who  yyyymmdd   bug#  description
 #  --  ---  --------  -----  ----------------------------------------
 #   .  ...  ........  .....  vorlage 
+#   3  edh  20110910  .....  Zykluszeit wurde nicht korrekt verarbeitet,
+#                            Zyklus-Anpassung nun exakt in Sekunden,
+#                            -  dadurch keine 1-Sekunden leer-Zyklen mehr,
+#                            -  weniger Systemlast.
+#                            Alte plugin_info einträge werden bei neuer 
+#                             versionsnummer nun bereinigt.
 #   2  edh  20110910  -----  Bug im Wertevergleich in 'matches()' gefixt
 #   1  edh  20110807  -----  wg. utf-8 Zirkus Umlaute in ae/ue/oe geaendert
 #   0  edh  20110708  -----  erste Version
- 
 
-#---------------
-# Einstellungen:
-#---------------
+#-----------------------------------------------------------------------------
+# Einstellungen
+#-----------------------------------------------------------------------------
 
+
 my @Zeiten = 
-    ( 
-      { Name=>'Test',           Aktiv=>'1', Std=>undef, Min=>undef, MTag=>undef, Mon=>undef, WTag=>undef,   Wert=>'1', DPT=>'1', GA=>'1/1/30', Log=>'1' }, 
-      { Name=>'Bewaesserung',   Aktiv=>'1', Std=>'7',   Min=> '0',  MTag=>'3',   Mon=>'4-9', WTag=>'1-5',   Wert=>'1', DPT=>'1', GA=>'1/1/30' },
-      { Name=>'AussenlichtEin', Aktiv=>'1', Std=>'19',  Min=>'30',  MTag=>'4',   Mon=>undef, WTag=>'1,3,5', Wert=>'1', DPT=>'1', GA=>'1/2/40' },
-      { Name=>'AussenlichtAus', Aktiv=>'1', Std=>'7',   Min=> '0',  MTag=>undef, Mon=>undef, WTag=>'2,4,6', Wert=>'0', DPT=>'1', GA=>'1/2/40' }
+    (       
+      # Beispiele
+       { Name=>'Test',           Aktiv=>'0', Std=>undef, Min=>undef, MTag=>undef, Mon=>undef, WTag=>undef,   Wert=>'1', DPT=>'1', GA=>'1/1/30', Log=>'1' }, 
+       { Name=>'Bewaesserung',   Aktiv=>'0', Std=>'7',   Min=> '0',  MTag=>'3',   Mon=>'4-9', WTag=>'1-5',   Wert=>'1', DPT=>'1', GA=>'1/1/30' },
+       { Name=>'AussenlichtEin', Aktiv=>'0', Std=>'19',  Min=>'30',  MTag=>'4',   Mon=>undef, WTag=>'1,3,5', Wert=>'1', DPT=>'1', GA=>'1/2/40' }, 
+       { Name=>'AussenlichtAus', Aktiv=>'0', Std=>'7',   Min=> '0',  MTag=>undef, Mon=>undef, WTag=>'2,4,6', Wert=>'0', DPT=>'1', GA=>'1/2/40' }
     );
 
-#-------------------  
-# ENDE Einstellungen  
-#-------------------  
+#-----------------------------------------------------------------------------
+# ENDE Einstellungen
+#-----------------------------------------------------------------------------
 
 use POSIX;
 
-#--------------------------------------------------------------------
+#-----------------------------------------------------------------------------
 # Eigenen Aufruf-Zyklus setzen
 # Das script verarbeitet keine Sekunden, weshalb die kleinste 
 # Granulaitaet ohne zusaetzlioche Statusverarbeitung eine Minute ist. 
-#--------------------------------------------------------------------
+#-----------------------------------------------------------------------------
 my $cycleTime = 60;
 
-#--------------------------------------------------------------------
-# definiert die Sekunde, ab der neu synchronisiert wird
-#--------------------------------------------------------------------
-my $slotEnd = 10; 
+#-----------------------------------------------------------------------------
+# definiert die Sekunde, ab der neu synchronisiert wird   
+# ACHTUNG: Sollte nicht kleiner als 1 Sekunde sein.
+#-----------------------------------------------------------------------------
+my $slotEnd = 1; 
 
-#--------------------------------------------------------------------
-# Die Versionsnummer ist Teil des plugin_info hashes und dient
-# dazu, dass das script definierte Anfangskonditionen findet 
-# auch ohne alles neu starten zu muessen. Die Nummer 
-# einfach nach einer AEnderung des scripts um eins erhoehen.
-#--------------------------------------------------------------------
-my $version = 1;
+#-----------------------------------------------------------------------------
+# Die Versionsnummer is Teil des plugin_info hashes und dient
+# dazu, dass das script definierte anfangskonditionen findet 
+# auch ohne den wiregated neu starten zu muessen. Die Nummer 
+# einfach nach einer Aenderung des scripts um eins erhoehen.
+#-----------------------------------------------------------------------------
+my $version = 8;
 
-#--------------------------------------------------------------------
-# Auswertung von Bereichs und Listenvergleichen 
+#-----------------------------------------------------------------------------
+# Auswertung von Bereichs und Listenvergleichen
 # Prueft, ob ein Wert zu einer Liste oder in einen Bereich passt
-#--------------------------------------------------------------------
+#-----------------------------------------------------------------------------
 sub matches
 {
-    my ($value, $def) = @_;        # Zu pruefender Wert, Bereichsdefinition
+    my ($value, $def) = @_;  # Zu pruefender Wert, Bereichsdefinition
     (!$def) and return 1;
+
     foreach (split(/,/, $def))
-    {        
-        s/\s+//g;                  # Blanks entfernen
-        s/^0+//g;                  # fuehrende Nullen entfernen
-        (/^$value$/) and return 1; # Alpha-Vergleich (vermeidet Laufzeitfehler)
+    {
+        s/\s+//g;
+        s/^0+//g; # fuehrende Nullen entfernen
+	# Vergleich auf Alpha-Basis (vermeidet Laufzeit-Fehler)
+        (/^$value$/) and return 1;
         (/^([\d]+)-(\d+)/) and return ($value >= $1 && $value <= $2);
     }
     return 0;
 }
 
-#====================================================================
-# main()
-#====================================================================
-
-# kontrollierte Startkonditionen setzen
-if (!defined $plugin_info{$plugname.$version.'firstRun'}) 
+#-----------------------------------------------------------------------------
+# Zykluszeit setzen
+#-----------------------------------------------------------------------------
+sub setCycle
 {
-    $plugin_info{$plugname.$version.'firstRun'} = 1;
-    plugin_log($plugname, "Started plugin version $version, first have to sync with time slot.");
-    # die Anpassungs der Zyklyzweit erfolgt dynamisch, s.u.
-    $plugin_info{$plugname.'_cycle'} = 1;
+    my ($seconds,$uSec) = gettimeofday();
+    my $curSec = $seconds%60;
+    if ( $curSec >= $slotEnd)
+    {
+	$plugin_info{$plugname.'_cycle'} = $cycleTime - $curSec - $uSec/1000000;
+	plugin_log($plugname, "cycle time set to $plugin_info{$plugname.'_cycle'} second");
+    }
+    else
+    {
+	$plugin_info{$plugname.'_cycle'} = $cycleTime;
+    }
 }
 
+
+#=============================================================================
+# main()
+#=============================================================================
+
 my ($curSec,$curMin,$curStu,$curMTag,$curMon,$curJahr,$curWTag,$curJTag,$isdst) = localtime(time);
 $curJahr += 1900;
 
-#--------------------------------------------------------------------  
-# Es ist sinnvoll, dafuer zu sorgen, dass die Startzeit dieses Plugins 
-# mit der Zeit nicht "abdriftet", da sonst ueber lange Laufzeiten ein 
-# Minutenueberlauf entstehen koennte, und so Ereignisse verloren gingen.
-# Aus diesem Grund prueft das script, ob es innerhalb der ersten 10 Sekunden 
-# einer Minute laeuft, Wenn das nicht der Fall ist, wird so lange eine 
-# verkuerzte Zykluszeit verwendet, bis die Ausfuehrung wieder im vorgesehenen 
-# Zeitraum ablaeuft.
-#
-# Bei der Erstausfuehrung des Plugins nimmt dieses erst nach Erreichen 
-# des vorgesehenen Zeitfensters die eigentliche Arbeit auf, weil der 
-# Abstand zwischen zwei Triggern sonst zu klein werden koennte.
-#--------------------------------------------------------------------
-
-if ($curSec >= $slotEnd)
+# kontrollierte Startkonditionen setzen
+if (!defined $plugin_info{"$plugname.$version.firstRun"})
 {
-    if ($plugin_info{$plugname.'_cycle'} != 1)
+    # obsolete Versionen von $plugin_info bereinigen
+    foreach (keys %plugin_info)
     {
-        plugin_log($plugname, "lost time-slot due to time drift, reducing cycle time to 1 second");
-            $plugin_info{$plugname.'_cycle'} = 1;
+	if (/^$plugname\./)
+	{
+	    delete $plugin_info{$_};
+	    plugin_log($plugname, "deleted plugin_info[$_]");
+	}
     }
-    
-    # bei Erstausfuehrung auf Zeitfenster warten
-    ($plugin_info{$plugname.$version.'firstRun'} == 1) and return;
+    plugin_log($plugname, "Started plugin version $version, will execute with first time-slot.");
+    $plugin_info{"$plugname.$version.firstRun"} = 1;
+    &setCycle();
 }
 
+# beim ersten mal nur ausfuehren, wenn inmnerhalb des slots
+($curSec >= $slotEnd && $plugin_info{"$plugname.$version.firstRun"} == 1) and return;
+
 # pruefen, ob in dieser Minute bereits ausgefuehrt
-(defined $plugin_info{$plugname.$version.'lastMinute'} && $plugin_info{$plugname.$version.'lastMinute'} == $curMin) and return;
+(defined $plugin_info{"$plugname.$version.lastMinute"} && $plugin_info{"$plugname.$version.lastMinute"} == $curMin) and return;
 
 foreach my $Zeit (@Zeiten) 
 {
@@ -131,5 +149,10 @@
     knx_write($Zeit->{GA},$Zeit->{Wert}, $Zeit->{DPT});   
 }
 
-$plugin_info{$plugname.$version.'lastMinute'} = $curMin;
-$plugin_info{$plugname.$version.'firstRun'} = 0;
+$plugin_info{"$plugname.$version.lastMinute"} = $curMin;
+
+# ggf. Zykluszeit korrigieren
+&setCycle();
+$plugin_info{"$plugname.$version.firstRun"} = 0;
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[414] wiregate/plugin/generic/emx_uhr.pl

[<e....@us...>]

Revision: 414
          http://openautomation.svn.sourceforge.net/openautomation/?rev=414&view=rev
Author:   e.max
Date:     2011-09-10 08:29:05 +0000 (Sat, 10 Sep 2011)
Log Message:
-----------
Bug im Vergleich in 'sub matches' gefixt: Da dieser Vergleich zur Vermeidung von Laufzeitfehlern auf Alphabasis gemacht wird, wurden numerische Werte mit f?\195?\188hrenden Nullen nicht korrekt verglichen, wenn der Vergleichswert auf der anderen Seite keine fuehrenden Nullen hatte.

Modified Paths:
--------------
    wiregate/plugin/generic/emx_uhr.pl

Modified: wiregate/plugin/generic/emx_uhr.pl
===================================================================
--- wiregate/plugin/generic/emx_uhr.pl	2011-09-07 18:11:25 UTC (rev 413)
+++ wiregate/plugin/generic/emx_uhr.pl	2011-09-10 08:29:05 UTC (rev 414)
@@ -10,6 +10,7 @@
 #  ##  who  yyyymmdd   bug#  description
 #  --  ---  --------  -----  ----------------------------------------
 #   .  ...  ........  .....  vorlage 
+#   2  edh  20110910  -----  Bug im Wertevergleich in 'matches()' gefixt
 #   1  edh  20110807  -----  wg. utf-8 Zirkus Umlaute in ae/ue/oe geaendert
 #   0  edh  20110708  -----  erste Version
  
@@ -58,12 +59,13 @@
 #--------------------------------------------------------------------
 sub matches
 {
-    my ($value, $def) = @_;  # Zu pruefender Wert, Bereichsdefinition
+    my ($value, $def) = @_;        # Zu pruefender Wert, Bereichsdefinition
     (!$def) and return 1;
     foreach (split(/,/, $def))
     {        
-        s/\s+//g;
-        (/^$value$/) and return 1;
+        s/\s+//g;                  # Blanks entfernen
+        s/^0+//g;                  # fuehrende Nullen entfernen
+        (/^$value$/) and return 1; # Alpha-Vergleich (vermeidet Laufzeitfehler)
         (/^([\d]+)-(\d+)/) and return ($value >= $1 && $value <= $2);
     }
     return 0;
@@ -96,7 +98,7 @@
 #
 # Bei der Erstausfuehrung des Plugins nimmt dieses erst nach Erreichen 
 # des vorgesehenen Zeitfensters die eigentliche Arbeit auf, weil der 
-# Abstand zwischen zwei sonst zu klein werden koennte.
+# Abstand zwischen zwei Triggern sonst zu klein werden koennte.
 #--------------------------------------------------------------------
 
 if ($curSec >= $slotEnd)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[413] tools

[<ma...@us...>]

Revision: 413
          http://openautomation.svn.sourceforge.net/openautomation/?rev=413&view=rev
Author:   makki1
Date:     2011-09-07 18:11:25 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
russconnectd - initial commit. A small daemon to interface russ amp with eibd

Added Paths:
-----------
    tools/russconnectd/
    tools/russconnectd/release/
    tools/russconnectd/release/russconnectd-0.1.tar.gz
    tools/russconnectd/trunk/
    tools/russconnectd/trunk/AUTHORS
    tools/russconnectd/trunk/COPYING
    tools/russconnectd/trunk/ChangeLog
    tools/russconnectd/trunk/INSTALL
    tools/russconnectd/trunk/Makefile.am
    tools/russconnectd/trunk/NEWS
    tools/russconnectd/trunk/README
    tools/russconnectd/trunk/TODO.tasks
    tools/russconnectd/trunk/configure.ac
    tools/russconnectd/trunk/debian/
    tools/russconnectd/trunk/debian/README
    tools/russconnectd/trunk/debian/README.Debian
    tools/russconnectd/trunk/debian/changelog
    tools/russconnectd/trunk/debian/compat
    tools/russconnectd/trunk/debian/control
    tools/russconnectd/trunk/debian/copyright
    tools/russconnectd/trunk/debian/docs
    tools/russconnectd/trunk/debian/files
    tools/russconnectd/trunk/debian/init.d
    tools/russconnectd/trunk/debian/rules
    tools/russconnectd/trunk/debian/russconnectd.default
    tools/russconnectd/trunk/debian/source/
    tools/russconnectd/trunk/debian/source/format
    tools/russconnectd/trunk/intltool-extract.in
    tools/russconnectd/trunk/intltool-merge.in
    tools/russconnectd/trunk/intltool-update.in
    tools/russconnectd/trunk/openwrt/
    tools/russconnectd/trunk/openwrt/russconnectd/
    tools/russconnectd/trunk/openwrt/russconnectd/Makefile
    tools/russconnectd/trunk/openwrt/russconnectd/files/
    tools/russconnectd/trunk/openwrt/russconnectd/files/init
    tools/russconnectd/trunk/po/
    tools/russconnectd/trunk/po/ChangeLog
    tools/russconnectd/trunk/po/LINGUAS
    tools/russconnectd/trunk/po/Makefile.in.in
    tools/russconnectd/trunk/po/POTFILES.in
    tools/russconnectd/trunk/russ_galist.ods
    tools/russconnectd/trunk/src/
    tools/russconnectd/trunk/src/Makefile.am
    tools/russconnectd/trunk/src/main.c

Added: tools/russconnectd/release/russconnectd-0.1.tar.gz
===================================================================
(Binary files differ)


Property changes on: tools/russconnectd/release/russconnectd-0.1.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: tools/russconnectd/trunk/AUTHORS
===================================================================
--- tools/russconnectd/trunk/AUTHORS	                        (rev 0)
+++ tools/russconnectd/trunk/AUTHORS	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1 @@
+Michael Markstaller <de...@wi...>
\ No newline at end of file

Added: tools/russconnectd/trunk/COPYING
===================================================================
--- tools/russconnectd/trunk/COPYING	                        (rev 0)
+++ tools/russconnectd/trunk/COPYING	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,675 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program 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
+    (at your option) any later version.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+

Added: tools/russconnectd/trunk/ChangeLog
===================================================================
--- tools/russconnectd/trunk/ChangeLog	                        (rev 0)
+++ tools/russconnectd/trunk/ChangeLog	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,2 @@
+
+

Added: tools/russconnectd/trunk/INSTALL
===================================================================
--- tools/russconnectd/trunk/INSTALL	                        (rev 0)
+++ tools/russconnectd/trunk/INSTALL	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1 @@
+link /usr/share/automake-1.11/INSTALL
\ No newline at end of file


Property changes on: tools/russconnectd/trunk/INSTALL
___________________________________________________________________
Added: svn:special
   + *

Added: tools/russconnectd/trunk/Makefile.am
===================================================================
--- tools/russconnectd/trunk/Makefile.am	                        (rev 0)
+++ tools/russconnectd/trunk/Makefile.am	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,32 @@
+## Process this file with automake to produce Makefile.in
+## Created by Anjuta
+
+SUBDIRS = src po
+
+russconnectddocdir = ${prefix}/doc/russconnectd
+russconnectddoc_DATA = \
+	README\
+	COPYING\
+	AUTHORS\
+	ChangeLog\
+	INSTALL\
+	NEWS\
+	russ_galist.ods
+
+
+INTLTOOL_FILES = intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in
+
+EXTRA_DIST = $(russconnectddoc_DATA) \
+	$(INTLTOOL_FILES)
+
+DISTCLEANFILES = intltool-extract \
+	intltool-merge \
+	intltool-update \
+	po/.intltool-merge-cache
+
+
+# Remove doc directory on uninstall
+uninstall-local:
+	-rm -r $(russconnectddocdir)

Added: tools/russconnectd/trunk/NEWS
===================================================================
Added: tools/russconnectd/trunk/README
===================================================================
--- tools/russconnectd/trunk/README	                        (rev 0)
+++ tools/russconnectd/trunk/README	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,36 @@
+*** Russound RNET(R) to EIB/KNX bridge
+
+- eibd is needed for KNX communication, either locally or remote
+- uses mainly native Russound-Values
+TODO: document various values for Volume, bass,.. better
+- controllers and zone-numbers are zero based!
+- use socat or Moxa to get serial-data from/to UDP:
+	19200 8N1, No flowctrl, no special stop chars needed
+
+*** INSTALL
+- needs pthread and libeibclient from bcusdk/eibd
+	
+*** Group address structure:
+- given a start-address the next 256 GA are used per 6 Zones, currently pretty hardcoded
+Example: Start-address given 10/1/0
+
+0-9: System/controller-wide
+10/1/1 W Power on/off all zones*1
+10/1/2 WO Actuator powering the controllers (not yet)
+
+10/1/10 W Zone 1 Power on/off 0/1
+... see .ods
+
+W = GA writeable
+RS = GA readable/sends status updates on change
+
+*** TODO:
+- see various TODO/FIXME in source
+- reconnection/error-handling if network-problems occur (mainly eibd?)
+- prettify code
+- fix dependency on uclibc++ on OpenWRT
+
+*** Outlook
+- *maybe* make much more modular and other interfaces (simple UDP/TCP server)
+- don't depend on libeibclient then
+- *maybe* add outgoing interfaces for mpd,vdr,.. to stick multiroom togehter

Added: tools/russconnectd/trunk/TODO.tasks
===================================================================
--- tools/russconnectd/trunk/TODO.tasks	                        (rev 0)
+++ tools/russconnectd/trunk/TODO.tasks	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<gtodo>
+  <category title="Pers&#xF6;nlich" place="0"/>
+  <category title="Gesch&#xE4;ftlich" place="1"/>
+  <category title="Nicht einsortiert" place="2"/>
+</gtodo>

Added: tools/russconnectd/trunk/configure.ac
===================================================================
--- tools/russconnectd/trunk/configure.ac	                        (rev 0)
+++ tools/russconnectd/trunk/configure.ac	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,38 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl Created by Anjuta application wizard.
+
+AC_INIT(russconnectd, 0.1)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AC_CONFIG_HEADERS([config.h])
+AM_MAINTAINER_MODE
+
+AC_PROG_CC
+
+
+
+
+dnl ***************************************************************************
+dnl Internatinalization
+dnl ***************************************************************************
+GETTEXT_PACKAGE=russconnectd
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
+AM_GLIB_GNU_GETTEXT
+IT_PROG_INTLTOOL([0.35.0])
+
+
+
+AM_PROG_LIBTOOL
+
+
+
+
+
+
+AC_OUTPUT([
+Makefile
+src/Makefile
+po/Makefile.in
+])

Added: tools/russconnectd/trunk/debian/README
===================================================================
--- tools/russconnectd/trunk/debian/README	                        (rev 0)
+++ tools/russconnectd/trunk/debian/README	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,6 @@
+The Debian Package russconnectd
+----------------------------
+
+Comments regarding the Package
+
+ -- Michael Markstaller <de...@wi...>  Wed, 07 Sep 2011 18:04:18 +0200

Added: tools/russconnectd/trunk/debian/README.Debian
===================================================================
--- tools/russconnectd/trunk/debian/README.Debian	                        (rev 0)
+++ tools/russconnectd/trunk/debian/README.Debian	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,6 @@
+russconnectd for Debian
+-----------------------
+
+control startup settings through /etc/default/russconnectd
+
+ -- Michael Markstaller <de...@wi...>  Wed, 07 Sep 2011 18:04:18 +0200

Added: tools/russconnectd/trunk/debian/changelog
===================================================================
--- tools/russconnectd/trunk/debian/changelog	                        (rev 0)
+++ tools/russconnectd/trunk/debian/changelog	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,5 @@
+russconnectd (0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Michael Markstaller <de...@wi...>  Wed, 07 Sep 2011 18:04:18 +0200

Added: tools/russconnectd/trunk/debian/compat
===================================================================
--- tools/russconnectd/trunk/debian/compat	                        (rev 0)
+++ tools/russconnectd/trunk/debian/compat	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1 @@
+5

Added: tools/russconnectd/trunk/debian/control
===================================================================
--- tools/russconnectd/trunk/debian/control	                        (rev 0)
+++ tools/russconnectd/trunk/debian/control	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,16 @@
+Source: russconnectd
+Section: unknown
+Priority: extra
+Maintainer: Michael Markstaller <de...@wi...>
+Build-Depends: debhelper (>= 7.0), autotools-dev
+Standards-Version: 3.9.1
+Homepage: <insert the upstream URL, if relevant>
+#Vcs-Git: git://git.debian.org/collab-maint/russconnectd.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/russconnectd.git;a=summary
+
+Package: russconnectd
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: simple daemon to control Russsound amp from KNX
+ A simple daemon to control Russsound amplifiers with RNET-protocol from KNX
+

Added: tools/russconnectd/trunk/debian/copyright
===================================================================
--- tools/russconnectd/trunk/debian/copyright	                        (rev 0)
+++ tools/russconnectd/trunk/debian/copyright	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,40 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: russconnectd
+Source: <url://example.com>
+
+Files: *
+Copyright: <years> <put author's name and email here>
+           <years> <likewise for another author>
+License: GPL-3.0+
+
+Files: debian/*
+Copyright: 2011 Michael Markstaller <de...@wi...>
+License: GPL-3.0+
+
+License: GPL-3.0+
+ This program 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
+ (at your option) any later version.
+ .
+ This package 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+# Please choose a license for your packaging work. If the program you package
+# uses a mainstream license, using the same license is the safest choice.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
+# If you just want it to be GPL version 3, leave the following line in.
+
+and is licensed under the GPL version 3, see above.
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.

Added: tools/russconnectd/trunk/debian/docs
===================================================================
--- tools/russconnectd/trunk/debian/docs	                        (rev 0)
+++ tools/russconnectd/trunk/debian/docs	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,4 @@
+NEWS
+README
+russ_galist.ods
+

Added: tools/russconnectd/trunk/debian/files
===================================================================
--- tools/russconnectd/trunk/debian/files	                        (rev 0)
+++ tools/russconnectd/trunk/debian/files	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1 @@
+russconnectd_0.1_i386.deb unknown extra

Added: tools/russconnectd/trunk/debian/init.d
===================================================================
--- tools/russconnectd/trunk/debian/init.d	                        (rev 0)
+++ tools/russconnectd/trunk/debian/init.d	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,154 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          russconnectd
+# Required-Start:    $network $local_fs
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: <Enter a short description of the sortware>
+# Description:       <Enter a long description of the software>
+#                    <...>
+#                    <...>
+### END INIT INFO
+
+# Author: Michael Markstaller <de...@wi...>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC=russconnectd             # Introduce a short description here
+NAME=russconnectd             # Introduce the short server's name here
+DAEMON=/usr/bin/russconnectd # Introduce the server's location here
+DAEMON_ARGS=""             # Arguments to run the daemon with
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	# Return
+	#   0 if daemon has been started
+	#   1 if daemon was already running
+	#   2 if daemon could not be started
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+		$DAEMON_ARGS \
+		|| return 2
+	# Add code here, if necessary, that waits for the process to be ready
+	# to handle requests from services started subsequently which depend
+	# on this one.  As a last resort, sleep for some time.
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+	# Return
+	#   0 if daemon has been stopped
+	#   1 if daemon was already stopped
+	#   2 if daemon could not be stopped
+	#   other if a failure occurred
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	# Wait for children to finish too if this is a daemon that forks
+	# and if the daemon is only ever run from this initscript.
+	# If the above conditions are not satisfied then add some other code
+	# that waits for the process to drop all resources that could be
+	# needed by services started subsequently.  A last resort is to
+	# sleep for some time.
+	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+	[ "$?" = 2 ] && return 2
+	# Many daemons don't delete their pidfiles when they exit.
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+	#
+	# If the daemon can reload its configuration without
+	# restarting (for example, when it is sent a SIGHUP),
+	# then implement that here.
+	#
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	return 0
+}
+
+case "$1" in
+  start)
+    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
+    do_start
+    case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+  ;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
+  #reload|force-reload)
+	#
+	# If do_reload() is not implemented then leave this commented out
+	# and leave 'force-reload' as an alias for 'restart'.
+	#
+	#log_daemon_msg "Reloading $DESC" "$NAME"
+	#do_reload
+	#log_end_msg $?
+	#;;
+  restart|force-reload)
+	#
+	# If the "reload" option is implemented then remove the
+	# 'force-reload' alias
+	#
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+	  	# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:

Added: tools/russconnectd/trunk/debian/rules
===================================================================
--- tools/russconnectd/trunk/debian/rules	                        (rev 0)
+++ tools/russconnectd/trunk/debian/rules	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 


Property changes on: tools/russconnectd/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: tools/russconnectd/trunk/debian/russconnectd.default
===================================================================
--- tools/russconnectd/trunk/debian/russconnectd.default	                        (rev 0)
+++ tools/russconnectd/trunk/debian/russconnectd.default	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,19 @@
+# Defaults for russconnectd initscript
+# sourced by /etc/init.d/russconnectd
+# installed at /etc/default/russconnectd by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+#	-d	Run as daemon/No debug output
+#	-p <pidfile>	PID-filename
+#	-i <ip:port>	IP-Address:Port to send UDP-packets to russound
+#	-l <UDP-port>	UDP port to listen on
+#	-a <KNX address>	KNX start-address (see README)
+#	-z <number>	Number of Zones to support
+#	-u <eib url>	URL to conatct eibd like localo:/tmp/eib or ip:192.168.0.101
+
+# Additional options that are passed to the Daemon.
+DAEMON_ARGS="-d -i 127.0.0.1:16012 -l 16011 -a 10/1/0 -z 6 -u local:/tmp/eib"
+

Added: tools/russconnectd/trunk/debian/source/format
===================================================================
--- tools/russconnectd/trunk/debian/source/format	                        (rev 0)
+++ tools/russconnectd/trunk/debian/source/format	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1 @@
+3.0 (native)

Added: tools/russconnectd/trunk/intltool-extract.in
===================================================================
Added: tools/russconnectd/trunk/intltool-merge.in
===================================================================
Added: tools/russconnectd/trunk/intltool-update.in
===================================================================
Added: tools/russconnectd/trunk/openwrt/russconnectd/Makefile
===================================================================
--- tools/russconnectd/trunk/openwrt/russconnectd/Makefile	                        (rev 0)
+++ tools/russconnectd/trunk/openwrt/russconnectd/Makefile	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,37 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=russconnectd
+PKG_VERSION:=0.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/openautomation
+PKG_CAT:=zcat
+PKG_MD5SUM:=571001b17b4bb75a97e34c4b3fa798cf
+
+PKG_INSTALL:=1
+
+PKG_BUILD_DEPENDS:=bcusdk
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/russconnectd
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Russsound RNET(tm) EIB/KNX connector
+  URL:=http://sourceforge.net//openautomation
+  DEPENDS:=libeibclient
+endef
+
+# FIXME: depend on uclibc++??
+
+define Package/russconnectd/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/init $(1)/etc/init.d/$(PKG_NAME)
+endef
+
+$(eval $(call BuildPackage,russconnectd))

Added: tools/russconnectd/trunk/openwrt/russconnectd/files/init
===================================================================
--- tools/russconnectd/trunk/openwrt/russconnectd/files/init	                        (rev 0)
+++ tools/russconnectd/trunk/openwrt/russconnectd/files/init	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,13 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2011 OpenWrt.org
+START=60
+STOP=60
+
+start() {
+	/usr/bin/russconnectd -d -i 127.0.0.1:16012 -l 16011 -a 10/1/0 -z 6 -u local:/tmp/eib
+}
+
+stop() {
+	kill $(cat /var/run/russconnectd.pid)
+}
+

Added: tools/russconnectd/trunk/po/ChangeLog
===================================================================
Added: tools/russconnectd/trunk/po/LINGUAS
===================================================================
--- tools/russconnectd/trunk/po/LINGUAS	                        (rev 0)
+++ tools/russconnectd/trunk/po/LINGUAS	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,2 @@
+# please keep this list sorted alphabetically
+#

Added: tools/russconnectd/trunk/po/Makefile.in.in
===================================================================
--- tools/russconnectd/trunk/po/Makefile.in.in	                        (rev 0)
+++ tools/russconnectd/trunk/po/Makefile.in.in	2011-09-07 18:11:25 UTC (rev 413)
@@ -0,0 +1,217 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <dr...@gn...>
+# Copyright (C) 2004-2008 Rodney Dawes <dob...@gm...>
+#
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
+# but which still want to provide support for the GNU gettext functionality.
+#
+# - Modified by Owen Taylor <ot...@re...> to use GETTEXT_PACKAGE
+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
+#
+# - Modified by jacob berkman <ja...@xi...> to install
+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes <dob...@gm...> for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
+
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+datarootdir = @datarootdir@
+libdir = @libdir@
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+subdir = po
+install_sh = @install_sh@
+# Automake >= 1.8 provides @mkdir_p@.
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $...
 
[truncated message content]

[Openautomation-svn] SF.net SVN: openautomation:[412] wiregate/plugin/generic

[<csc...@us...>]

Revision: 412
          http://openautomation.svn.sourceforge.net/openautomation/?rev=412&view=rev
Author:   cschleiffer
Date:     2011-08-30 07:28:00 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
v0.2 of Kaco datalogger plugin

Added Paths:
-----------
    wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog.pl

Removed Paths:
-------------
    wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog

Deleted: wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog
===================================================================
--- wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog	2011-08-22 21:16:39 UTC (rev 411)
+++ wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog	2011-08-30 07:28:00 UTC (rev 412)
@@ -1,151 +0,0 @@
-# Monitoring a PV system with Kaco ProLOG
-# v0.1
-
-use LWP::Simple;
-
-# Configuration 
-# ****************************
-
-my $myProLogIP       = "192.168.178.116";  # IP address of Kaco ProLOG
-my $myCurrentPowerGA = "0/4/236";          # GA for sending current power [W], DPT 14.056
-# ToDo
-my $myEnergy15minGA  = "0/4/231";          # GA for sending energy produced in last 15min [Wh], DPT 13.010
-my $myEnergy60minGA  = "0/4/232";          # GA for sending energy produced in last 60min [Wh], DPT 13.010
-
-# Arrays to hold GAs for detailed values from the single power converters
-# Use their RS485 bus address as array index
-# If a GA is left empty, it is not send to the bus
-my @myDcVoltageGA;         # DC voltage in [V], DPT 14.027
-my @myDcCurrentGA;        # DC current in [A], DPT 14.019
-my @myDcPowerGA;        # DC power [W], DPT 13.010
-my @myAcVoltageGA;        # AC voltage in [V], DPT 14.027
-my @myAcCurrentGA;        # AC current in [A], DPT 14.019
-my @myAcPowerGA;        # AC power in [W], DPT 13.010
-my @myAcDailyEnergyGA;        # Energy output, daily accumulation in [kWh], DPT 13.013
-my @myTemperatureGA;        # Temperature of inverter in [°C], DPT 9.001
-my @myStatusGA;            # Status of inverter, DPT 5.010
-
-# WR1 Powador 6002
-$myDcVoltageGA[1]     = "0/4/237";
-$myDcCurrentGA[1]     = "0/4/238";
-$myDcPowerGA[1]       = "0/4/239";
-$myAcVoltageGA[1]     = "0/4/240";
-$myAcCurrentGA[1]     = "0/4/241";
-$myAcPowerGA[1]       = "0/4/242";
-$myAcDailyEnergyGA[1] = "0/4/243";
-$myTemperatureGA[1]   = "0/4/244";
-$myStatusGA[1]        = "0/4/245";
-# WR2 Powador 2002
-$myDcVoltageGA[2]     = "0/4/246";
-$myDcCurrentGA[2]     = "0/4/247";
-$myDcPowerGA[2]       = "0/4/248";
-$myAcVoltageGA[2]     = "0/4/249";
-$myAcCurrentGA[2]     = "0/4/250";
-$myAcPowerGA[2]       = "0/4/251";
-$myAcDailyEnergyGA[2] = "0/4/252";
-$myTemperatureGA[2]   = "0/4/253";
-$myStatusGA[2]        = "0/4/254";
-
-
-# End Configuration
-# *****************************
-# Do not change below here
-
-my $mySummaryDataDownloadPath = "/html/de/locale_live_standard.html";
-my $myDetailedDataDownloadPath = "/get_online_wr.cgi?q=U_DC_0;I_DC_0;P_DC_WR;U_AC_0;I_AC_0;P_AC_WR;T_WR;E_D_WR;S";
-my @myWRStatusMsg;
-
-$myWRStatusMsg[ 0] = 'WR gerade eingeschaltet';
-$myWRStatusMsg[ 1] = 'Warten auf Start';
-$myWRStatusMsg[ 2] = 'Warten auf Ausschalten';
-$myWRStatusMsg[ 3] = 'Konstantspannungsregler';
-$myWRStatusMsg[ 5] = 'Einspeisung (MPP-Tracker)';
-$myWRStatusMsg[ 8] = 'Selbsttest';
-$myWRStatusMsg[ 9] = 'Testbetrieb';
-$myWRStatusMsg[10] = 'Gerätetemperatur zu hoch';
-$myWRStatusMsg[11] = 'Leistungsbegrenzung';
-$myWRStatusMsg[29] = 'Erdschluss Sicherung prüfen!';
-$myWRStatusMsg[30] = 'Störung Messwandler';
-$myWRStatusMsg[32] = 'Fehler Selbsttest';
-$myWRStatusMsg[33] = 'Fehler DC-Einspeisung';
-$myWRStatusMsg[34] = 'Fehler Kommunikation';
-$myWRStatusMsg[35] = 'Schutzabschaltung (SW)';
-$myWRStatusMsg[36] = 'Schutzabschaltung (HW)';
-$myWRStatusMsg[38] = 'Fehler PV-Überspannung';
-$myWRStatusMsg[41] = 'Netzstörung Unterspannung';
-$myWRStatusMsg[42] = 'Netzstörung Überspannung';
-$myWRStatusMsg[48] = 'Netzstörung Unterfrequenz';
-$myWRStatusMsg[49] = 'Netzstörung Überfrequenz';
-$myWRStatusMsg[50] = 'Netzstörung Mittelwert Spg';
-$myWRStatusMsg[51] = 'Netzstörung Überspannung L1';
-$myWRStatusMsg[52] = 'Netzstörung Unterspannung L1';
-$myWRStatusMsg[53] = 'Netzstörung Überspannung L2';
-$myWRStatusMsg[54] = 'Netzstörung Unterspannung L2';
-$myWRStatusMsg[55] = 'Fehler Zwischenkreis';
-$myWRStatusMsg[57] = 'Warten auf Wiederzuschalten';
-$myWRStatusMsg[58] = 'Übertemperatur Steuerkarte';
-$myWRStatusMsg[59] = 'Fehler Selbsttest';
-$myWRStatusMsg[60] = 'PV-Spannung zu hoch';
-$myWRStatusMsg[61] = 'Power-Control';
-$myWRStatusMsg[62] = 'Inselbetrieb';
-$myWRStatusMsg[63] = 'Frequenzabhängige Leistungsreduzierung';
-$myWRStatusMsg[64] = 'Ausgangsstrombegrenzung';
-$myWRStatusMsg[''] = 'Nicht verfügbar/ausgeschaltet';
-
-$plugin_info{$plugname.'_cycle'} = 30;
-
-my $content = get( "http://$myProLogIP$mySummaryDataDownloadPath" );
-return "Übersichts-Webabfrage fehlgeschlagen" unless defined $content;
-
-my @myOverview = split( /\|/, $content );
-
-# calculate W from kW
-$myOverview[0] *= 1000;
-
-knx_write( $myCurrentPowerGA , $myOverview[0], 14 );
-update_rrd("PV", "P_total", $myOverview[0] );
-
-
-# more detailed data are requested here
-
-$content = get( "http://$myProLogIP$myDetailedDataDownloadPath" );
-return "Detail-Webabfrage fehlgeschlagen" unless defined $content;
-
-my @myDetails = split( /\n/, $content ); 
-my $myWRStatusChanges = '';
-
-for my $i (2 .. $#myDetails - 1) {
-    $myDetails[$i] =~ s/\r//g;    # remove carrige return
-    my @myWRDetails = split( /;/, $myDetails[$i] );
-    
-    # only process if system supplies values
-    if( $myWRDetails[2] != '' ) {
-        # store and send values
-        update_rrd( 'PV', "DcVoltage_WR$myWRDetails[1]", $myWRDetails[2] );
-        if( $myDcVoltageGA[ $myWRDetails[1] ] ) { knx_write( $myDcVoltageGA[ $myWRDetails[1] ], $myWRDetails[2], 14 ); }
-        update_rrd( 'PV', "DcCurrent_WR$myWRDetails[1]", $myWRDetails[3] );
-        if( $myDcCurrentGA[ $myWRDetails[1] ] ) { knx_write( $myDcCurrentGA[ $myWRDetails[1] ], $myWRDetails[3], 14 ); }
-        update_rrd( 'PV', "DcPower_WR$myWRDetails[1]", $myWRDetails[4] );
-        if( $myDcPowerGA[ $myWRDetails[1] ] ) { knx_write( $myDcPowerGA[ $myWRDetails[1] ], $myWRDetails[4], 13 ); }
-        update_rrd( 'PV', "AcVoltage_WR$myWRDetails[1]", $myWRDetails[5] );
-        if( $myAcVoltageGA[ $myWRDetails[1] ] ) { knx_write( $myAcVoltageGA[ $myWRDetails[1] ], $myWRDetails[5], 14 ); }
-        update_rrd( 'PV', "AcCurrent_WR$myWRDetails[1]", $myWRDetails[6] );
-        if( $myAcCurrentGA[ $myWRDetails[1] ] ) { knx_write( $myAcCurrentGA[ $myWRDetails[1] ], $myWRDetails[6], 14 ); }
-        update_rrd( 'PV', "AcPower_WR$myWRDetails[1]", $myWRDetails[7] );
-        if( $myAcPowerGA[ $myWRDetails[1] ] ) { knx_write( $myAcPowerGA[ $myWRDetails[1] ], $myWRDetails[7], 13 ); }
-        update_rrd( 'PV', "Temperature_WR$myWRDetails[1]", $myWRDetails[8] );
-        if( $myTemperatureGA[ $myWRDetails[1] ] ) { knx_write( $myTemperatureGA[ $myWRDetails[1] ], $myWRDetails[8], 9 ); }
-        update_rrd( 'PV', "DailyEnergy_WR$myWRDetails[1]", $myWRDetails[9] / 1000 );
-        if( $myAcDailyEnergyGA[ $myWRDetails[1] ] ) { knx_write( $myAcDailyEnergyGA[ $myWRDetails[1] ], $myWRDetails[9]/1000, 13 ); }    
-        update_rrd( 'PV', "Status_WR$myWRDetails[1]", $myWRDetails[10] );
-        if( $myStatusGA[ $myWRDetails[1] ] ) { knx_write( $myStatusGA[ $myWRDetails[1] ], $myWRDetails[10], 5 ); }
-            
-        # save last status of inverter
-        if ( $myWRDetails[10] != $plugin_info{$plugname."_WRState$myWRDetails[1]"} ) {
-            $myWRStatusChanges .= "WR$myWRDetails[1] Status ".$plugin_info{$plugname."_WRState$myWRDetails[1]"}." (".$myWRStatusMsg[$plugin_info{$plugname."_WRState$myWRDetails[1]"}].") -> ".$myWRDetails[10]." ($myWRStatusMsg[$myWRDetails[10]]) , ";
-            $plugin_info{$plugname."_WRState$myWRDetails[1]"} = $myWRDetails[10];
-        }
-    }
-}
-return $myWRStatusChanges;
-

Copied: wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog.pl (from rev 411, wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog)
===================================================================
--- wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog.pl	                        (rev 0)
+++ wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog.pl	2011-08-30 07:28:00 UTC (rev 412)
@@ -0,0 +1,186 @@
+# Monitoring a PV system with Kaco ProLOG
+# v0.2
+# License: GPL v2
+
+use LWP::Simple;
+use HTML::TableExtract; # get it with 'apt-get install libhtml-tableextract-perl'
+
+# Configuration 
+# ****************************
+
+my $myProLogIP          = "192.168.178.116";	# IP address of Kaco ProLOG
+my $myCurrentPowerGA    = "0/4/236";		# GA for sending current power [W], DPT 14.056
+my $myEnergyTodayGA     = "0/4/233";		# GA for sending energy produced this day [Wh], DPT 13.010
+my $myEneryYesterdayGA  = "";
+my $myEnergyThisMonthGA = "0/4/234";		# GA for sending energy produced this month [kWh], DPT 13.013
+my $myEnergyThisYearGA  = "0/4/235";		# GA for sending energy produced this year [Wh], DPT 13.013
+my $myEnergyTotalGA     = "0/4/230";		# GA for sending total accumulated enery production [kWh], DPT 13.013
+# ToDo
+my $myEnergy15minGA     = "0/4/231";		# GA for sending energy produced in last 15min [Wh], DPT 13.010
+my $myEnergy60minGA     = "0/4/232";		# GA for sending energy produced in last 60min [Wh], DPT 13.010
+
+
+# Arrays to hold GAs for detailed values from the single power converters
+# Use their RS485 bus address as array index
+# If a GA is left empty, it is not send to the bus
+my @myDcVoltageGA; 		# DC voltage in [V], DPT 14.027
+my @myDcCurrentGA;		# DC current in [A], DPT 14.019
+my @myDcPowerGA;		# DC power [W], DPT 13.010
+my @myAcVoltageGA;		# AC voltage in [V], DPT 14.027
+my @myAcCurrentGA;		# AC current in [A], DPT 14.019
+my @myAcPowerGA;		# AC power in [W], DPT 13.010
+my @myAcDailyEnergyGA;		# Energy output, daily accumulation in [kWh], DPT 13.013
+my @myTemperatureGA;		# Temperature of inverter in [°C], DPT 9.001
+my @myStatusGA;			# Status of inverter, DPT 5.010
+
+# WR1 Powador 6002
+$myDcVoltageGA[1]     = "0/4/237";
+$myDcCurrentGA[1]     = "0/4/238";
+$myDcPowerGA[1]       = "0/4/239";
+$myAcVoltageGA[1]     = "0/4/240";
+$myAcCurrentGA[1]     = "0/4/241";
+$myAcPowerGA[1]       = "0/4/242";
+$myAcDailyEnergyGA[1] = "0/4/243";
+$myTemperatureGA[1]   = "0/4/244";
+$myStatusGA[1]        = "0/4/245";
+# WR2 Powador 2002
+$myDcVoltageGA[2]     = "0/4/246";
+$myDcCurrentGA[2]     = "0/4/247";
+$myDcPowerGA[2]       = "0/4/248";
+$myAcVoltageGA[2]     = "0/4/249";
+$myAcCurrentGA[2]     = "0/4/250";
+$myAcPowerGA[2]       = "0/4/251";
+$myAcDailyEnergyGA[2] = "0/4/252";
+$myTemperatureGA[2]   = "0/4/253";
+$myStatusGA[2]        = "0/4/254";
+
+
+# End Configuration
+# *****************************
+# Do not change below here
+
+my $mySummaryDataDownloadPath = "/html/de/locale_live_standard.html";
+my $myDetailedDataDownloadPath = "/get_online_wr.cgi?q=U_DC_0;I_DC_0;P_DC_WR;U_AC_0;I_AC_0;P_AC_WR;T_WR;E_D_WR;S";
+my $myWrOverviewPath = "/html/de/onlineOverWr.html";
+my @myWRStatusMsg;
+
+$myWRStatusMsg[ 0] = 'WR gerade eingeschaltet';
+$myWRStatusMsg[ 1] = 'Warten auf Start';
+$myWRStatusMsg[ 2] = 'Warten auf Ausschalten';
+$myWRStatusMsg[ 3] = 'Konstantspannungsregler';
+$myWRStatusMsg[ 5] = 'Einspeisung (MPP-Tracker)';
+$myWRStatusMsg[ 8] = 'Selbsttest';
+$myWRStatusMsg[ 9] = 'Testbetrieb';
+$myWRStatusMsg[10] = 'Gerätetemperatur zu hoch';
+$myWRStatusMsg[11] = 'Leistungsbegrenzung';
+$myWRStatusMsg[29] = 'Erdschluss Sicherung prüfen!';
+$myWRStatusMsg[30] = 'Störung Messwandler';
+$myWRStatusMsg[32] = 'Fehler Selbsttest';
+$myWRStatusMsg[33] = 'Fehler DC-Einspeisung';
+$myWRStatusMsg[34] = 'Fehler Kommunikation';
+$myWRStatusMsg[35] = 'Schutzabschaltung (SW)';
+$myWRStatusMsg[36] = 'Schutzabschaltung (HW)';
+$myWRStatusMsg[38] = 'Fehler PV-Überspannung';
+$myWRStatusMsg[41] = 'Netzstörung Unterspannung';
+$myWRStatusMsg[42] = 'Netzstörung Überspannung';
+$myWRStatusMsg[48] = 'Netzstörung Unterfrequenz';
+$myWRStatusMsg[49] = 'Netzstörung Überfrequenz';
+$myWRStatusMsg[50] = 'Netzstörung Mittelwert Spg';
+$myWRStatusMsg[51] = 'Netzstörung Überspannung L1';
+$myWRStatusMsg[52] = 'Netzstörung Unterspannung L1';
+$myWRStatusMsg[53] = 'Netzstörung Überspannung L2';
+$myWRStatusMsg[54] = 'Netzstörung Unterspannung L2';
+$myWRStatusMsg[55] = 'Fehler Zwischenkreis';
+$myWRStatusMsg[57] = 'Warten auf Wiederzuschalten';
+$myWRStatusMsg[58] = 'Übertemperatur Steuerkarte';
+$myWRStatusMsg[59] = 'Fehler Selbsttest';
+$myWRStatusMsg[60] = 'PV-Spannung zu hoch';
+$myWRStatusMsg[61] = 'Power-Control';
+$myWRStatusMsg[62] = 'Inselbetrieb';
+$myWRStatusMsg[63] = 'Frequenzabhängige Leistungsreduzierung';
+$myWRStatusMsg[64] = 'Ausgangsstrombegrenzung';
+$myWRStatusMsg[''] = 'Nicht verfügbar/ausgeschaltet';
+
+$plugin_info{$plugname.'_cycle'} = 30;
+
+my $content = get( "http://$myProLogIP$mySummaryDataDownloadPath" );
+return "Übersichts-Webabfrage fehlgeschlagen" unless defined $content;
+
+my @myOverview = split( /\|/, $content );
+
+# calculate W from kW
+$myOverview[0] *= 1000;
+
+knx_write( $myCurrentPowerGA , $myOverview[0], 14 );
+update_rrd("PV", "P_total", $myOverview[0] );
+
+# more detailed data are requested here
+$content = get( "http://$myProLogIP$myDetailedDataDownloadPath" );
+return "Detail-Webabfrage fehlgeschlagen" unless defined $content;
+
+my @myDetails = split( /\n/, $content ); 
+my $myWRStatusChanges = '';
+
+for my $i (2 .. $#myDetails - 1) {
+    $myDetails[$i] =~ s/\r//g;	# remove carrige return
+    my @myWRDetails = split( /;/, $myDetails[$i] );
+    
+    # only process if system supplies values
+    if( $myWRDetails[2] != '' ) {
+        # store and send values
+        update_rrd( 'PV', "DcVoltage_WR$myWRDetails[1]", $myWRDetails[2] );
+        if( $myDcVoltageGA[ $myWRDetails[1] ] ) { knx_write( $myDcVoltageGA[ $myWRDetails[1] ], $myWRDetails[2], 14 ); }
+        update_rrd( 'PV', "DcCurrent_WR$myWRDetails[1]", $myWRDetails[3] );
+        if( $myDcCurrentGA[ $myWRDetails[1] ] ) { knx_write( $myDcCurrentGA[ $myWRDetails[1] ], $myWRDetails[3], 14 ); }
+        update_rrd( 'PV', "DcPower_WR$myWRDetails[1]", $myWRDetails[4] );
+        if( $myDcPowerGA[ $myWRDetails[1] ] ) { knx_write( $myDcPowerGA[ $myWRDetails[1] ], $myWRDetails[4], 13 ); }
+        update_rrd( 'PV', "AcVoltage_WR$myWRDetails[1]", $myWRDetails[5] );
+        if( $myAcVoltageGA[ $myWRDetails[1] ] ) { knx_write( $myAcVoltageGA[ $myWRDetails[1] ], $myWRDetails[5], 14 ); }
+        update_rrd( 'PV', "AcCurrent_WR$myWRDetails[1]", $myWRDetails[6] );
+        if( $myAcCurrentGA[ $myWRDetails[1] ] ) { knx_write( $myAcCurrentGA[ $myWRDetails[1] ], $myWRDetails[6], 14 ); }
+        update_rrd( 'PV', "AcPower_WR$myWRDetails[1]", $myWRDetails[7] );
+        if( $myAcPowerGA[ $myWRDetails[1] ] ) { knx_write( $myAcPowerGA[ $myWRDetails[1] ], $myWRDetails[7], 13 ); }
+        update_rrd( 'PV', "Temperature_WR$myWRDetails[1]", $myWRDetails[8] );
+        if( $myTemperatureGA[ $myWRDetails[1] ] ) { knx_write( $myTemperatureGA[ $myWRDetails[1] ], $myWRDetails[8], 9 ); }
+        update_rrd( 'PV', "DailyEnergy_WR$myWRDetails[1]", $myWRDetails[9] / 1000 );
+        if( $myAcDailyEnergyGA[ $myWRDetails[1] ] ) { knx_write( $myAcDailyEnergyGA[ $myWRDetails[1] ], $myWRDetails[9]/1000, 13 ); }	
+        update_rrd( 'PV', "Status_WR$myWRDetails[1]", $myWRDetails[10] );
+        if( $myStatusGA[ $myWRDetails[1] ] ) { knx_write( $myStatusGA[ $myWRDetails[1] ], $myWRDetails[10], 5 ); }
+            
+        # save last status of inverter
+        if ( $myWRDetails[10] != $plugin_info{$plugname."_WRState$myWRDetails[1]"} ) {
+            $myWRStatusChanges .= "WR$myWRDetails[1] Status ".$plugin_info{$plugname."_WRState$myWRDetails[1]"}." (".$myWRStatusMsg[$plugin_info{$plugname."_WRState$myWRDetails[1]"}].") -> ".$myWRDetails[10]." ($myWRStatusMsg[$myWRDetails[10]]) , ";
+            $plugin_info{$plugname."_WRState$myWRDetails[1]"} = $myWRDetails[10];
+        }
+    }
+}
+
+
+$content = get( "http://$myProLogIP$myWrOverviewPath" );
+return "Übersichts-Webabfrage fehlgeschlagen" unless defined $content;
+
+my $tables = HTML::TableExtract->new( );
+$tables->parse($content);
+
+my $lastElement = "";
+foreach my $table ($tables->tables) {
+    foreach my $rowCols ($table->rows) {
+        foreach my $col (@$rowCols) {
+            if( $lastElement eq "Aktuelle Monatsenergie" ) {
+                knx_write( $myEnergyThisMonthGA , $col, 13 );
+            } elsif ( $lastElement eq "Aktuelle Tagesenergie" ) {
+                knx_write( $myEnergyTodayGA , $col, 13 );
+            } elsif ( $lastElement eq "Aktuelle Jahresenergie" ) {
+                knx_write( $myEnergyThisYearGA , $col, 13 );
+            } elsif ( $lastElement eq "Tagesenergie Vortag" ) {
+                knx_write( $myEneryYesterdayGA , $col, 13 );
+            } elsif ( $lastElement eq "Gesamtenergie" ) {
+                knx_write( $myEnergyTotalGA , $col, 13 );
+            }
+            $lastElement = $col;
+        }
+    }
+}
+
+
+return $myWRStatusChanges;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[411] CometVisu/trunk/visu/designs/alaska

[<pan...@us...>]

Revision: 411
          http://openautomation.svn.sourceforge.net/openautomation/?rev=411&view=rev
Author:   panzaeron
Date:     2011-08-22 21:16:39 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
Design Alaska: Fix for pagelinks in edit mode

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/alaska/basic.css
    CometVisu/trunk/visu/designs/alaska/colors.css
    CometVisu/trunk/visu/designs/alaska_slim/basic.css
    CometVisu/trunk/visu/designs/alaska_slim/colors.css

Modified: CometVisu/trunk/visu/designs/alaska/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/basic.css	2011-08-21 23:17:00 UTC (rev 410)
+++ CometVisu/trunk/visu/designs/alaska/basic.css	2011-08-22 21:16:39 UTC (rev 411)
@@ -148,7 +148,7 @@
   position: relative;
 }
 
-.switchPressed, .switchUnpressed, .widget.link.pagelink div 
+.switchPressed, .switchUnpressed, .widget.link.pagelink div a
 {
   overflow: hidden;
   text-align: center;
@@ -376,13 +376,6 @@
 }
 
 /* Pagelinks as Button */
-.widget.link.pagelink div 
-{
-  width: 48%;
-  margin-left: auto;
-  margin-right: auto;
-}
-
 .widget.link.pagelink div a
 {
   display: inline-block;

Modified: CometVisu/trunk/visu/designs/alaska/colors.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/colors.css	2011-08-21 23:17:00 UTC (rev 410)
+++ CometVisu/trunk/visu/designs/alaska/colors.css	2011-08-22 21:16:39 UTC (rev 411)
@@ -86,7 +86,7 @@
 }
 
 /* gradient */
-body, div#top, .switchUnpressed, .switchPressed:active, .widget .ui-slider-handle, .popup_background, .clearfix, .widget.link.pagelink div
+body, div#top, .switchUnpressed, .switchPressed:active, .widget .ui-slider-handle, .popup_background, .clearfix, .widget.link.pagelink div a
 {
   background: #fff;
   background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ededed));
@@ -167,7 +167,7 @@
 }
 
 /* border */
-div#top, .ui-state-default, .ui-widget-content, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #pages .hr, .widget, .switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .popup_background, #diagramTooltip, .widget IFRAME, .clearfix, .widget.link.pagelink div
+div#top, .ui-state-default, .ui-widget-content, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #pages .hr, .widget, .switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .popup_background, #diagramTooltip, .widget IFRAME, .clearfix, .widget.link.pagelink div a
 {
   border-color: #686868;
 }
@@ -178,7 +178,7 @@
 }
 
 /* shadow */
-.switchPressed, .switchUnpressed, .widget .ui-slider, .clearfix, .popup_background, .widget IFRAME, .widget.link.pagelink div
+.switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .clearfix, .popup_background, .widget IFRAME, .widget.link.pagelink div a
 {
   -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2);
   -moz-box-shadow: 0 1px 2px rgba(0,0,0,.2);

Modified: CometVisu/trunk/visu/designs/alaska_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/basic.css	2011-08-21 23:17:00 UTC (rev 410)
+++ CometVisu/trunk/visu/designs/alaska_slim/basic.css	2011-08-22 21:16:39 UTC (rev 411)
@@ -143,7 +143,7 @@
   position: relative;
 }
 
-.switchPressed, .switchUnpressed, .widget.link.pagelink div
+.switchPressed, .switchUnpressed, .widget.link.pagelink div a
 {
   overflow: hidden;
   text-align: center;
@@ -356,13 +356,6 @@
 }
 
 /* Pagelinks as Button */
-.widget.link.pagelink div 
-{
-  width: 70%;
-  margin-left: auto;
-  margin-right: auto;
-}
-
 .widget.link.pagelink div a
 {
   display: inline-block;

Modified: CometVisu/trunk/visu/designs/alaska_slim/colors.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/colors.css	2011-08-21 23:17:00 UTC (rev 410)
+++ CometVisu/trunk/visu/designs/alaska_slim/colors.css	2011-08-22 21:16:39 UTC (rev 411)
@@ -86,7 +86,7 @@
 }
 
 /* gradient */
-body, div#top, .switchUnpressed, .switchPressed:active, .widget .ui-slider-handle, .popup_background, .clearfix, .widget.link.pagelink div
+body, div#top, .switchUnpressed, .switchPressed:active, .widget .ui-slider-handle, .popup_background, .clearfix, .widget.link.pagelink div a
 {
   background: #fff;
   background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ededed));
@@ -167,7 +167,7 @@
 }
 
 /* border */
-div#top, .ui-state-default, .ui-widget-content, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #pages .hr, .widget, .switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .popup_background, #diagramTooltip, .widget IFRAME, .clearfix, .widget.link.pagelink div
+div#top, .ui-state-default, .ui-widget-content, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #pages .hr, .widget, .switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .popup_background, #diagramTooltip, .widget IFRAME, .clearfix, .widget.link.pagelink div a
 {
   border-color: #686868;
 }
@@ -177,10 +177,8 @@
   background: #ececec;
 }
 
-
-
 /* shadow */
-.switchPressed, .switchUnpressed, .widget .ui-slider, .clearfix, .popup_background, .widget IFRAME, .widget.link.pagelink div 
+.switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .clearfix, .popup_background, .widget IFRAME, .widget.link.pagelink div a
 {
   -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2);
   -moz-box-shadow: 0 1px 2px rgba(0,0,0,.2);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[410] CometVisu/trunk/visu/designs/alaska

[<pan...@us...>]

Revision: 410
          http://openautomation.svn.sourceforge.net/openautomation/?rev=410&view=rev
Author:   panzaeron
Date:     2011-08-21 23:17:00 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
Design Alaska: Small fixes

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/alaska/basic.css
    CometVisu/trunk/visu/designs/alaska_slim/basic.css

Modified: CometVisu/trunk/visu/designs/alaska/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/basic.css	2011-08-21 21:37:07 UTC (rev 409)
+++ CometVisu/trunk/visu/designs/alaska/basic.css	2011-08-21 23:17:00 UTC (rev 410)
@@ -385,5 +385,7 @@
 
 .widget.link.pagelink div a
 {
+  display: inline-block;
+  width: 100%;
   text-decoration: none;
 }

Modified: CometVisu/trunk/visu/designs/alaska_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/basic.css	2011-08-21 21:37:07 UTC (rev 409)
+++ CometVisu/trunk/visu/designs/alaska_slim/basic.css	2011-08-21 23:17:00 UTC (rev 410)
@@ -365,5 +365,7 @@
 
 .widget.link.pagelink div a
 {
+  display: inline-block;
+  width: 100%;
   text-decoration: none;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[409] CometVisu/trunk/visu/designs/alaska

[<pan...@us...>]

Revision: 409
          http://openautomation.svn.sourceforge.net/openautomation/?rev=409&view=rev
Author:   panzaeron
Date:     2011-08-21 21:37:07 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
Design Alaska: Pagelinks with "Button-Design"

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/alaska/basic.css
    CometVisu/trunk/visu/designs/alaska/colors.css
    CometVisu/trunk/visu/designs/alaska_slim/basic.css
    CometVisu/trunk/visu/designs/alaska_slim/colors.css

Modified: CometVisu/trunk/visu/designs/alaska/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/basic.css	2011-08-18 22:23:14 UTC (rev 408)
+++ CometVisu/trunk/visu/designs/alaska/basic.css	2011-08-21 21:37:07 UTC (rev 409)
@@ -148,10 +148,11 @@
   position: relative;
 }
 
-.switchPressed, .switchUnpressed 
+.switchPressed, .switchUnpressed, .widget.link.pagelink div 
 {
   overflow: hidden;
   text-align: center;
+  white-space: nowrap;
   font: 14px/100%;
   padding: 1px;
   -webkit-border-radius: .5em; 
@@ -162,7 +163,7 @@
   margin: 5px;
 }
 
-.switchPressed, .switchUnpressed:active, 
+.switchPressed, .switchUnpressed:active
 {
   position: relative;
   top: 1px;
@@ -183,7 +184,6 @@
   cursor: pointer;
 }
 
-
 .ui-slider { position: relative; text-align: left;}
 .ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
 .ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
@@ -375,3 +375,15 @@
   border-width: 1px;
 }
 
+/* Pagelinks as Button */
+.widget.link.pagelink div 
+{
+  width: 48%;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.widget.link.pagelink div a
+{
+  text-decoration: none;
+}

Modified: CometVisu/trunk/visu/designs/alaska/colors.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/colors.css	2011-08-18 22:23:14 UTC (rev 408)
+++ CometVisu/trunk/visu/designs/alaska/colors.css	2011-08-21 21:37:07 UTC (rev 409)
@@ -86,7 +86,7 @@
 }
 
 /* gradient */
-body, div#top, .switchUnpressed, .switchPressed:active, .widget .ui-slider-handle, .popup_background, .clearfix 
+body, div#top, .switchUnpressed, .switchPressed:active, .widget .ui-slider-handle, .popup_background, .clearfix, .widget.link.pagelink div
 {
   background: #fff;
   background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ededed));
@@ -167,7 +167,7 @@
 }
 
 /* border */
-div#top, .ui-state-default, .ui-widget-content, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #pages .hr, .widget, .switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .popup_background, #diagramTooltip, .widget IFRAME, .clearfix 
+div#top, .ui-state-default, .ui-widget-content, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #pages .hr, .widget, .switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .popup_background, #diagramTooltip, .widget IFRAME, .clearfix, .widget.link.pagelink div
 {
   border-color: #686868;
 }
@@ -177,14 +177,10 @@
   background: #ececec;
 }
 
-
-
 /* shadow */
-.switchPressed, .switchUnpressed, .widget .ui-slider, .clearfix, .popup_background, .widget IFRAME 
+.switchPressed, .switchUnpressed, .widget .ui-slider, .clearfix, .popup_background, .widget IFRAME, .widget.link.pagelink div
 {
   -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2);
   -moz-box-shadow: 0 1px 2px rgba(0,0,0,.2);
   box-shadow: 0 1px 2px rgba(0,0,0,.2);
 }
-
-

Modified: CometVisu/trunk/visu/designs/alaska_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/basic.css	2011-08-18 22:23:14 UTC (rev 408)
+++ CometVisu/trunk/visu/designs/alaska_slim/basic.css	2011-08-21 21:37:07 UTC (rev 409)
@@ -143,29 +143,27 @@
   position: relative;
 }
 
-.switchPressed, .switchUnpressed 
+.switchPressed, .switchUnpressed, .widget.link.pagelink div
 {
   overflow: hidden;
   text-align: center;
+  white-space: nowrap;
   font: 14px/100%;
   padding: 1px;
   -webkit-border-radius: .5em; 
   -moz-border-radius: .5em;
   border-radius: .5em;
+  border-style: solid;
+  border-width: 1px;
   margin: 5px;
 }
 
-.switchPressed 
+.switchPressed, .switchUnpressed:active
 {
    position: relative;
 	top: 1px;
 }
 
-.switchUnpressed:active {
-  position: relative;
-  top: 1px;
-}
-
 .switchPressed:active {
    position: relative;
    top: 2px;
@@ -356,3 +354,16 @@
   -moz-border-radius: .5em;
   border-radius: .5em;
 }
+
+/* Pagelinks as Button */
+.widget.link.pagelink div 
+{
+  width: 70%;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.widget.link.pagelink div a
+{
+  text-decoration: none;
+}

Modified: CometVisu/trunk/visu/designs/alaska_slim/colors.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/colors.css	2011-08-18 22:23:14 UTC (rev 408)
+++ CometVisu/trunk/visu/designs/alaska_slim/colors.css	2011-08-21 21:37:07 UTC (rev 409)
@@ -86,7 +86,7 @@
 }
 
 /* gradient */
-body, div#top, .switchUnpressed, .switchPressed:active, .widget .ui-slider-handle, .popup_background, .clearfix 
+body, div#top, .switchUnpressed, .switchPressed:active, .widget .ui-slider-handle, .popup_background, .clearfix, .widget.link.pagelink div
 {
   background: #fff;
   background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ededed));
@@ -167,7 +167,7 @@
 }
 
 /* border */
-div#top, .ui-state-default, .ui-widget-content, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #pages .hr, .widget, .switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .popup_background, #diagramTooltip, .widget IFRAME, .clearfix 
+div#top, .ui-state-default, .ui-widget-content, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, #pages .hr, .widget, .switchPressed, .switchUnpressed, .widget .ui-slider, .widget .ui-slider-handle, .popup_background, #diagramTooltip, .widget IFRAME, .clearfix, .widget.link.pagelink div
 {
   border-color: #686868;
 }
@@ -180,7 +180,7 @@
 
 
 /* shadow */
-.switchPressed, .switchUnpressed, .widget .ui-slider, .clearfix, .popup_background, .widget IFRAME 
+.switchPressed, .switchUnpressed, .widget .ui-slider, .clearfix, .popup_background, .widget IFRAME, .widget.link.pagelink div 
 {
   -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2);
   -moz-box-shadow: 0 1px 2px rgba(0,0,0,.2);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[408] CometVisu/trunk/visu/designs/alaska

[<pan...@us...>]

Revision: 408
          http://openautomation.svn.sourceforge.net/openautomation/?rev=408&view=rev
Author:   panzaeron
Date:     2011-08-18 22:23:14 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
Design Alaska: Color-Bug im Widget Info behoben

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/alaska/colors.css
    CometVisu/trunk/visu/designs/alaska_slim/colors.css

Modified: CometVisu/trunk/visu/designs/alaska/colors.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/colors.css	2011-08-14 14:28:13 UTC (rev 407)
+++ CometVisu/trunk/visu/designs/alaska/colors.css	2011-08-18 22:23:14 UTC (rev 408)
@@ -68,6 +68,23 @@
   color: #f3c3d9;
 }
 
+/* Widget Info */
+.widget.info .actor.red div {
+  color: #d81b21;
+}
+
+.widget.info .actor.green div {
+  color: #64991e;
+}
+
+.widget.info .actor.purple div {
+  color: #f895c2;
+}
+
+.widget.info .actor.blue div {
+  color: #0095cd;
+}
+
 /* gradient */
 body, div#top, .switchUnpressed, .switchPressed:active, .widget .ui-slider-handle, .popup_background, .clearfix 
 {

Modified: CometVisu/trunk/visu/designs/alaska_slim/colors.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/colors.css	2011-08-14 14:28:13 UTC (rev 407)
+++ CometVisu/trunk/visu/designs/alaska_slim/colors.css	2011-08-18 22:23:14 UTC (rev 408)
@@ -68,6 +68,23 @@
   color: #f3c3d9;
 }
 
+/* Widget Info */
+.widget.info .actor.red div {
+  color: #d81b21;
+}
+
+.widget.info .actor.green div {
+  color: #64991e;
+}
+
+.widget.info .actor.purple div {
+  color: #f895c2;
+}
+
+.widget.info .actor.blue div {
+  color: #0095cd;
+}
+
 /* gradient */
 body, div#top, .switchUnpressed, .switchPressed:active, .widget .ui-slider-handle, .popup_background, .clearfix 
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[407] tools

[<ma...@us...>]

Revision: 407
          http://openautomation.svn.sourceforge.net/openautomation/?rev=407&view=rev
Author:   makki1
Date:     2011-08-14 14:28:13 +0000 (Sun, 14 Aug 2011)

Log Message:
-----------
Simple ETS4 .knxproj parser-tool

Added Paths:
-----------
    tools/
    tools/ets4tools/
    tools/ets4tools/ets4parser.pl

Added: tools/ets4tools/ets4parser.pl
===================================================================
--- tools/ets4tools/ets4parser.pl	                        (rev 0)
+++ tools/ets4tools/ets4parser.pl	2011-08-14 14:28:13 UTC (rev 407)
@@ -0,0 +1,152 @@
+#!/usr/bin/perl -w
+# a simple ETS4 project-parser, just a skeleton playing with and printing out some data
+#
+# (C) 2011 Michael Markstaller <de...@wi...> / Elaborated Networks GmbH
+# All Rights Reserved
+#
+# This program 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 2 of the License, or (at your option)
+# any later version.
+#
+# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+
+use XML::Simple;
+use Data::Dumper;
+use POSIX;
+
+no warnings qw(uninitialized);
+
+if (! glob("P-*/0.xml")) { # unzip
+	my $projectfile = glob("*.knxproj");	
+	`unzip -o $projectfile`;
+	print "unzipped $projectfile\n";
+}
+
+my $file0 = glob("P-*/0.xml");
+open(my $fh, "<:encoding(ISO-8859-1)", $file0) || die "can't open file: $!";
+open(my $knxmfh, "<:encoding(ISO-8859-1)", 'knx_master.xml') || die "can't open file: $!";
+
+#special case: only one MG/GA etc. fixed with forcearray
+my $proj = XMLin($fh, ForceArray => ['GroupRange','GroupAddress','Area','Line','DeviceInstance','ComObjectInstanceRef','Send','Receive']);
+my $knxmaster = XMLin($knxmfh, KeyAttr => "Id");
+$Data::Dumper::Indent = 1; 
+#print Dumper($proj->{Project}->{Installations}->{Installation}->{GroupAddresses});
+#print Dumper($knxmaster);
+
+my %groupaddresses;
+
+for my $HG ( @{ $proj->{Project}->{Installations}->{Installation}->{GroupAddresses}->{GroupRanges}->{GroupRange} } ) {
+   print floor($HG->{RangeStart}/2048);  
+	print " $HG->{Name}\n";
+	for my $MG ( @{$HG->{GroupRange}} ) {
+		print "    ";
+ 	   print floor(($MG->{RangeEnd}-$HG->{RangeStart})/256);  
+		print " $MG->{Name}\n";
+		for my $GA ( @{$MG->{GroupAddress}} ) {
+			print "        ";
+	 	   print $GA->{Address};  
+			print " $GA->{Name} $GA->{Id}\n";
+			$groupaddresses{$GA->{Id}}{'Address'} = $GA->{Address};
+			$groupaddresses{$GA->{Id}}{'Name'} = $GA->{Name};
+		}
+	}
+}
+
+print "\nTopology\n\n";
+
+for my $Area ( @{ $proj->{Project}->{Installations}->{Installation}->{Topology}->{Area} } ) {
+	print "Area $Area->{Address} $Area->{Name} \n";
+	parseDevices($Area);
+	for my $Line ( @{ $Area->{Line} } ) {
+		print "Line $Area->{Address}.$Line->{Address} $Line->{Name} \n";
+		#Parse devices
+		parseDevices($Line);
+	}
+}
+
+sub parseDevices {
+	$line = shift;
+	return unless defined $line->{DeviceInstance};
+	for my $Device ( @{ $line->{DeviceInstance} } ) {
+		print "   Device $Device->{Address} $Device->{Description} \n";
+		for my $Comobj ( @{$Device->{ComObjectInstanceRefs}->{ComObjectInstanceRef}} ) {
+			# if $Comobj->{DatapointType} is undef we could now look on ProductRefId="M-0001_H-hp.5F00199-1_P-5WG1.20141.2D1AB01" Hardware2ProgramRefId="M-0001_H-hp.5F00199-1_HP-8027-01-79C2" 
+			# open M-xxxx/Hardware.xml - get the real product-xml, open M-0001_A-8027-01-79C2.xml
+			# and get at least the size from there: ComObjectTable->ComObject->ObjectSize
+			for my $Conn ( @{ $Comobj->{Connectors}->{Send} } ) {
+				$groupaddresses{$Conn->{GroupAddressRefId}}{'DatapointType'} = $Comobj->{DatapointType} if defined $Comobj->{DatapointType};
+				print "     GA ".addr2str($groupaddresses{$Conn->{GroupAddressRefId}}{Address},1) ." :". $Comobj->{DatapointType} ."\n";
+			}
+			for my $Conn ( @{ $Comobj->{Connectors}->{Receive} } ) {
+				$groupaddresses{$Conn->{GroupAddressRefId}}{'DatapointType'} = $Comobj->{DatapointType} if defined $Comobj->{DatapointType};
+				print "     GA ".addr2str($groupaddresses{$Conn->{GroupAddressRefId}}{Address},1) ." :". $Comobj->{DatapointType} ."\n";
+			}
+		}
+	}
+}
+
+# dump resulting GA-Hash
+for (keys %groupaddresses) {
+	print "GA " . addr2str($groupaddresses{$_}{Address},1);
+	print "\t " . $groupaddresses{$_}{Name};
+	# DatapointType can be DPT or DPST(subtype)
+	if ($groupaddresses{$_}{DatapointType} =~ m/^DPT/) {
+		printf("\t %d.000 \t",$knxmaster->{MasterData}->{DatapointTypes}->{DatapointType}->{$groupaddresses{$_}{DatapointType}}->{Number});
+		print $knxmaster->{MasterData}->{DatapointTypes}->{DatapointType}->{$groupaddresses{$_}{DatapointType}}->{Text};
+	} elsif ($groupaddresses{$_}{DatapointType} =~ m/^DPST/) {
+		my ($dummy,$parentDPT,$subDPT) = split(/-/,$groupaddresses{$_}{DatapointType},3);
+		printf("\t %d.%03d \t",$parentDPT,$subDPT);
+		print $knxmaster->{MasterData}->{DatapointTypes}->{DatapointType}->{"DPT-".$parentDPT}->{DatapointSubtypes}->{DatapointSubtype}->{$groupaddresses{$_}{DatapointType}}->{Name};
+		print "\t" . $knxmaster->{MasterData}->{DatapointTypes}->{DatapointType}->{"DPT-".$parentDPT}->{DatapointSubtypes}->{DatapointSubtype}->{$groupaddresses{$_}{DatapointType}}->{Text};
+	} else { #guess default
+		print "\tis unknown";		
+		# assume default 1.001
+	}
+	print "\n";
+	# fill own config etc here
+}
+
+print "ETS: ". $proj->{ToolVersion} ."\n";
+
+#Version-check 4.0.1387.12605
+my @etsversion = split(/\./, $proj->{ToolVersion});
+if ($etsversion[2] < 1387) {
+	print "error ETS " . $proj->{ToolVersion} . " too old - must be 4.0.3 or higher\n";
+	exit;
+}
+
+
+# addr2str: Convert an integer to an EIB address string, in the form "1/2/3" or "1.2.3"
+sub addr2str {
+    my $a = $_[0];
+    my $b = $_[1] || 0;  # 1 if local (group) address, else physical address
+    my $str ;
+    if ($b == 1) { # logical address used
+        $str = sprintf "%d/%d/%d", ($a >> 11) & 0xf, ($a >> 8) & 0x7, $a & 0xff;
+    }
+    else { # physical address used
+        $str = sprintf "%d.%d.%d", $a >> 12, ($a >> 8) & 0xf, $a & 0xff;
+    }
+    return $str;
+}
+
+# str2addr: Convert an EIB address string in the form "1/2/3" or "1.2.3" to an integer
+sub str2addr {
+    my $str = $_[0];
+    if ($str =~ /(\d+)\/(\d+)\/(\d+)/) { # logical address
+        return ($1 << 11) | ($2 << 8) | $3;
+    } elsif ($str =~ /(\d+)\.(\d+)\.(\d+)/) { # physical address
+        return ($1 << 12) | ($2 << 8) | $3;
+    } else {
+    	#bad
+    	return;
+    }
+}


Property changes on: tools/ets4tools/ets4parser.pl
___________________________________________________________________
Added: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openautomation-svn] SF.net SVN: openautomation:[406] wiregate/tools/knxquery/knxquery.pl

[<e....@us...>]

Revision: 406
          http://openautomation.svn.sourceforge.net/openautomation/?rev=406&view=rev
Author:   e.max
Date:     2011-08-14 11:06:15 +0000 (Sun, 14 Aug 2011)

Log Message:
-----------
mehrfach GA Verarbeitung, siehe perldoc

Modified Paths:
--------------
    wiregate/tools/knxquery/knxquery.pl

Modified: wiregate/tools/knxquery/knxquery.pl
===================================================================
--- wiregate/tools/knxquery/knxquery.pl	2011-08-13 18:12:44 UTC (rev 405)
+++ wiregate/tools/knxquery/knxquery.pl	2011-08-14 11:06:15 UTC (rev 406)
@@ -49,20 +49,12 @@
     # koennte man mit dem Dumper machen ... 
     #    print Dumper(%eibgaconf), "\n";
     # ... soll aber schoener aussehen:
-
-    my ($dptid, $dptsubid, $dptname, $gaName) = ('','','');
-
     &printGaInfo($_) foreach (sort keys %eibgaconf);
 } # dumpGa
 
 sub printGaInfo
 {
     my $ga = shift || die "\n\n fehlender GA-paramater in printGaInfo()\n\n";
-
-    # koennte man mit dem Dumper machen ... 
-    #    print Dumper(%eibgaconf), "\n";
-    # ... soll aber schoener aussehen:
-
     my ($dptid, $dptsubid, $dptname, $gaName) = ('','','');
 
     if (!exists $eibgaconf{$ga})


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.