Menu
▾
▴
openautomation-svn — Mailinglist that shows all subversion commits
You can subscribe to this list here.
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(121) |
Dec
(58) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2011 |
Jan
(38) |
Feb
(36) |
Mar
(7) |
Apr
(2) |
May
(32) |
Jun
(24) |
Jul
(16) |
Aug
(21) |
Sep
(17) |
Oct
(62) |
Nov
(60) |
Dec
(70) |
| 2012 |
Jan
(54) |
Feb
(41) |
Mar
(21) |
Apr
(38) |
May
(76) |
Jun
(47) |
Jul
(25) |
Aug
(72) |
Sep
(29) |
Oct
(64) |
Nov
(93) |
Dec
(97) |
| 2013 |
Jan
(100) |
Feb
(168) |
Mar
(115) |
Apr
(59) |
May
(37) |
Jun
(32) |
Jul
(45) |
Aug
(42) |
Sep
(24) |
Oct
(73) |
Nov
(64) |
Dec
(4) |
| 2014 |
Jan
(14) |
Feb
(57) |
Mar
(58) |
Apr
(10) |
May
(18) |
Jun
(12) |
Jul
(7) |
Aug
(12) |
Sep
(15) |
Oct
(6) |
Nov
(32) |
Dec
(17) |
| 2015 |
Jan
(50) |
Feb
(5) |
Mar
(1) |
Apr
(26) |
May
(10) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(3) |
Oct
(18) |
Nov
(18) |
Dec
(8) |
| 2016 |
Jan
(33) |
Feb
(35) |
Mar
(50) |
Apr
(20) |
May
(25) |
Jun
(17) |
Jul
(8) |
Aug
(73) |
Sep
(64) |
Oct
(51) |
Nov
(20) |
Dec
(14) |
| 2017 |
Jan
(41) |
Feb
(57) |
Mar
(44) |
Apr
(136) |
May
(32) |
Jun
(39) |
Jul
(2) |
Aug
(12) |
Sep
(32) |
Oct
(103) |
Nov
(12) |
Dec
(4) |
| 2018 |
Jan
(9) |
Feb
(1) |
Mar
(60) |
Apr
(24) |
May
(15) |
Jun
(1) |
Jul
(2) |
Aug
(23) |
Sep
(15) |
Oct
(57) |
Nov
(21) |
Dec
(77) |
| 2019 |
Jan
(62) |
Feb
(99) |
Mar
(98) |
Apr
(49) |
May
(6) |
Jun
(3) |
Jul
(6) |
Aug
(18) |
Sep
(9) |
Oct
(15) |
Nov
(30) |
Dec
(6) |
| 2020 |
Jan
(14) |
Feb
(2) |
Mar
(22) |
Apr
(33) |
May
(47) |
Jun
(12) |
Jul
|
Aug
|
Sep
(4) |
Oct
(2) |
Nov
(5) |
Dec
(5) |
| 2021 |
Jan
(4) |
Feb
(101) |
Mar
(13) |
Apr
(32) |
May
(40) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
(25) |
Nov
(12) |
Dec
|
| 2022 |
Jan
(154) |
Feb
(82) |
Mar
(63) |
Apr
(27) |
May
(26) |
Jun
(5) |
Jul
(12) |
Aug
(23) |
Sep
(17) |
Oct
(37) |
Nov
(13) |
Dec
(21) |
| 2023 |
Jan
(43) |
Feb
(43) |
Mar
(15) |
Apr
(8) |
May
(3) |
Jun
(25) |
Jul
(6) |
Aug
(38) |
Sep
(5) |
Oct
(20) |
Nov
(9) |
Dec
(28) |
| 2024 |
Jan
(15) |
Feb
(2) |
Mar
(12) |
Apr
(2) |
May
(8) |
Jun
(10) |
Jul
(10) |
Aug
(2) |
Sep
(3) |
Oct
(15) |
Nov
(6) |
Dec
(20) |
| 2025 |
Jan
|
Feb
(2) |
Mar
(6) |
Apr
(2) |
May
(2) |
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
(11) |
Nov
(2) |
Dec
|
|
From: <ma...@us...> - 2011-06-05 16:50:28
|
Revision: 355
http://openautomation.svn.sourceforge.net/openautomation/?rev=355&view=rev
Author: mayerch
Date: 2011-06-05 16:50:22 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
Styling...
Modified Paths:
--------------
CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
Modified: CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2011-06-05 16:48:00 UTC (rev 354)
+++ CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2011-06-05 16:50:22 UTC (rev 355)
@@ -32,7 +32,7 @@
$p.find('address').each( function(){
var src = this.textContent;
var transform = this.getAttribute('transform');
- var color = this.getAttribute('variant' );
+ var color = this.getAttribute('variant' );
var readonly = this.getAttribute('readonly' );
ga_list.push( src );
address[ '_' + src ] = [ transform, color, readonly=='true' ];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-06-05 16:48:06
|
Revision: 354
http://openautomation.svn.sourceforge.net/openautomation/?rev=354&view=rev
Author: mayerch
Date: 2011-06-05 16:48:00 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
Change the ColorChooser plugin from using <address ... color="..."> to the new common attribute "variant"
Modified Paths:
--------------
CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2011-06-04 22:21:46 UTC (rev 353)
+++ CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2011-06-05 16:48:00 UTC (rev 354)
@@ -32,7 +32,7 @@
$p.find('address').each( function(){
var src = this.textContent;
var transform = this.getAttribute('transform');
- var color = this.getAttribute('color' );
+ var color = this.getAttribute('variant' );
var readonly = this.getAttribute('readonly' );
ga_list.push( src );
address[ '_' + src ] = [ transform, color, readonly=='true' ];
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-06-04 22:21:46 UTC (rev 353)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-06-05 16:48:00 UTC (rev 354)
@@ -239,9 +239,9 @@
</page>
<colorchooser>
<label>A colorChooser</label>
- <address transform="DPT:5.001" color="r">1/2/59</address>
- <address transform="DPT:5.001" color="g">1/2/60</address>
- <address transform="DPT:5.001" color="b">1/2/61</address>
+ <address transform="DPT:5.001" variant="r">1/2/59</address>
+ <address transform="DPT:5.001" variant="g">1/2/60</address>
+ <address transform="DPT:5.001" variant="b">1/2/61</address>
</colorchooser>
<break/>
<info format="%.2f">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-06-04 22:21:53
|
Revision: 353
http://openautomation.svn.sourceforge.net/openautomation/?rev=353&view=rev
Author: makki1
Date: 2011-06-04 22:21:46 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
New variant of the shutter-plugin
Added Paths:
-----------
wiregate/plugin/generic/Rolladen-Automatik2.pl
Added: wiregate/plugin/generic/Rolladen-Automatik2.pl
===================================================================
--- wiregate/plugin/generic/Rolladen-Automatik2.pl (rev 0)
+++ wiregate/plugin/generic/Rolladen-Automatik2.pl 2011-06-04 22:21:46 UTC (rev 353)
@@ -0,0 +1,196 @@
+######################################################################################
+#
+# Plugin RollladenAutomatik
+# V0.2 2011-05-30
+# Benötigt: libastro-satpass-perl
+#
+# Ein Wiregate Plugin zum automatischen Fahren der Rollläden. Es berechnet unter Anderem
+# den Stand der Sonne und fährt je nach Winkel der Sonne zum Fenster, den Rollladen in
+# eine Beschattungsposition. Folgende Funktionen werden unterstützt:
+# - Sonnenstand (Azimuth)
+# - Anfangs- und Endwinkel (Azimuth) ab dem das Fenster beschienen wird
+# - Globale Sperre duch eine Gruppenadresse
+# - Sperre eines einzelnen Rollladens durch eine Gruppenadresse
+# - Fahren des Rollladen zu (1) oder auf (0) oder Positionsfahren mit Prozentwert
+# - Bugfix für Busch-Jäger USB Schnittstelle (muss eingeschaltet werden)
+#
+# TODO: Was teilweise integriert ist aber noch nicht komplett ist:
+# - Zufahren bei Dunkelheit am Abend und Hell am Morgen
+# - Nur zufahren, wenn es im Raum warm genug ist
+# - Wetterstation einbinden: Helligkeit, Sonnenschein, Dämmerung
+# - Bei Fensterdefinition auch Elevation oben bzw. unten angeben
+# - Jalousie Lamellenführung
+# - Vorwarnpositionsfahrten?
+# - Englisch oder Deutsch?
+# - Aussentemperatur: im Winter ist es draussen kalt :-)
+#
+######################################################################################
+
+
+#########################
+### BEGINN DEFINITION ###
+#########################
+
+# Die Koordinaten des Hauses. Sehr einfach über http://www.getlatlon.com/ zu ermitteln.
+# Und die Höhe über NN
+my ($lat, $lon, $elev) = (
+ 49.02917390736781, # Breitengrad in Grad
+ 8.570709228515625, # Längengrad in Grad
+ 180 / 1000 # Höhe über NN in Kilometer (dewegen geteilt durch 1000)
+ );
+
+# Gruppenadresse, über welche die komplette Automatik für alle Rollläden gesperrt werden kann
+my $GASperreAlle = "0/0/125";
+
+# Bugfix für KNX-Schnittstellen die sich bei zu schneller Telegrammabfolge
+# verschlucken, und denen wir deshalb die Geschwindigkeit der Telegramme drosseln müssen
+# 0 = nicht anschalten (Telegramme mit voller Geschwindigkeit abfeuern)
+# 1 = anschalten (Telegramme um 20 millisekunden verzögern)
+# nur für "Busch-Jäger 6196 USB REG" ist bekannt das dies benötigt wird
+my $bugfixSlowInterface = 0;
+
+# Ein Array von Hashes, wobei jeder Hash ein Rollladen/Fenster/Raum ist.
+my @AlleRolllaeden;
+# Name des Rolladen
+# name => "Speisekammer"
+# Winkel zum Norden, ab dem das Fenster beschienen wird.
+# Echter Osten = 90°, echter Süden = 180°, echter Westen = 270°, echter Norden = 0°
+# winkel1 => 66
+# Winkel zum Norden, bis zu dem das Fenster beschienen wird
+# winkel2 => 186
+# Richtung bei Beschattung: wenn 1 wird DPT3 angenommen und ganz zugefahren.
+# Bei ungleich 1, wird DPT5 angenommen und Position angefahren
+# richtungZu => 1
+# Richtung bei keiner Beschattung: wenn 0 wird DPT3 angenommen und ganz aufgefahren.
+# Bei ungleich 0, wird DPT5 angenommen und Position angefahren
+# richtungAuf => 0
+# Ob der Rollladen in die Automatik für Sonnenauf- und untergang einbezogen werden soll
+# sonnenAufUnter => 1
+# Raum-Solltemperatur, wenn keine GA angegeben wurde oder kein Wert vom Bus gelesen wurde
+# raumSollTemp => 22
+# GA der Raum-Solltemperatur
+# GAraumsollTemp => "0/0/127"
+# GA der Raum-Isttemperatur
+# GAraumIstTemp => "0/0/128"
+# GA um Rollladen zu fahren TODO:Sollte man hier mehrere GAs angeben können?
+# GAfahren => "0/0/126"
+# GA um die Automatik dieses einen Rollladen zu sperren
+# GAsperre=> "0/0/129"
+push @AlleRolllaeden, { name => "Speisekammer", winkel1 => 66, winkel2 => 186, richtungZu => 1, richtungAuf => 0,
+ sonnenAufUnter => 1, raumSollTemp => 22, GAraumSollTemp => "0/0/127", GAraumIstTemp => "0/0/128",
+ GAfahren => "2/1/11", GAsperre => "0/0/129" };
+push @AlleRolllaeden, { name => "Kind Strasse", winkel1 => 182, winkel2 => 290, richtungZu => 86, richtungAuf => 2,
+ sonnenAufUnter => 1, raumSollTemp => 22, GAraumSollTemp => "0/0/127", GAraumIstTemp => "0/0/128",
+ GAfahren => "2/3/13", GAsperre => "0/0/129" };
+push @AlleRolllaeden, { name => "Küche", winkel1 => 194, winkel2 => 310, richtungZu => 80, richtungAuf => 2,
+ sonnenAufUnter => 1, raumSollTemp => 22, GAraumSollTemp => "0/0/127", GAraumIstTemp => "0/0/128",
+ GAfahren => "2/2/3", GAsperre => "0/0/129" };
+
+#######################
+### ENDE DEFINITION ###
+#######################
+
+
+# Festlegen, dass das Plugin alle 5 Minuten laufen soll
+$plugin_info{$plugname.'_cycle'} = 300;
+
+# Auf die GA der globalen Sperre anmelden
+#TODO: muss man sich überhaupt auf die GA anmelden. Sollte doch reichen wenn man den letzten Stand liest...
+$plugin_subscribe{$GASperreAlle}{$plugname} = 1;
+# Fals global gesperrt, Plugin-Durchgang beenden
+if (knx_read($GASperreAlle, 0, 1) == 1) {
+ return "Global gesperrt";
+}
+
+# Sonnenstands-Berechnungen durchführen
+my ($azimuth, $elevation) = berechneSonnenstand($lat, $lon, $elev);
+# Auslesen wo die Sonne beim letzten Durchgang war
+my $lastAzimuth = $plugin_info{$plugname.'_lastAzimuth'};
+
+#berechneSonnenaufgang();
+#berechneSonnenuntergang();
+
+#Los gehts. Jeden Rolladen/Fenster/Raum abarbeiten.
+foreach my $element (@AlleRolllaeden) {
+ # Falls gesperrt, mit nächstem Rollladen fortfahren
+ if (knx_read($element->{GAsperre}, 0, 1) == 1) {
+ next;
+ }
+ # Die Einfallwinkel in Radians umrechnen
+ my $winkel1 = deg2rad($element->{winkel1});
+ my $winkel2 = deg2rad($element->{winkel2});
+
+ # Beachtet werden muss: Letzter Zustand; Sonnenstand; Tag oder Nacht; IstTemp;
+ my $testAktuellBeschienen = ($azimuth > $winkel1 && $azimuth < $winkel2) || 0;
+ my $testVoherBeschienen = ($lastAzimuth > $winkel1 && $lastAzimuth < $winkel2) || 0;
+ my $testAbendDaemmerung;
+ my $testMorgenDaemmerung;
+
+ # Falls Rollladen in Offen-Position ist
+ if (!$testVoherBeschienen && $testAktuellBeschienen) {
+ fahreRollladen($element->{richtungZu}, $element->{GAfahren});
+ plugin_log($plugname,"Name: " . $element->{name} . "; Zufahren bei: " . round(rad2deg($azimuth)));
+ }
+ # Falls Rollladen in Geschlossen-Position ist
+ if ($testVoherBeschienen && !$testAktuellBeschienen) {
+ fahreRollladen($element->{richtungAuf}, $element->{GAfahren});
+ plugin_log($plugname,"Name: " . $element->{name} . "; Auffahren bei: " . round(rad2deg($azimuth)));
+ }
+}
+
+# Für die nächste Iteration den aktuellen Sonnenstand merken
+# TODO: Müsste man sich nicht eigentlich für jedes Element den Zustand merken, ob es auf- oder zugefahren wurde???
+# lastAzimuth ging noch als nur der Sonnenstand entscheidend war, ob gefahren wird. Jetzt aber auch lokale Sperre,
+# IstTemperatur, Tag/Nacht etc.
+$plugin_info{$plugname.'_lastAzimuth'} = $azimuth;
+# Ende
+return "Grad gegen Norden: " . round(rad2deg($azimuth)) . "; Grad über Horizont: " . round(rad2deg($elevation));
+
+
+####################################################
+# Aufruf mit berechneSonnenstand($lat, $lon, $elev);
+####################################################
+sub berechneSonnenstand {
+ # Module laden
+ use Astro::Coord::ECI;
+ use Astro::Coord::ECI::Sun;
+ use Astro::Coord::ECI::TLE;
+ use Astro::Coord::ECI::Utils qw{rad2deg deg2rad};
+ # Aktuelle Zeit
+ my $time = time ();
+ # Die eigenen Koordinaten
+ my $loc = Astro::Coord::ECI->geodetic(deg2rad(shift), deg2rad(shift), shift);
+ # Sonne instanzieren
+ my $sun = Astro::Coord::ECI::Sun->universal($time);
+ # Feststellen wo die Sonne gerade ist
+ my ($azimuth, $elevation, $range) = $loc->azel($sun);
+ return ($azimuth, $elevation);
+}
+
+
+####################################################
+# Aufruf mit fahreRollladen($richtung, $GA);
+####################################################
+sub fahreRollladen {
+ # Falls $richtung 0 oder 1 ist, wird angenommen, dass der Rollladen
+ # komplett zu- bzw. aufgefahren werden soll (DPT3).
+ # Bei $richtung>1 wird angenommen, dass eine Positionsfahrt
+ # durchgeführt werden soll (DPT5).
+ # TODO: man muss bei Positionsfahrt für den Offen-Zustand mindestens 2% angeben...
+ # hm, wenn man die GAs ins Wiregate importiert hat, braucht man keinerlei
+ # Unterscheidung mehr! Und man kann auch 0% bzw 1% benutzen
+ my ($richtung, $GA) = @_;
+ if ($richtung == 0 || $richtung == 1) {
+ # Auf/Zu fahren
+ knx_write($GA,$richtung,3);
+ }
+ else {
+ # Position anfahren
+ knx_write($GA,$richtung,5);
+ }
+ # kurze Pause, falls das benutzte Interface das braucht...
+ if ($bugfixSlowInterface) {
+ usleep(20000);
+ }
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-06-03 22:05:51
|
Revision: 352
http://openautomation.svn.sourceforge.net/openautomation/?rev=352&view=rev
Author: mayerch
Date: 2011-06-03 22:05:45 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
Changed behaviour of the slider to not send any packets when it's changed by an external packet - even if it can't display that value
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-31 20:05:55 UTC (rev 351)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-06-03 22:05:45 UTC (rev 352)
@@ -222,7 +222,8 @@
'min' : min,
'max' : max,
'step' : step,
- 'type' : 'dim'
+ 'type' : 'dim',
+ 'valueInternal': true
});
for( var addr in address ) $actor.bind( addr, this.update );
$actor.slider({
@@ -242,7 +243,9 @@
if( element.data( 'value' ) != value )
{
element.data( 'value', value );
+ element.data( 'valueInternal', false );
element.slider('value', value);
+ element.data( 'valueInternal', true );
}
},
/**
@@ -251,6 +254,7 @@
slideStart:function(event,ui)
{
var actor = $( '.actor', $(this).parent() );
+ actor.data( 'valueInternal', true );
actor.data( 'updateFn', setInterval( function(){
var data = actor.data();
if( data.value == actor.slider('value') ) return;
@@ -272,7 +276,7 @@
{
var data = $(this).data();
clearInterval( data.updateFn, ui.value);
- if( data.value != ui.value )
+ if( data.valueInternal && data.value != ui.value )
for( var addr in data.address )
{
if( data.address[addr][1] == true ) continue; // skip read only
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-05-31 20:06:01
|
Revision: 351
http://openautomation.svn.sourceforge.net/openautomation/?rev=351&view=rev
Author: makki1
Date: 2011-05-31 20:05:55 +0000 (Tue, 31 May 2011)
Log Message:
-----------
Add WG-plugins for VPN/SSL controlled by KNX-GA
Added Paths:
-----------
wiregate/plugin/generic/SSL-User-by-GA
wiregate/plugin/generic/VPN-User-by-GA
Added: wiregate/plugin/generic/SSL-User-by-GA
===================================================================
--- wiregate/plugin/generic/SSL-User-by-GA (rev 0)
+++ wiregate/plugin/generic/SSL-User-by-GA 2011-05-31 20:05:55 UTC (rev 351)
@@ -0,0 +1,48 @@
+# Plugin zu (de)aktivieren von SSL(Apache)-Usern per KNX-GA
+# Einrichtung Apache mit Reverse-SSL Proxy sep. notwendig!
+# Hinweise:
+# Umlaute, Sonderzeichen, Leerzeichen etc. in VPN-Clientnamen vermeiden!
+# (default) hier nicht genannte VPN-User sind aktiviert
+
+# Eigenen Aufruf-Zyklus auf 300 Sekunden setzen
+$plugin_info{$plugname.'_cycle'} = 86400;
+##############################################################################
+### Definitionen
+##############################################################################
+my $install = 1; # Installiere skripte/config bei Bedarf
+my %ssl_usermap; # Eintrag darf nicht auskommentiert werden
+my %ssl_passwd; # Eintrag darf nicht auskommentiert werden
+my %ssl_usermap_status; # Eintrag darf nicht auskommentiert werden
+$ssl_usermap{'0/4/8'} = '/C=DE/ST=Bayern/L=Hohenbrunn/O=WireGate/OU=SSL-Userzertifikat/CN=zertifikat/emailAddress=ssl-user@wiregateXXX';
+$ssl_passwd{'0/4/8'} = 'password'; # xxj31ZMTZzkVA
+
+$ssl_usermap{'0/4/1'} = 'admin';
+$ssl_passwd{'0/4/1'} = 'password123';
+$ssl_usermap{'0/4/2'} = 'user1';
+$ssl_passwd{'0/4/2'} = 'password456';
+##############################################################################
+### Ende Definitionen
+##############################################################################
+
+if (%msg) {
+ if ($msg{'apci'} eq "A_GroupValue_Write" and $ssl_usermap{$msg{'dst'}}) {
+ if($msg{'data'}+0) {
+ #enable
+ my $dummy = `htpasswd -b /etc/apache2/htpasswd $ssl_usermap{$msg{'dst'}} "$ssl_passwd{$msg{'dst'}}"`;
+ return "enabled $ssl_usermap{$msg{'dst'}} by $msg{'dst'}: $dummy";
+ } else {
+ #disable
+ my $dummy = `htpasswd -D /etc/apache2/htpasswd $ssl_usermap{$msg{'dst'}}`;
+ return "DISabled $ssl_usermap{$msg{'dst'}} by $msg{'dst'}: $dummy";
+ }
+ }
+} else {
+ # cyclic/init/change
+ # subscribe GA's
+ while( my ($k, $v) = each(%ssl_usermap) ) {
+ # Plugin an Gruppenadresse "anmelden"
+ $plugin_subscribe{$k}{$plugname} = 1;
+ }
+}
+return;
+
Added: wiregate/plugin/generic/VPN-User-by-GA
===================================================================
--- wiregate/plugin/generic/VPN-User-by-GA (rev 0)
+++ wiregate/plugin/generic/VPN-User-by-GA 2011-05-31 20:05:55 UTC (rev 351)
@@ -0,0 +1,97 @@
+# Plugin zu (de)aktivieren von VPN-Usern per KNX-GA
+# Hinweise:
+# Umlaute, Sonderzeichen, Leerzeichen etc. in VPN-Clientnamen vermeiden!
+# Gross/Kleinschreibung beachten!
+# (default) hier nicht genannte VPN-User sind aktiviert
+
+# Eigenen Aufruf-Zyklus auf 300 Sekunden setzen
+$plugin_info{$plugname.'_cycle'} = 86400;
+my %vpn_usermap; # Eintrag darf nicht auskommentiert werden
+my %vpn_usermap_status; # Eintrag darf nicht auskommentiert werden
+
+##############################################################################
+### Definitionen
+##############################################################################
+my $install = 1; # Installiere skripte/config bei Bedarf
+# KNX-Ga zum freigeben der User - Namen wie in VPN-config
+$vpn_usermap{'0/7/202'} = "kunde-hsbetreuer";
+$vpn_usermap{'0/7/204'} = "kunde-notebook";
+$vpn_usermap{'0/7/206'} = "kunde-knx-betreuer";
+$vpn_usermap{'0/7/210'} = "kunde-netzwerkbetreuer";
+# KNX-GA Verbindungs-Status der User - Namen wie in VPN-config
+$vpn_usermap_status{'0/7/203'} = "kunde-hsbetreuer";
+$vpn_usermap_status{'0/7/205'} = "kunde-notebook";
+$vpn_usermap_status{'0/7/207'} = "kunde-knx-betreuer";
+$vpn_usermap_status{'0/7/211'} = "kunde-netzwerkbetreuer";
+##############################################################################
+### Ende Definitionen
+##############################################################################
+
+if (%msg) {
+ if ($msg{'apci'} eq "A_GroupValue_Write" and $vpn_usermap{$msg{'dst'}}) {
+ if($msg{'data'}+0) {
+ #enable
+ unlink("/etc/openvpn/servers/$vpn_usermap{$msg{'dst'}}.disabled");
+ return "enabled $vpn_usermap{$msg{'dst'}} by $msg{'dst'}";
+ } else {
+ #disable
+ my $dummy = `echo "disabled" > /etc/openvpn/servers/$vpn_usermap{$msg{'dst'}}.disabled`;
+ my $resp = `echo kill $vpn_usermap{$msg{'dst'}} | nc localhost 8001 -q 1`;
+ return "DISabled $vpn_usermap{$msg{'dst'}} by $msg{'dst'} - VPN-server said: $resp";
+ }
+ } elsif ($msg{'apci'} eq "A_GroupValue_Read" and $vpn_usermap{$msg{'dst'}}) {
+ my $status = 0;
+ $status = 1 unless (-e "/etc/openvpn/servers/$vpn_usermap{$msg{'dst'}}.disabled");
+ my @args = ($eib_grpresp_bin, $eib_url, $msg{'dst'},sprintf("%02X", $status));
+ system(@args);
+ } elsif ($msg{'apci'} eq "A_GroupValue_Read" and $vpn_usermap_status{$msg{'dst'}}) {
+ my $status = `grep "^$vpn_usermap_status{$msg{'dst'}}" /var/run/openvpn.server.status`;
+ $status = 1 unless (!$status);
+ my @args = ($eib_grpresp_bin, $eib_url, $msg{'dst'},sprintf("%02X", $status));
+ system(@args);
+ }
+} else {
+ # cyclic/init/change
+ # subscribe GA's
+ while( my ($k, $v) = each(%vpn_usermap) ) {
+ # Plugin an Gruppenadresse "anmelden"
+ $plugin_subscribe{$k}{$plugname} = 1;
+ }
+ open(OUT, ">/etc/openvpn/servers/VPNGA_MAP");
+ while( my ($k, $v) = each(%vpn_usermap_status) ) {
+ # Plugin an Gruppenadresse "anmelden"
+ $plugin_subscribe{$k}{$plugname} = 1;
+ # Write VPNGA_MAP
+ print OUT "$v=$k\n";
+ }
+ close(OUT);
+ # Self-installer ;) Multiline-print doesn't work somehow
+ return unless $install;
+ if (! -e '/etc/openvpn/connect.sh' or ! -e '/etc/openvpn/disconnect.sh') {
+ open(OUT, ">/etc/openvpn/connect.sh");
+ print OUT "#!/bin/bash\n\nif [ -e /etc/openvpn/servers/\$common_name.disabled ]; then\n";
+ print OUT "\tlogger -t VPN 'refused disabled VPN-user \$common_name from \$trusted_ip'\n";
+ print OUT "\texit 1\nelse \n";
+ print OUT "\tlogger -t VPN '\$common_name logged in from \$trusted_ip (\$ifconfig_pool_remote_ip)'\n";
+ print OUT "\tVPNGA=`grep \"^\$common_name=\" /etc/openvpn/servers/VPNGA_MAP | cut -d'=' -f 2`\n";
+ print OUT "\tgroupswrite local:/tmp/eib \$VPNGA 1\nfi\nexit 0\n";
+ close(OUT);
+ open(OUT, ">/etc/openvpn/disconnect.sh");
+ print OUT "#!/bin/bash\n\n";
+ print OUT "logger -t VPN '\$common_name logged out from \$trusted_ip (\$ifconfig_pool_remote_ip) T: \$time_duration S: \$bytes_sent R: \$bytes_received'\n";
+ print OUT "VPNGA=`grep \"^\$common_name\" /etc/openvpn/servers/VPNGA_MAP | cut -d'=' -f 2`\n";
+ print OUT "groupswrite local:/tmp/eib \$VPNGA 0\n";
+ close(OUT);
+ chmod 0755, "/etc/openvpn/connect.sh","/etc/openvpn/disconnect.sh";
+ `sync`;
+ }
+ if (! `grep '^client-connect' /etc/openvpn/server.conf` ) {
+ open(OUT, ">>/etc/openvpn/server.conf");
+ print OUT "script-security 2\nclient-connect connect.sh\nclient-disconnect disconnect.sh\n";
+ close OUT;
+ `/etc/init.d/openvpn restart`;
+ `sync`;
+ }
+}
+return;
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-05-30 16:59:30
|
Revision: 350
http://openautomation.svn.sourceforge.net/openautomation/?rev=350&view=rev
Author: j-n-k
Date: 2011-05-30 16:59:23 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Fix for bug #3309264, fix for broken infotrigger scheme
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config.xsd
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2011-05-29 16:01:00 UTC (rev 349)
+++ CometVisu/trunk/visu/visu_config.xsd 2011-05-30 16:59:23 UTC (rev 350)
@@ -160,9 +160,12 @@
<xsd:element name="page">
<xsd:complexType>
<xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <!-- visual effects -->
+ <xsd:element name="line" type="line" />
+ <xsd:element name="break" type="break" />
+ <xsd:element name="group" type="group" />
<!-- list all possbile widgets here -->
<xsd:element name="text" type="text" />
- <xsd:element name="line" type="line" />
<xsd:element name="switch" type="switch" />
<xsd:element name="toggle" type="switch" />
<xsd:element name="trigger" type="trigger" />
@@ -174,7 +177,6 @@
<xsd:element name="shade" type="info" />
<xsd:element name="image" type="image" />
<xsd:element name="video" type="video" />
- <xsd:element name="break" type="break" />
<xsd:element name="iframe" type="iframe" />
<!-- available plugins - include not checked -->
<xsd:element name="colorchooser" type="colorchooser" />
@@ -188,6 +190,37 @@
</xsd:complexType>
</xsd:element>
+<xsd:complexType name="group">
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <!-- visual effects -->
+ <xsd:element name="line" type="line" />
+ <xsd:element name="break" type="break" />
+ <!-- list all possbile widgets here -->
+ <xsd:element name="text" type="text" />
+ <xsd:element name="switch" type="switch" />
+ <xsd:element name="toggle" type="switch" />
+ <xsd:element name="trigger" type="trigger" />
+ <xsd:element name="multitrigger" type="multitrigger" />
+ <xsd:element name="infotrigger" type="infotrigger" />
+ <xsd:element name="designtoggle" type="designtoggle" />
+ <xsd:element name="slide" type="slide" />
+ <xsd:element name="info" type="info" />
+ <xsd:element name="shade" type="info" />
+ <xsd:element name="image" type="image" />
+ <xsd:element name="video" type="video" />
+ <xsd:element name="iframe" type="iframe" />
+ <!-- available plugins - include not checked -->
+ <xsd:element name="colorchooser" type="colorchooser" />
+ <xsd:element name="diagram_popup" type="diagram_popup" />
+ <xsd:element name="diagram_inline" type="diagram_inline" />
+ <xsd:element ref="page" />
+ </xsd:choice>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ <xsd:attribute ref="align" use="optional" />
+</xsd:complexType>
+
+
<!-- more fun part - all widgets - if you add a new widget, you need to define it here -->
<xsd:complexType name="text">
@@ -239,6 +272,7 @@
<xsd:attribute ref="styling" use="optional"/>
<xsd:attribute ref="align" use="optional" />
<xsd:attribute ref="format" use="optional" />
+ <xsd:attribute name="infoposition" type="xsd:decimal" use="optional" />
</xsd:complexType>
<xsd:complexType name="multitrigger">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-05-29 16:01:07
|
Revision: 349
http://openautomation.svn.sourceforge.net/openautomation/?rev=349&view=rev
Author: j-n-k
Date: 2011-05-29 16:01:00 +0000 (Sun, 29 May 2011)
Log Message:
-----------
changed infotrigger "info"-position, updated css
Modified Paths:
--------------
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2011-05-28 23:19:24 UTC (rev 348)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2011-05-29 16:01:00 UTC (rev 349)
@@ -216,26 +216,16 @@
.switchInvisible
{
- border-style: solid;
- border-width: 1px;
- border-color: #000 #000 #000 #000;
- -moz-border-radius: 7px;
- -webkit-border-radius: 7px;
- border-radius: 7px;
- padding: 1px;
+ border: none;
+ padding: 1px;
}
.switchInvisible div
{
- border-style: solid;
- border-width: 1px;
- border-color: #000 #000 #000 #000;
+ border: none;
padding: 5px;
width: 5em;
float: left;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
}
.ui-slider { position: relative; text-align: left; }
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-28 23:19:24 UTC (rev 348)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-05-29 16:01:00 UTC (rev 349)
@@ -652,13 +652,13 @@
var buttons = $('<div style="float:left;"/>');
var buttonCount = 2;
- var actor = '<div class="actor switchUnpressed '
+ var actordown = '<div class="actor switchUnpressed '
if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
- actor += '">';
- actor += '<div class="value">' + ($p.attr('downlabel') ? $p.attr('downlabel') : '-') + '</div>';
- actor += '</div>';
- var $actor = $(actor).data( {
+ actordown += $p.attr( 'align' );
+ actordown += '">';
+ actordown += '<div class="value">' + ($p.attr('downlabel') ? $p.attr('downlabel') : '-') + '</div>';
+ actordown += '</div>';
+ var $actordown = $(actordown).data( {
'address' : address,
'mapping' : $p.attr('mapping'),
'styling' : $p.attr('styling'),
@@ -666,15 +666,14 @@
'align' : $p.attr('align'),
'type' : 'switch'
} ).bind( 'click', this.action );
- buttons.append( $actor );
-
- var actor = '<div class="actor switchUnpressed '
+
+ var actorup = '<div class="actor switchUnpressed '
if ( $p.attr( 'align' ) )
- actor += $p.attr( 'align' );
- actor += '">';
- actor += '<div class="value">' + ($p.attr('uplabel') ? $p.attr('uplabel') : '+') + '</div>';
- actor += '</div>';
- var $actor = $(actor).data( {
+ actorup += $p.attr( 'align' );
+ actorup += '">';
+ actorup += '<div class="value">' + ($p.attr('uplabel') ? $p.attr('uplabel') : '+') + '</div>';
+ actorup += '</div>';
+ var $actorup = $(actorup).data( {
'address' : address,
'mapping' : $p.attr('mapping'),
'styling' : $p.attr('styling'),
@@ -682,18 +681,31 @@
'align' : $p.attr('align'),
'type' : 'switch'
} ).bind( 'click', this.action );
- buttons.append( $actor );
- var actor = '<div class="actor switchInvisible "><div class="value">-</div></div>';
- var $actor = $(actor).data({
+ var actorinfo = '<div class="actor switchInvisible"><div class="value">-</div></div>';
+ var $actorinfo = $(actorinfo).data({
'address' : addrread,
'format' : $p.attr('format'),
'mapping' : $p.attr('mapping'),
'styling' : $p.attr('styling'),
+ 'align' : $p.attr('align'),
});
- for( var addr in addrread ) $actor.bind( addr, this.update );
- buttons.append( $actor );
+ for( var addr in addrread ) $actorinfo.bind( addr, this.update );
+ if ( $p.attr('infoposition' )==1 ) {
+ buttons.append( $actordown );
+ buttons.append( $actorinfo );
+ buttons.append( $actorup );
+ } else if ( $p.attr('infoposition' )==2 ) {
+ buttons.append( $actordown );
+ buttons.append( $actorup );
+ buttons.append( $actorinfo );
+ } else {
+ buttons.append( $actorinfo );
+ buttons.append( $actordown );
+ buttons.append( $actorup );
+ }
+
ret_val.append( buttons );
return ret_val;
},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-05-28 23:19:33
|
Revision: 348
http://openautomation.svn.sourceforge.net/openautomation/?rev=348&view=rev
Author: makki1
Date: 2011-05-28 23:19:24 +0000 (Sat, 28 May 2011)
Log Message:
-----------
commit WireGate-Plugins, incomplete..
Added Paths:
-----------
wiregate/
wiregate/plugin/
wiregate/plugin/generic/
wiregate/plugin/generic/Alarmanlage
wiregate/plugin/generic/Atmolight.pl
wiregate/plugin/generic/Blinker
wiregate/plugin/generic/DMX-Plugin.pl
wiregate/plugin/generic/DaemonStartStop
wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog
wiregate/plugin/generic/Denon-Plugin.pl
wiregate/plugin/generic/Dreambox-Text
wiregate/plugin/generic/EIB-Watchdog
wiregate/plugin/generic/EiWoMiSa
wiregate/plugin/generic/Googleweather
wiregate/plugin/generic/Highspeed
wiregate/plugin/generic/M-Bus
wiregate/plugin/generic/Nacht-Nachdimmen
wiregate/plugin/generic/PI-Regler
wiregate/plugin/generic/Ping-check
wiregate/plugin/generic/Prowl.pl
wiregate/plugin/generic/RFID-Leser
wiregate/plugin/generic/Roomba-Graph
wiregate/plugin/generic/Schwellwert
wiregate/plugin/generic/Taupunkt.pl
wiregate/plugin/generic/Uhrzeit-vom-Bus
wiregate/plugin/generic/WOL-1
wiregate/plugin/generic/XBMC-Radio
wiregate/plugin/generic/cul868
wiregate/plugin/generic/mpg123_start
wiregate/plugin/generic/mpg123_volume
wiregate/plugin/generic/weather-denro1
Added: wiregate/plugin/generic/Alarmanlage
===================================================================
--- wiregate/plugin/generic/Alarmanlage (rev 0)
+++ wiregate/plugin/generic/Alarmanlage 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,22 @@
+# Eigenen Aufruf-Zyklus auf 1T Sekunden setzen
+# Alarmanlage für arme ;)
+$plugin_info{$plugname.'_cycle'} = 86400; # egal..
+return;
+
+my $scharf_ga = "1/1/1";
+my $allowed_pa = "1.1.20";
+my $alarm_ga = "1/1/111";
+### Ende Definitionen
+
+if ($msg{'apci'} eq "A_GroupValue_Write" and $msg{'dst'} eq $scharf_ga) {
+ if (! $msg{'src'} eq $allowed_pa) {
+ # böser Bube hat von falscher Quelladresse gesendet
+ knx_write($alarm_ga,1,1);
+ return "Alarm! $msg{'src'} hat auf $scharf_ga gesendet";
+ }
+} else { # zyklischer Aufruf
+ # Plugin an Gruppenadresse "anmelden"
+ $plugin_subscribe{$scharf_ga}{$plugname} = 1;
+}
+
+return;
Added: wiregate/plugin/generic/Atmolight.pl
===================================================================
--- wiregate/plugin/generic/Atmolight.pl (rev 0)
+++ wiregate/plugin/generic/Atmolight.pl 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,93 @@
+# Plugin Atmolight
+# Kommunikation via UDP - socat separat, muss an einen USB
+# Version: 0.1 2011-02-03
+
+# Eigenen Aufruf-Zyklus setzen (Initialisierung/zyklisches pr\xFCfen)
+$plugin_info{$plugname.'_cycle'} = 600;
+#return "broken";
+#if ($socket[$socknum]->opened) { $socket[$socknum]->close(); }
+#undef $socket[$socknum];
+
+##################
+### DEFINITION ###
+##################
+
+my $socknum = 121; # Eindeutige Nummer des Sockets
+
+my $send_ip = "172.17.2.68"; # Sendeport (UDP, sie in Socket-Einstellungen)
+my $send_port = "50118"; # Sendeport (UDP, sie in Socket-Einstellungen)
+my $recv_ip = "172.17.2.203"; # Empfangsport (UDP, sie in Socket-Einstellungen)
+my $recv_port = "50117"; # Empfangsport (UDP, sie in Socket-Einstellungen)
+
+my $basega = "10/0/110";
+my $numgas = 15;
+# Startadresse
+# 0-2 alle(center?), 3-5 left 6-8 right, 9-11 = oben, 12-14 unten
+
+#######################
+### ENDE DEFINITION ###
+#######################
+
+# Hauptverarbeitung
+if (!$socket[$socknum]) { # socket erstellen
+ $socket[$socknum] = IO::Socket::INET->new(LocalPort => $recv_port,
+ Proto => "udp",
+ LocalAddr => $recv_ip,
+ PeerPort => $send_port,
+ PeerAddr => $send_ip,
+ ReuseAddr => 1,
+ Blocking => 0
+ )
+ or return ("open of $recv_ip : $recv_port failed: $!");
+
+ $socksel->add($socket[$socknum]); # add socket to select
+
+ $plugin_socket_subscribe{$socket[$socknum]} = $plugname; # subscribe plugin
+ for my $chan ("center","left","right","top","bottom") {
+ $plugin_info{$plugname.'_R_'.$chan} = "00" unless $plugin_info{$plugname.'_R_'.$chan};
+ $plugin_info{$plugname.'_G_'.$chan} = "00" unless $plugin_info{$plugname.'_G_'.$chan};
+ $plugin_info{$plugname.'_B_'.$chan} = "00" unless $plugin_info{$plugname.'_B_'.$chan};
+ }
+ # fall through! return "opened Socket $socknum";
+}
+
+if (%msg) { # telegramm vom KNX
+ if ($msg{'apci'} eq "A_GroupValue_Write") {
+ my $idx = str2addr($msg{'dst'}) - str2addr($basega);
+ my @col = ("R","G","B");
+ my @chan = ("center","left","right","top","bottom");
+ my $ret;
+ $plugin_info{$plugname.'_'.$col[$msg{'data'}%3].'_'.$chan[%3]} = $msg{'data'};
+ if ($idx==0) {
+ return "null";
+ } else {
+ for my $chan ("center","left","right","top","bottom") {
+ $ret = $plugin_info{$plugname.'_R_'.$chan} = "00" unless $plugin_info{$plugname.'_R_'.$chan};
+ $ret .= $plugin_info{$plugname.'_G_'.$chan} = "00" unless $plugin_info{$plugname.'_G_'.$chan};
+ $ret .= $plugin_info{$plugname.'_B_'.$chan} = "00" unless $plugin_info{$plugname.'_B_'.$chan};
+ }
+
+ return "dunno? recv KNX $msg{'dst'} $msg{'data'} $ret";
+ }
+ }
+ return "recv $msg{'dst'} ". hex($msg{'data'});
+} elsif ($fh) { # incoming dgram
+ my $buf; # not linewise! = <$fh>;
+ $socket[$socknum]->recv($buf,1024);
+
+ my $bufhex = unpack("H*",$buf);
+ chomp $buf;
+ my $fn = substr($buf,0,2);
+ # this is still very dumb
+ return "dunno recv $buf ($bufhex)";
+}
+
+for (my $i=0; $i<$numgas;$i++) {
+ $plugin_subscribe{$basega}{$plugname} = 1;
+ $basega = addr2str(str2addr($basega)+1,1);
+}
+
+# insert all commands to be sent cyclic
+# syswrite($socket[$socknum],"PW?\r");
+
+return "cycle";
Added: wiregate/plugin/generic/Blinker
===================================================================
--- wiregate/plugin/generic/Blinker (rev 0)
+++ wiregate/plugin/generic/Blinker 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,23 @@
+### Definitionen
+# Eigenen Aufruf-Zyklus auf 300 Sekunden setzen
+$plugin_info{$plugname.'_cycle'} = 86400; # egal..
+
+my $aktiv_ga = "14/6/111"; # Gruppenadresse zum aktivieren
+my $schalt_ga = "1/6/26"; # GA zu schalten
+my $blinkpause = 2; # Frequenz in sek.
+### Ende Definitionen
+
+if ($msg{'apci'} eq "A_GroupValue_Write" and $msg{'dst'} eq $aktiv_ga) {
+ $plugin_info{$plugname.'_aktiv'} = int($msg{'data'});
+ knx_write($schalt_ga,int($msg{'data'}),1);
+ $plugin_info{$plugname.'_cycle'} = $blinkpause;
+} else { # zyklischer Aufruf
+ # Plugin an Gruppenadresse "anmelden"
+ $plugin_subscribe{$aktiv_ga}{$plugname} = 1;
+ if ($plugin_info{$plugname.'_aktiv'}) {
+ knx_write($schalt_ga,knx_read($schalt_ga,0,1)^1,1); # read&write last value - logical OR
+ $plugin_info{$plugname.'_cycle'} = $blinkpause;
+ }
+}
+
+return;
Added: wiregate/plugin/generic/DMX-Plugin.pl
===================================================================
--- wiregate/plugin/generic/DMX-Plugin.pl (rev 0)
+++ wiregate/plugin/generic/DMX-Plugin.pl 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,90 @@
+# Plugin DMX-Gateway
+# Version: 0.3 2011-05-28
+# Ben\xF6tigt DMX USB-Interface
+
+##################
+### DEFINITION ###
+##################
+
+my $socknum = 6; # Eindeutige Nummer des Sockets +1
+
+# Eigenen Aufruf-Zyklus setzen (Initialisierung/zyklisches pr\xFCfen)
+$plugin_info{$plugname.'_cycle'} = 300;
+# Gruppenadressen DMX - leer um Versand zu unterbinden
+# 8Bit/1Byte Dimmwerte werden 1:1 auf DMX-Adressen \xFCbersetzt
+my $knx_startGA = "11/1/0"; #DMX-Kanal 1, DMX-Kanal 256=1/1/255, DMX-Kanal 257..512=1/2/0..255
+my $dmx_channels = 512; # Anzahl der DMX-Kan\xE4le
+# oder for XXX in array
+
+my $dmx_send_ip = "localhost"; # Sendeport (UDP, sie in Socket-Einstellungen)
+my $dmx_send_port = "50012"; # Sendeport (UDP, sie in Socket-Einstellungen)
+my $dmx_recv_ip = "localhost"; # Empfangsport (UDP, sie in Socket-Einstellungen)
+my $dmx_recv_port = "50011"; # Empfangsport (UDP, sie in Socket-Einstellungen)
+
+#######################
+### ENDE DEFINITION ###
+#######################
+
+my @dimcurve = ( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5,
+ 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8,
+ 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 12, 12,
+ 12, 13, 13, 13, 14, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19,
+ 19, 20, 20, 21, 21, 22, 22, 23, 24, 24, 25, 26, 26, 27, 28, 29,
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 46, 47, 48, 50, 51, 52, 54, 55, 57, 58, 60, 62, 63, 65, 67, 69,
+ 71, 73, 75, 77, 79, 81, 83, 86, 88, 90, 93, 95, 98, 101, 104, 106,
+ 109, 112, 115, 119, 122, 125, 129, 132, 136, 140, 144, 148, 152, 156, 160, 165,
+ 169, 174, 179, 184, 189, 194, 199, 205, 211, 216, 222, 228, 235, 241, 248, 255);
+
+# Hauptverarbeitung
+if (!$socket[$socknum]) { # socket erstellen
+ if (defined $socket[$socknum]) { #debug
+ if ($socket[$socknum]->opened) { $socket[$socknum]->close(); }
+ undef $socket[$socknum];
+ } #debug my $dgram = sprintf("C%03dL%03d\r\n",$dmxchan,hex($msg{'data'}));
+
+ $socksel->remove($socket[$socknum]);
+ $socket[$socknum] = IO::Socket::INET->new(LocalPort => $dmx_recv_port,
+ Proto => "udp",
+ LocalAddr => $dmx_recv_ip,
+ PeerPort => $dmx_send_port,
+ PeerAddr => $dmx_send_ip,
+ ReuseAddr => 1
+ )
+ or return ("open of $dmx_recv_ip : $dmx_recv_port failed: $!");
+ $socksel->add($socket[$socknum]); # add socket to select
+ $plugin_socket_subscribe{$socket[$socknum]} = $plugname; # subscribe plugin
+ for (my $i=0; $i<$dmx_channels;$i++) {
+ $plugin_subscribe{$knx_startGA}{$plugname} = 1;
+ $knx_startGA = addr2str(str2addr($knx_startGA)+1,1);
+ }
+ return "opened UDP-Socket $socknum";
+}
+if (%msg) { # telegramm vom KNX
+ my $destN = str2addr($msg{'dst'});
+ my $startN = str2addr($knx_startGA);
+ my $dmxchan = $destN - $startN;
+ if ($msg{'apci'} eq "A_GroupValue_Write" and $destN >= $startN and $destN <= $startN+$dmx_channels) {
+ # send $dmxchan -> UDP as CaaaLvvv
+ my $dgram = sprintf("C%03dL%03d\r\n",$dmxchan,$dimcurve[hex($msg{'data'})]);
+ $socket[$socknum]->send($dgram) or return "send failed: $!";
+ # debug chop($dgram);chop($dgram); # debug
+ # debug return "sent $msg{'dst'} $msg{'value'} $dgram to DMX $dmxchan"; # debug
+ return;
+ }
+} elsif ($fh) {
+ my $buf;
+ recv($fh,$buf,255,0);
+ my $bufhex = $buf;
+ $bufhex =~ s/(.)/sprintf("0x%x ",ord($1))/eg;
+ #debug return "recv $buf $bufhex";
+ return;
+}
+
+return;
Added: wiregate/plugin/generic/DaemonStartStop
===================================================================
--- wiregate/plugin/generic/DaemonStartStop (rev 0)
+++ wiregate/plugin/generic/DaemonStartStop 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,32 @@
+# Plugin um daemons (Dienste) per KNX Gruppenadresse zu starten/beenden
+# pptpd in diesem Beispiel, geht natuerlich auch fuer alle anderen
+# Eigenen Aufruf-Zyklus auf taeglich setzen
+$plugin_info{$plugname.'_cycle'} = 86400;
+
+##############################################################################
+### Definitionen
+##############################################################################
+my $daemon = "pptpd"; # Name des dienstes
+my $ga = "0/7/254"; # Gruppenadresse, die ihn starten/beenden soll
+
+##############################################################################
+### Ende Definitionen
+##############################################################################
+
+my $dummy;
+if (%msg) {
+ if ($msg{'apci'} eq "A_GroupValue_Write" and $ga eq $msg{'dst'}) {
+ if($msg{'data'}+0) {
+ $dummy = `/etc/init.d/$daemon restart`;
+ return; # "started $daemon
+ } else {
+ $dummy = `/etc/init.d/$daemon stop`;
+ return; # "stopped $daemon
+ }
+ }
+} else {
+ # cyclic/init/change
+ # subscribe GA's
+ $plugin_subscribe{$ga}{$plugname} = 1;
+}
+return;
\ No newline at end of file
Added: wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog
===================================================================
--- wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog (rev 0)
+++ wiregate/plugin/generic/Datenlogger-PV-Kaco-Prolog 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,151 @@
+# 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;
+
Added: wiregate/plugin/generic/Denon-Plugin.pl
===================================================================
--- wiregate/plugin/generic/Denon-Plugin.pl (rev 0)
+++ wiregate/plugin/generic/Denon-Plugin.pl 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,112 @@
+# Plugin Denon-AVR
+# Kommunikation via UDP - socat separat einzurichten
+# Version: 0.1 2011-01-31
+
+##################
+### DEFINITION ###
+##################
+
+my $socknum = 118; # Eindeutige Nummer des Sockets +1
+
+# Eigenen Aufruf-Zyklus setzen (Initialisierung/zyklisches pruefen)
+$plugin_info{$plugname.'_cycle'} = 600;
+
+my $send_ip = "localhost"; # Sendeport (UDP, sie in Socket-Einstellungen)
+my $send_port = "50106"; # Sendeport (UDP, sie in Socket-Einstellungen)
+my $recv_ip = "localhost"; # Empfangsport (UDP, sie in Socket-Einstellungen)
+my $recv_port = "50105"; # Empfangsport (UDP, sie in Socket-Einstellungen)
+
+my $denon_ip;
+#$denon_ip = "172.17.2.89:23"; # uncomment to use direct telnet without socat
+
+my $basega = "10/0/0";
+my $numgas = 20;
+# Startadresse
+# 0=PW 1=PWStatus
+
+#######################
+### ENDE DEFINITION ###
+#######################
+
+# Hauptverarbeitung
+if (!$socket[$socknum]) { # socket erstellen
+ if ($denon_ip) {
+ $socket[$socknum] = IO::Socket::INET->new(PeerAddr => $denon_ip, Timeout => 120, Blocking => 0)
+ or return ("open of $denon_ip failed: $!");
+ } else {
+ $socket[$socknum] = IO::Socket::INET->new(LocalPort => $recv_port,
+ Proto => "udp",
+ LocalAddr => $recv_ip,
+ PeerPort => $send_port,
+ PeerAddr => $send_ip,
+ ReuseAddr => 1
+ )
+ or return ("open of $recv_ip : $recv_port failed: $!");
+ }
+
+ $socksel->add($socket[$socknum]); # add socket to select
+
+ $plugin_socket_subscribe{$socket[$socknum]} = $plugname; # subscribe plugin
+ return "opened Socket $socknum";
+}
+
+if (%msg) { # telegramm vom KNX
+ if ($msg{'apci'} eq "A_GroupValue_Write") {
+ my $idx = str2addr($msg{'dst'}) - str2addr($basega);
+ if ($idx==0) {
+ my @vals = qw/PWSTANDBY PWON/; #1bit on/off
+ syswrite($socket[$socknum], $vals[$msg{'data'}]."\r");
+ #1=PW?
+ } elsif ($idx==2) {
+ my @vals = qw /MVDOWN MVUP/; #1bit master-vol
+ syswrite($socket[$socknum], $vals[$msg{'data'}]."\r");
+ } elsif ($idx==3) { # 1byte 0-99
+ syswrite($socket[$socknum], sprintf("MV%02d\r",$msg{'data'}));
+ #4=MV?
+ } elsif ($idx==5) {
+ my @vals = qw /MUOFF MUON/; #1bit mute
+ syswrite($socket[$socknum], $vals[$msg{'data'}]."\r");
+ #6=MU?
+ } elsif ($idx==7) { #1byte source 5=TV 11=ipod 19=usb
+ my @vals = qw /PHONO CD TUNER DVD BD TV SAT\/CBL DVR GAME V.AUX DOCK IPOD NET\/USB NAPSTER LASTFM FLICKR FAVORITES IRADIO SERVER USB\/IPOD/;
+ syswrite($socket[$socknum], "SI".$vals[$msg{'data'}]."\r");
+ #8=SI?
+ } elsif ($idx==9) { #1byte sourround mode 2=ST 6=MCHST 10=Matrix
+ my @vals = ("DIRECT","PURE DIRECT","STEREO","STANDARD","DOLBY DIGITAL","DTS SUROUND","MCH STEREO","ROCK ARENA","JAZZ CLUB","MONO MOVIE","MATRIX","VIDEO GAME","VIRTUAL");
+ syswrite($socket[$socknum], "MS".$vals[$msg{'data'}]."\r");
+ #10=MS?
+ } else {
+ return "dunno? recv KNX $msg{'dst'} $msg{'data'}";
+ }
+ }
+ return;
+} elsif ($fh) { # incoming dgram
+ my $buf = <$fh>;
+ my $bufhex = unpack("H*",$buf);
+ chomp $buf;
+ my $fn = substr($buf,0,2);
+ # this is still very dumb
+ if ($fn eq "PW") {
+ my @vals = qw/PWSTANDBY PWON/; #1bit on/off
+ my( $val )= grep { $vals[$_] eq $buf } 0..$#vals;
+ knx_write(addr2str(str2addr($basega)+1) ,$val,1);
+ return "$val - @vals - $buf";
+ } elsif ($fn eq "MV" and $buf !~ /^MVMAX/) { # MVMAX is undocumented?
+ # broken, just sends every 2, .5 isn't considered
+ knx_write(addr2str(str2addr($basega)+4),substr($buf,2,2),5.010);
+ return "recv $buf ($bufhex)";
+ } else {
+ return "dunno recv $buf ($bufhex)";
+ }
+ return;
+}
+
+for (my $i=0; $i<$numgas;$i++) {
+ $plugin_subscribe{$basega}{$plugname} = 1;
+ $basega = addr2str(str2addr($basega)+1,1);
+}
+
+# insert all commands to be sent cyclic
+syswrite($socket[$socknum],"PW?\r");
+
+return "cycle";
Added: wiregate/plugin/generic/Dreambox-Text
===================================================================
--- wiregate/plugin/generic/Dreambox-Text (rev 0)
+++ wiregate/plugin/generic/Dreambox-Text 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,43 @@
+# Plugin zum versenden von Textmeldungen an die Dreambox
+# Version 0.1 13.03.2011
+# Copyright: swiss (http://knx-user-forum.de/members/swiss.html)
+# License: GPL (v2)
+# Aufbau möglichst so, dass man unterhalb der Einstellungen nichts verändern muss!
+
+
+####################
+###Einstellungen:###
+####################
+
+
+my $aufrufende_ga = '1/1/1';
+my $dreambox_ip = '192.168.1.11';
+my $text = 'Zeile1&Zeile2&Zeile3&usw...'; #Für mehrere Zeilen einfach zwischen den Zeilen ein & einfügen
+
+my $timeout = 10; #Zeit in sekunden in der die Meldung angezeigt wird
+my $type = 2; #Meldungstyp: 1=Info, 2=Neutral, 3=Fehler
+
+
+######################
+##ENDE Einstellungen##
+######################
+
+
+# Eigenen Aufruf-Zyklus auf 1T setzen
+$plugin_info{$plugname.'_cycle'} = 86400;
+# Zyklischer Aufruf nach restart und alle 86400 sek., dient dem anmelden an die Gruppenadresse, einmalig (0) würde in diesem Fall auch genügen
+
+
+
+if ($msg{'apci'} eq "A_GroupValue_Write" and $msg{'dst'} eq $aufrufende_ga) {
+
+while($text =~ /&/) {
+$text =~ s/&/%20%5Cn/;
+}
+
+get( "http://".$dreambox_ip."/web/message?text=".$text."&type=".$type."&timeout=".$timeout );
+} else { # zyklischer Aufruf
+ # Plugin an Gruppenadresse "anmelden", hierdurch wird das Plugin im folgenden bei jedem eintreffen eines Telegramms auf die GA aufgerufen und der obere Teil dieser if-Schleife durchlaufen
+ $plugin_subscribe{$aufrufende_ga}{$plugname} = 1;
+}
+
Added: wiregate/plugin/generic/EIB-Watchdog
===================================================================
--- wiregate/plugin/generic/EIB-Watchdog (rev 0)
+++ wiregate/plugin/generic/EIB-Watchdog 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,18 @@
+# Watchdog fuer KNX-Schnittstelle
+# relevant nur bei USB und evtl. FT1.2 !
+### Config
+my $check_ga = "5/7/5";
+my $check_time = 60;
+### ENDE config
+
+
+# Eigenen Aufruf-Zyklus setzen
+$plugin_info{$plugname.'_cycle'} = $check_time;
+
+if (!knx_read($check_ga,$check_time)) {
+ my $dummy = `/etc/init.d/eibd restart`;
+ return "EIB-Lesefehler! res: $dummy";
+ }
+
+#return "alles paletti";
+return 0;
\ No newline at end of file
Added: wiregate/plugin/generic/EiWoMiSa
===================================================================
--- wiregate/plugin/generic/EiWoMiSa (rev 0)
+++ wiregate/plugin/generic/EiWoMiSa 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,131 @@
+# Plugin Eiwomisa RGB DMX-Controller
+# Version: 0.1 2011-01-21
+# Benötigt Eiwomisa RGB DMX Controller und socat Eintrag für USB-RS232 Wandler
+
+##################
+### DEFINITION ###
+##################
+
+my $socknum = 9; # Eindeutige Nummer des Sockets +1
+
+# Eigenen Aufruf-Zyklus setzen (Initialisierung/zyklisches prüfen)
+$plugin_info{$plugname.'_cycle'} = 300;
+# Gruppenadressen <-> DMX
+# 8Bit/1Byte Dimmwerte werden 1:1 auf DMX-Adressen übersetzt
+my $knx_startGA = "11/1/0"; # DMX-Kanal 0, DMX-Kanal 256=11/1/255, DMX-Kanal 257..512=11/2/0..255
+my $dmx_channels = 8; # Anzahl der DMX-Kanäle, hier 4 für RGBW Eiwomisa, +3 für externen RGB DMX Empfänger [+1, da 0 nicht benutzt]
+
+
+my $dmx_send_ip = "localhost"; # Sendeport (UDP, sie in Socket-Einstellungen)
+my $dmx_send_port = "50015"; # Sendeport (UDP, sie in Socket-Einstellungen)
+
+# pre-defining bytes for serial data stream to Eiwomisa DMX controller
+my $byte1 = 0;
+my $byte2 = 0;
+my $byte3 = 0;
+my $byte4 = 0;
+my $byte5 = 0;
+my $byte6 = 0;
+
+#######################
+### ENDE DEFINITION ###
+#######################
+
+# Hauptverarbeitung
+if (!$socket[$socknum]) { # socket erstellen
+ if (defined $socket[$socknum]) { #debug
+ if ($socket[$socknum]->opened) { $socket[$socknum]->close(); }
+ undef $socket[$socknum];
+ } #debug
+ $socksel->remove($socket[$socknum]);
+ $socket[$socknum] = IO::Socket::INET->new(
+ Proto => "udp",
+ PeerPort => $dmx_send_port,
+ PeerAddr => $dmx_send_ip,
+ ReuseAddr => 1
+ )
+ or return ("open of $dmx_send_ip : $dmx_send_port failed: $!");
+ $socksel->add($socket[$socknum]); # add socket to select
+
+ $plugin_socket_subscribe{$socket[$socknum]} = $plugname; # subscribe plugin
+ for (my $i=0; $i<$dmx_channels;$i++) {
+ $plugin_subscribe{$knx_startGA}{$plugname} = 1;
+ $knx_startGA = addr2str(str2addr($knx_startGA)+1,1);
+ }
+ return "opened UDP-Socket $socknum";
+}
+if (%msg) { # telegramm vom KNX
+
+ my $destN = str2addr($msg{'dst'});
+ my $startN = str2addr($knx_startGA);
+ my $dmxchan = $destN - $startN;
+ if ($msg{'apci'} eq "A_GroupValue_Write" and $destN >= $startN and $destN <= $startN+$dmx_channels) {
+
+
+#---- section specific to Eiwomisa controller ---
+# Encoding value and DMX channel number into specific protocol.
+# For detailed protocol definitions check the website eiwomisa.de
+# Each serial command consists of 6 bytes: 112233445566h
+# 1. Byte = Startbyte, must be 255
+# 2. Byte = 1. part of value, can be 0-254
+# 3. Byte = 2. part of value, can be 0-1
+# 4. Byte = 1. part of channel, can be 0-254
+# 5. Byte = 2. part of channel, can be 0-254
+# 6. Byte = 3. part of channel, can be 0-4
+
+ $byte1 = 255; # Settting start byte
+
+ # encode value
+ if(hex($msg{'data'})>254) {
+ $byte2 = 254; # setting byte 2 to FEh
+ $byte3 = 1; # setting byte 3 to 1h -> Byte 2+3 == FF
+ }else {
+ $byte2 = hex($msg{'data'}); # byte 2 can take up all values until FE
+ $byte3 = 0; # byte 3 will remain empty
+ }
+
+ # encode DMX channel
+ if($dmxchan>512) { # 254+254+4 == 512
+ $byte4 = 254; # setting byte 4
+ $byte5 = 254; # setting byte 5
+ $byte6 = 4; # setting byte 6
+ }
+ elsif ($dmxchan>508) {
+ $byte4 = 254;
+ $byte5 = 254;
+ $byte6 = $dmxchan-508;
+ }
+ elsif($dmxchan>254) {
+ $byte4 = 254;
+ $byte5 = $dmxchan-254;
+ $byte6 = 0;
+ }
+ else {
+ $byte4 = $dmxchan;
+ $byte5 = 0;
+ $byte6 = 0;
+ }
+#---- End of Eiwomisa protocol encode ---
+
+
+ # putting bytes together
+ my $dgram = pack("C[6]",$byte1,$byte2,$byte3,$byte4,$byte5,$byte6);
+
+ # sending to existing socket (via UDP to socat)
+ $socket[$socknum]->send($dgram) or return "send failed: $!";
+
+ ## --uncomment this section for debugging--
+ # my @myArray=unpack('C*', $dgram); # re-converting $dgram
+ # my $myStringHex = ''; # into HEX to be able
+ # foreach my $c (@myArray) { # to see
+ # $myStringHex .= "" . sprintf ("%lX", $c); # what was sent
+ # }
+ ## print debug output to logfile
+ #return "Received GA: $msg{'dst'}, value: $msg{'data'}h, which I will send to DMX channel $dmxchan. Serial byte stream: $myStringHex " ; # debug output
+ ##-- end of debug code --
+
+ }
+}
+
+return;
+
Added: wiregate/plugin/generic/Googleweather
===================================================================
--- wiregate/plugin/generic/Googleweather (rev 0)
+++ wiregate/plugin/generic/Googleweather 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,137 @@
+# Plugin zum Abfragen von Google Weather
+# Version 0.5 2011-02-15
+# Copyright: Bodo (http://knx-user-forum.de/members/bodo.html)
+# License: GPL (v2)
+# Aufbau m\xF6glichst so, dass man unterhalb der Definitionen nichts \xE4ndern muss!
+
+##################
+### DEFINITION ###
+##################
+
+my $city = "Zurich"; # Meine Stadt, hier statt \xFC,\xE4,\xF6 einfach u,a,o nehmen oder ue,ae,oe (Amis halt)
+my $country = "Schweiz"; # Mein Land
+my $lang = "de"; # Meine Sprache
+
+my $google_temp_ga = "7/0/0"; # Gruppenadresse Temperatur (DPT9)
+my $google_hum_ga = "7/0/1"; # Gruppenadresse Luftfeuchte (DPT16)
+my $google_forecast_maxtemp_ga = "7/0/2"; # Gruppenadresse Temperatur Maximum (DPT9)
+my $google_forecast_mintemp_ga = "7/0/3"; # Gruppenadresse Temperatur Minimum (DPT9)
+my $google_clouds_ga = "7/0/4"; # Gruppenadresse Wolken (DPT16)
+my $google_forecast_clouds_ga = "7/0/5"; # Gruppenadresse Vorhersage Wolken (DPT16)
+my $google_wind_ga = "7/0/6"; # Gruppenadresse Wind (DPT16)
+
+my $google_ip = "http://www.google.com/ig/api?weather=";
+my $htdocs = "/var/www/"; # Das Webverzeichnis
+my $google_xml = "google_weather.xml"; # Der XML Datensatz
+my $weather_html = "google_weather.html"; # Ausgabe als HTML
+my $google_css = "google_weather.css"; # Das Stylesheet
+
+$plugin_info{$plugname.'_cycle'} = 600; # Eigenen Aufruf-Zyklus setzen (Initialisierung/zyklisches pr\xFCfen)
+ # nicht zu klein, da die Daten sowieso in l\xE4ngeren Perioden refresht werden
+ # und das Plugin auf die CF schreibt.
+
+#######################
+### ENDE DEFINITION ###
+#######################
+
+# Hauptverarbeitung
+use LWP::Simple;
+use XML::Simple;
+use Encode qw(encode decode);
+# use open ":utf8";
+
+my $url = $google_ip.$city."+".$country."&hl=".$lang;
+my $xml = encode("utf8",get($url));
+# my $xml = get($url);
+die "Couldn't get it!" unless defined $xml;
+
+my $xml_w = ">".$htdocs.$google_xml;
+open(XML, $xml_w); # XML Datei zum Schreiben \xF6ffnen
+ print XML $xml;
+close(XML);
+
+my $weather = XMLin($xml)->{weather};
+
+knx_write($google_temp_ga,$weather->{current_conditions}{temp_c}{data},9);
+
+my $google_hum = $weather->{current_conditions}{humidity}{data};
+$google_hum =~ m/(\s)(\d{1,3})(\s)/; # ($1)($2)($3)
+knx_write($google_hum_ga,$2,5);
+
+knx_write($google_forecast_maxtemp_ga,$weather->{forecast_conditions}[0]{high}{data},9);
+
+knx_write($google_forecast_mintemp_ga,$weather->{forecast_conditions}[0]{low}{data},9);
+
+my $google_clouds = $weather->{current_conditions}{condition}{data};
+if ($google_clouds =~ m/(\D*)(\s)(\D*)/) { # \s findet Zwischenraum (whitspaces). ($1)($2)($3)
+ knx_write($google_clouds_ga,$1." ".$3,16);
+} else {
+ knx_write($google_clouds_ga,$google_clouds,16);
+}
+
+my $google_forecast_clouds = $weather->{forecast_conditions}[0]{condition}{data};
+if ($google_forecast_clouds =~ m/(\D*)(\s)(\D*)/) { # ($1)($2)($3)
+ knx_write($google_forecast_clouds_ga,$1." ".$3,16);
+} else {
+ knx_write($google_forecast_clouds_ga,$google_forecast_clouds,16);
+}
+my $google_wind = $weather->{current_conditions}{wind_condition}{data};
+$google_wind =~ m/(\s)(\D{1,3})(\s)(\D*)(\s)(\d{1,3})(\s)/; # ($1)($2)($3)($4)($5)($6)($7)
+knx_write($google_wind_ga,$2.", ".$6,16);
+
+my $html =
+"<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>
+<html>
+<head>
+<title>Wetter</title>
+<meta name='language' content='de'>
+<meta http-equiv='content-type' content='text/html; charset=utf8'>
+<link rel='stylesheet' type='text/css' href='".$google_css."'>
+<style type='text/css'>
+<!--
+td {
+ vertical-align: top;
+ padding: 10px;
+ background-color: black;
+ border: 1px #fff solid;
+ font-family: Verdana,Helvetica,Arial,Sans-serif;
+ font-size: 10px;
+ color: #fff;
+}
+=-->
+</style>
+</head>
+<body>
+<table>".
+
+"<tr><td colspan='5'><h1>".$weather->{forecast_information}{city}{data}.":</h1></td></tr>\n".
+"<tr>\n".
+"<td>\n".
+"<strong>".$weather->{forecast_information}{current_date_time}{data}."</strong><br/>\n".
+"<img src=\"http://www.google.com/".$weather->{current_conditions}{icon}{data}."\" alt=\"".
+$weather->{current_conditions}{condition}{data}."\" /><br/>\n".
+$weather->{current_conditions}{condition}{data}."<br/>\n".
+"Temperatur: ".$weather->{current_conditions}{temp_c}{data}."\xB0 C<br/>\n".
+$weather->{current_conditions}{humidity}{data}."<br/>\n".
+$weather->{current_conditions}{wind_condition}{data}."<br/>\n".
+"</td>\n";
+
+for(my $j=0;$j<4;$j++) {
+$html = $html."<td>\n".
+"<strong>".$weather->{forecast_conditions}[$j]{day_of_week}{data}."</strong><br/>\n".
+"<img src=\"http://www.google.com/".$weather->{forecast_conditions}[$j]{icon}{data}."\" alt=\"".$weather->{forecast_conditions}[$j]{condition}{data}."\" /><br/>\n".
+$weather->{forecast_conditions}[$j]{condition}{data}."<br/>\n".
+"min. ".$weather->{forecast_conditions}[$j]{low}{data}."\xB0 C<br/>max. ".$weather->{forecast_conditions}[$j]{high}{data}."\xB0 C<br/>\n".
+"</td>\n";
+}
+$html = $html."</tr>
+</table>
+</body>";
+
+
+my $html_datei = $htdocs.$weather_html;
+
+open(HTML, ">:utf8", $html_datei); # HTML Datei zum Schreiben \xF6ffnen
+ print HTML $html;
+close(HTML);
+
Added: wiregate/plugin/generic/Highspeed
===================================================================
--- wiregate/plugin/generic/Highspeed (rev 0)
+++ wiregate/plugin/generic/Highspeed 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,30 @@
+# Plugin # Highspeed-polling
+# Version: 0.1 2010-05-10
+# Sensoren tempor\xE4r mit maximaler Geschwindigkeit abfragen lassen
+
+##################
+### DEFINITION ###
+##################
+
+my $ga = "10/4/2";
+my $sensorid = "28.28520E020000";
+
+#######################
+### ENDE DEFINITION ###
+#######################
+
+# wird von GA ausgel\xF6st
+$plugin_info{$plugname.'_cycle'} = 0;
+# anmelden
+$plugin_subscribe{$ga}{$plugname} =1;
+
+if ($msg{'apci'} eq "A_GroupValue_Write" and $msg{'dst'} eq $ga) {
+ if (int($msg{'data'})) {
+ push(@a_owdev_fast,$sensorid) unless grep /$sensorid/, @a_owdev_fast; # avoid dups
+ } else {
+ # remove from highspeed-array
+ @a_owdev_fast = grep !/$sensorid/, @a_owdev_fast;
+ }
+}
+
+return;
Added: wiregate/plugin/generic/M-Bus
===================================================================
--- wiregate/plugin/generic/M-Bus (rev 0)
+++ wiregate/plugin/generic/M-Bus 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,69 @@
+# Perl script um Zählerwerte via MBUS10(Pegelwandler) auszulesen
+# welcher über die serielle Schnittstelle am Wiregate angeschlossen ist
+
+use Device::SerialPort;
+
+##################
+### DEFINITION ###
+##################
+
+my $zaehler_ga="14/6/1"; # Zaehler GA im EIS 9 Format
+my @zaehler_id=(0x10,0x7B,0x01,0x7C,0x16); # Zaehler ID des MBus Geraet
+my $port = Device::SerialPort->new("/dev/usbserial-1-3.4");
+my $anzahl_zeichen=33; # Anzahl Zeichen welche vom MBus Geraet gelesen werden
+
+
+my $send_data = pack("C*", @zaehler_id);
+# Set up the serial port
+# 2400, 81E on the USB2Serial driver
+$port->read_char_time(0); # don't wait for each character
+$port->read_const_time(1000); # 1 second per unfulfilled "read" call
+$port->baudrate(2400);
+$port->databits(8);
+$port->stopbits(1);
+$port->parity("even");
+
+my $timeout=1;
+
+#######################
+### ENDE DEFINITION ###
+#######################
+
+# Eigenen Aufruf-Zyklus auf X Sekunden setzen
+$plugin_info{$plugname.'_cycle'} = 300;
+
+# Hauptverarbeitung
+
+my $count_out = $port->write("$send_data\n")
+ || die "Kann Daten nicht schreiben ...\n";
+
+my $chars=0;
+my $buffer="";
+while ($timeout > 0) {
+ my ($count,$saw)=$port->read($anzahl_zeichen);
+ if ($count > 0) {
+ $chars+=$count;
+ $buffer.=$saw;
+ }
+ else {
+ $timeout--;
+ }
+}
+
+# If we get data, then print it
+my $data="";
+if ($chars eq $anzahl_zeichen) {
+ $data=unpack("H*", $buffer);
+ my $zaehlerstand=int(substr($data,60,2) . substr($data,58,2) . substr($data,56,2) . substr($data,54
+,2));
+ if ($plugin_info{$plugname.'_result_saved'} < $zaehlerstand) {
+ $plugin_info{$plugname.'_result_saved'} = $zaehlerstand;
+ knx_write($zaehler_ga,$zaehlerstand,14); # Zaehlerstand auf den Bus schreiben
+ return $zaehlerstand;
+ } else {
+ return 0;
+ }
+} else {
+ return "no data received!\n";
+}
+
Added: wiregate/plugin/generic/Nacht-Nachdimmen
===================================================================
--- wiregate/plugin/generic/Nacht-Nachdimmen (rev 0)
+++ wiregate/plugin/generic/Nacht-Nachdimmen 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,33 @@
+# Nachts Licht nur gedimmt einschalten.
+# Plugin hört auf GA des Ein-Befehles und schickt Dimmwert hinterher.
+# V0.5 2011-03-06
+
+### Definitionen
+### Hier werden die Werte/Gruppenadressen definiert
+my $lichtein_ga = "1/1/11"; # Gruppenadresse Licht Ein/Aus
+my $lichtdim_ga = "1/3/65"; # Gruppenadresse Licht Dimmwert
+my $dimvalue = 25; # Dimmwert
+my $starthour = 21; # Stunde, ab der gedimmt werden soll
+my $endhour = 7; # Stunde, ab der nicht mehr gedimmt werden soll
+### Ende Definitionen
+
+# Eigenen Aufruf-Zyklus auf 1x täglich setzen, hört ja auf GA
+$plugin_info{$plugname.'_cycle'} = 86400;
+
+# Plugin an Gruppenadresse "anmelden"
+$plugin_subscribe{$lichtein_ga}{$plugname} = 1;
+
+# Nur bei einer gesendeten 1 reagieren
+if ($msg{'apci'} eq "A_GroupValue_Write" && $msg{'dst'} eq $lichtein_ga && defined $msg{'value'} && $msg{'value'} == "1" ) {
+ # Aktuelle Stunde
+ my $crthour = `date \"+%H\"`;
+ # Wenn innerhalb des Zeitraumes
+ if ($crthour >= $starthour || $crthour <=$endhour) {
+ knx_write($lichtdim_ga,$dimvalue,5); # Dimmwert senden
+ #return "Gedimmt";
+ }
+}
+
+# Kein Log
+return 0;
+
Added: wiregate/plugin/generic/PI-Regler
===================================================================
--- wiregate/plugin/generic/PI-Regler (rev 0)
+++ wiregate/plugin/generic/PI-Regler 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,83 @@
+# Demo-Plugin PI-Regler (einfach)
+# V1.11 2010-12-14
+
+### Definitionen
+### Hier werden die Werte/Gruppenadressen definiert
+my $aktiv_ga = "14/5/50";
+my $sollwert = 24.0; # statischer Sollwert, nur falls nicht von sollwert_ga lesbar!
+my $sollwert_ga = "3/2/57"; # Gruppenadresse f\xFCr Temperatur-Sollwert DPT9 - leer f\xFCr statischen
+my $istwert_ga = "3/2/56"; # Gruppenadresse f\xFCr Temperatur-Istwert DPT9
+my $ventil_ga_8bit = "14/5/63"; # Gruppenadresse f\xFCr Stellantrieb 8bit/1Byte
+my $taktzeit = 15; # Taktzeit in Minuten f\xFCr schaltenden Stellantrieb-Regler
+my $proportional = 50; # Proportionalbereich (P)
+my $nachstellzeit = 240; # Nachstellzeit in Minuten; Standard 50/240 f\xFCr FBH
+### Ende Definitionen
+
+
+# Eigenen Aufruf-Zyklus auf 60 Sekunden setzen
+# der Aufrufzyklus ist unabh\xE4ngig von der Taktzeit und muss k\xFCrzer sein!
+$plugin_info{$plugname.'_cycle'} = 60;
+
+my $aktiviert = knx_read($aktiv_ga) || 1; # aktiv falls Adresse nicht lesbar
+if (!int($aktiviert)) {
+ if (knx_read($ventil_ga_8bit) ne 0) { # nur wenn nicht bereits 0
+ knx_write($ventil_ga_8bit,0,5); # Ventilstellung als DPT5 auf den Bus schreiben
+ }
+ $plugin_info{$plugname.'_esum1'} = 0;
+ $plugin_info{$plugname.'_stellung1'} = 0; # Reset
+ return;
+}
+
+if ($sollwert_ga) {
+ # Plugin an Gruppenadresse "anmelden"
+ $plugin_subscribe{$sollwert_ga}{$plugname} = 1;
+
+ if ($msg{'apci'} eq "A_GroupValue_Write" and $msg{'dst'} eq $sollwert_ga) {
+ #sollwert vom bus
+ if (!defined $msg{'value'}) {
+ # falls GA/DPT nicht importiert
+ $msg{'value'} = decode_dpt9($msg{'data'});
+ }
+ $plugin_info{$plugname.'_sollwert'} = $msg{'value'};
+
+ #Wenn sollwert alt ungleich neu: reset
+ if ($msg{'value'} != $plugin_info{$plugname.'_sollwert'}) {
+ $plugin_info{$plugname.'_esum1'} = 0;
+ $plugin_info{$plugname.'_stellung1'} = 0;
+ }
+ }
+} else {
+ $plugin_info{$plugname.'_sollwert'} = $sollwert;
+}
+
+if (time() - $plugin_info{$plugname.'_tlast'} > $taktzeit*60) { # Aktualisierung nur nach taktzeit
+ $plugin_info{$plugname.'_tlast'} = time();
+ my $istwert = knx_read($istwert_ga,300,9); # gecached lesen, max. 300s alt, DPT9
+ my $stellungalt1 = $plugin_info{$plugname.'_stellung1'};
+
+ # Reglerstellung berechnen
+ my $kp = (1000/$proportional);
+ my $e = ($plugin_info{$plugname.'_sollwert'} - $istwert);
+ if ($stellungalt1 <= 100 and $stellungalt1 >=0) {
+ $plugin_info{$plugname.'_esum1'} = $plugin_info{$plugname.'_esum1'} + $e;
+ }
+ my $v4 = ($plugin_info{$plugname.'_esum1'} * $kp * $taktzeit / $nachstellzeit);
+ $plugin_info{$plugname.'_stellung1'} = ($e * $kp) + $v4;
+
+ if ($plugin_info{$plugname.'_stellung1'} >100) {
+ $plugin_info{$plugname.'_stellung1'}=100;
+ $plugin_info{$plugname.'_esum1'} = ($stellungalt1 - $e * $kp) * $nachstellzeit / $kp / $taktzeit;
+ }
+ if ($plugin_info{$plugname.'_stellung1'} <0 or $plugin_info{$plugname.'_esum1'} <0) {
+ $plugin_info{$plugname.'_esum1'} = 0;
+ $plugin_info{$plugname.'_stellung1'} = 0 if $plugin_info{$plugname.'_stellung1'} <0;
+ }
+ $plugin_info{$plugname.'_stellung1'} = round($plugin_info{$plugname.'_stellung1'});
+ if ($ventil_ga_8bit) {
+ knx_write($ventil_ga_8bit,$plugin_info{$plugname.'_stellung1'},5); # Ventilstellung als DPT5 auf den Bus schreiben
+ }
+# Logeintrag auskommentiert
+#return "Soll $plugin_info{$plugname.'_sollwert'} Ist $istwert P $proportional I $plugin_info{$plugname.'_esum1'} Stell $plugin_info{$plugname.'_stellung1'}";
+}
+
+return 0; # Kein Logeintrag
Added: wiregate/plugin/generic/Ping-check
===================================================================
--- wiregate/plugin/generic/Ping-check (rev 0)
+++ wiregate/plugin/generic/Ping-check 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,73 @@
+# Zum Anzeigen des Status mehrerer Netzwerkgeräte oder der Internetverbindung
+# Aufgrund der Laufzeitbeschränkung der Plugins nicht mehr als 4-5 IPs testen
+#
+# Diese Plugin nutzt einen Ping zum Test
+
+### Definitionen
+my @start_ga = ( "1/1/2", "1/1/4" ); # Gruppenadressen um den Test auszulösen,
+ # wenn nur eine GA angegeben wird, werden alle IPs geprüft
+my @return_ga = ( "1/1/1", "1/1/3" ); # Gruppenadressen zur Rückmeldung,
+ # die Anzahl muss mit der Anzahl der IP-Adressen übereinstimmen)
+my @ip_address = ( "192.168.0.1", "192.168.0.2" ); # IP-Adressen der zu testenden PCs/Geräte
+my $auto_test = "60"; # Wert für automatischen Test in Sekunden, leer lassen für keinen auto test,
+ # wenn ein Wert eingetragen wurde, werden immer IPs alle getestet
+### Ende Definitionen
+
+# Plugin an Gruppenadresse(n) "anmelden"
+foreach(@start_ga)
+{
+ $plugin_subscribe{$start_ga[$_]}{$plugname} = 1;
+}
+
+# Eigenen Aufruf-Zyklus auf x Sekunden setzen
+# der Aufrufzyklus ist unabhängig von der Taktzeit und muss kürzer sein!
+if ( $auto_test > 0 ) {
+ $plugin_info{$plugname.'_cycle'} = $auto_test;
+} else {
+ $plugin_info{$plugname.'_cycle'} = 86400; # Aufruf alle 24 Stunden
+}
+
+
+my $on_off;
+if ( @start_ga == 1 || $auto_test > 0 ) {
+ # Alle Geräte/PCs testen
+ test_all();
+} else {
+ # Nur den aufgerufenden PCs testen
+ if (%msg) {
+ if ($msg{'apci'} eq "A_GroupValue_Write") {
+ foreach(@start_ga) {
+ if ($msg{'dst'} eq $start_ga[$_]) {
+ $on_off = ping_test($ip_address[$_]);
+ if ( $on_off == 1 || $on_off == 0 ) {
+ knx_write($return_ga[$_],$on_off,1);
+ }
+ }
+ }
+ }
+ }
+}
+
+return;
+
+sub test_all {
+ foreach(@return_ga) {
+ # Status des Netzwerkgerätes durch einen Ping testen
+ $on_off = ping_test($ip_address[$_]);
+ # Je nach Ergebnis eine Rückmeldung geben
+ if ( $on_off == 1 || $on_off == 0 ) {
+ knx_write($return_ga[$_],$on_off,1);
+ }
+ }
+ return;
+}
+
+sub ping_test {
+ (my $ip_adr) = @_;
+ my $command = "ping -c 2 -w 2 ".$ip_adr;
+ my $status = `$command`;
+ if($status =~ /bytes from/) { return 1; }
+ elsif($status =~ /0 received/) { return 0; }
+ return "Ein Fehler ist beim Testen der IP $ip_adr aufgetreten";
+}
+
Added: wiregate/plugin/generic/Prowl.pl
===================================================================
--- wiregate/plugin/generic/Prowl.pl (rev 0)
+++ wiregate/plugin/generic/Prowl.pl 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,108 @@
+# Plugin um Nachrichten an Prowl zu senden
+# Version: 0.1 2010-10-14
+# Ben\xF6tigt einen Prowl-Account sowie API-Key
+
+##################
+### DEFINITION ###
+##################
+
+my $socknum = 8; # Eindeutige Nummer des Sockets
+
+# Eigenen Aufruf-Zyklus setzen (Initialisierung/zyklisches pr\xFCfen)
+$plugin_info{$plugname.'_cycle'} = 300;
+
+my %options = ();
+$options{'apikey'} = "xyzxyz";
+
+
+# Zwei M\xF6glichkeiten zur Nutzung:
+# VARIANTE 1: Bitwert auf GA sendet fixes Nachricht:
+my %prowl_ga; # Eintrag darf nicht auskommentiert werden, solange nachfolgend keine GA definiert erfolgt kein Versand!
+$prowl_ga{'14/5/208'} = '0;Event;Description Hallo;Application'; # Priority,Event,Description,Application - ggfs. NUR DIESE Zeile auskommentieren!
+
+# VARIANTE 2: Plugin horcht auf UDP-Port und empf\xE4ngt Format PRIO;Event;Description;Application\n
+my $recv_ip = "0.0.0.0"; # Empfangs-IP
+my $recv_port = "50018"; # Empfangsport
+
+#######################
+### ENDE DEFINITION ###
+#######################
+
+# Hauptverarbeitung
+if (!$socket[$socknum]) { # socket erstellen
+ if (defined $socket[$socknum]) { #debug
+ if ($socket[$socknum]->opened) { $socket[$socknum]->close(); }
+ undef $socket[$socknum];
+ } #debug
+ $socksel->remove($socket[$socknum]);
+ $socket[$socknum] = IO::Socket::INET->new(LocalPort => $recv_port,
+ Proto => "udp",
+ LocalAddr => $recv_ip,
+ ReuseAddr => 1
+ )
+ or return ("open of $recv_ip : $recv_port failed: $!");
+ $socksel->add($socket[$socknum]); # add socket to select
+ $plugin_socket_subscribe{$socket[$socknum]} = $plugname; # subscribe plugin
+ # subscribe GA's
+ while( my ($k, $v) = each(%prowl_ga) ) {
+ # Plugin an Gruppenadresse "anmelden"
+ $plugin_subscribe{$k}{$plugname} = 1;
+ }
+ return "opened UDP-Socket $socknum";
+}
+
+if (%msg) { # telegramm vom KNX
+ if ($msg{'apci'} eq "A_GroupValue_Write" and $prowl_ga{$msg{'dst'}}) {
+ return sendProwl($prowl_ga{$msg{'dst'}});
+ }
+} elsif ($fh) { # UDP-Packet
+ my $buf = <$fh>;
+ chomp $buf;
+ return sendProwl($buf);
+} else {
+ # cyclic/init/change
+ # subscribe GA's
+ while( my ($k, $v) = each(%prowl_ga) ) {
+ # Plugin an Gruppenadresse "anmelden"
+ $plugin_subscribe{$k}{$plugname} = 1;
+ }
+ return; # ("return dunno");
+}
+
+sub sendProwl {
+ ($options{'priority'},$options{'event'},$options{'description'},$options{'application'}) = split ';',shift;
+ use LWP::UserAgent;
+ $options{'priority'} ||= 0;
+ $options{'application'} ||= "WireGate KNX"; # Application fuer Telegramme
+ # URL encode our arguments
+ $options{'application'} =~ s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
+ $options{'event'} =~ s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
+ $options{'notification'} =~ s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
+ # Generate our HTTP request.
+ my ($userAgent, $request, $response, $requestURL);
+ $userAgent = LWP::UserAgent->new;
+ $userAgent->agent("WireGatePlugin/1.0");
+
+ $requestURL = sprintf("https://prowl.weks.net/publicapi/add?apikey=%s&application=%s&event=%s&description=%s&priority=%d",
+ $options{'apikey'},
+ $options{'application'},
+ $options{'event'},
+ $options{'notification'},
+ $options{'priority'});
+
+ $request = HTTP::Request->new(GET => $requestURL);
+ #$request->timeout(5);
+
+ $response = $userAgent->request($request);
+
+ if ($response->is_success) {
+ return "Notification successfully posted: $options{'priority'},$options{'event'},$options{'description'},$options{'application'}";
+ } elsif ($response->code == 401) {
+ return "Notification not posted: incorrect API key.";
+ } else {
+ return "Notification not posted: " . $response->content;
+ }
+
+}
+
+return;
Added: wiregate/plugin/generic/RFID-Leser
===================================================================
--- wiregate/plugin/generic/RFID-Leser (rev 0)
+++ wiregate/plugin/generic/RFID-Leser 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,62 @@
+# Plugin R.S-Systems RFID-Reader to KNX
+# Version: 0.2 2010-10-02
+# Ben\xF6tigt
+# - RSS RFID-Reader an einem USB-Seriell-Wandler
+# - Eintrag unter Socketverbindungen (socat)
+
+##################
+### DEFINITION ###
+##################
+
+my $socknum = 5; # Eindeutige Nummer des Sockets +1
+
+# Eigenen Aufruf-Zyklus setzen (Initialisierung/zyklisches pr\xFCfen)
+$plugin_info{$plugname.'_cycle'} = 300;
+
+my $recv_ip = "192.168.xxx.xxx"; # Empfangsport (UDP, wie in Socket-Einstellungen)
+my $recv_port = "50011"; # Empfangsport (UDP, wie in Socket-Einstellungen)
+my %rfid_ga;
+$rfid_ga{'30343136323c3634373a20'} = '11/2/1'; # Gruppenadresse auf die bei dieser RFID gesendet wird
+#.. usw.
+my $interval = 30; # Sendeintervall f\xFCr RFIDs in Reichweite in Sekunden
+
+#######################
+### ENDE DEFINITION ###
+#######################
+
+# Hauptverarbeitung
+# or ($fh and eof($socket[$socknum]))
+if (!$socket[$socknum]) { # socket erstellen
+ if (defined $socket[$socknum]) { #debug
+ if ($socket[$socknum]->opened) { $socket[$socknum]->close(); }
+ undef $socket[$socknum];
+ } #debug
+ $socksel->remove($socket[$socknum]);
+ $socket[$socknum] = IO::Socket::INET->new(LocalPort => $recv_port,
+ Proto => "udp",
+ LocalAddr => $recv_ip
+ )
+ or return ("open of $recv_ip : $recv_port failed: $!");
+ $socksel->add($socket[$socknum]); # add socket to select
+ $plugin_socket_subscribe{$socket[$socknum]} = $plugname; # subscribe plugin
+ return "opened UDP-Socket $socknum";
+}
+elsif ($fh) { # Read from UDP-Socket
+ my $buf;
+ recv($fh,$buf,255,0);
+ next if(!$buf || length($buf) < 2); # Bogus messages
+ my $bufhex = $buf;
+ $bufhex =~ s/(.)/sprintf("%x",ord($1))/eg;
+ if (time() - $plugin_info{$plugname.'_rfidlast_'.$bufhex} < $interval) {
+ # repeated
+ return;
+ }
+ $plugin_info{$plugname.'_rfidlast_'.$bufhex} = time();
+ if ($rfid_ga{$bufhex}) {
+ knx_write($rfid_ga{$bufhex},1,1);
+ return "RFID $bufhex - sent 1 to $rfid_ga{$bufhex}";
+ }
+ return "Unknown RFID $bufhex";
+}
+return;
+
Added: wiregate/plugin/generic/Roomba-Graph
===================================================================
--- wiregate/plugin/generic/Roomba-Graph (rev 0)
+++ wiregate/plugin/generic/Roomba-Graph 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,20 @@
+# roomba abfragen und Grafiken speichern
+
+# Eigenen Aufruf-Zyklus auf 300 Sekunden (Default globales RRD-Intervall) setzen
+$plugin_info{$plugname.'_cycle'} = $wg_config{''}{'rrd_interval'};
+
+# Werte holen
+
+my ($dist,$voltage,$current,$temp,$charge,$capacity) = split (',',`/root/roombacmd -p /dev/rfcomm0 -C`);
+
+return "timeout" unless $capacity;
+
+chomp($capacity);
+update_rrd("roomba_EG_volt","",$voltage);
+update_rrd("roomba_EG_current","",$current);
+update_rrd("roomba_EG_temp","",$temp);
+update_rrd("roomba_EG_charge","",$charge);
+update_rrd("roomba_EG_capacity","",$capacity);
+
+#return "RRDs wurden aktualisiert";
+return 0;
\ No newline at end of file
Added: wiregate/plugin/generic/Schwellwert
===================================================================
--- wiregate/plugin/generic/Schwellwert (rev 0)
+++ wiregate/plugin/generic/Schwellwert 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,58 @@
+# Demo-Plugin Schwellwertschalter
+# V1.0 2010-03-19
+
+### Definitionen
+# Eigenen Aufruf-Zyklus auf 300 Sekunden setzen
+$plugin_info{$plugname.'_cycle'} = 300;
+my $wert_ga = "5/2/79"; # Gruppenadresse mit dem Wert
+my $schwellwert = 35; # Schwellwert
+my $ziel_ga = "14/6/10"; # Adresse an die Wert bei Unter/\xFCberschreitung gesendet wird
+### Ende Definitionen
+
+
+my $luftfeuchte;
+# Plugin an Gruppenadresse "anmelden"
+$plugin_subscribe{$wert_ga}{$plugname} = 1;
+
+# Nun kommt es darauf an, ob das Plugin aufgrund eines eintreffenden Telegramms
+# oder zyklisch aufgerufen wird! Wir wollen beides..
+# Bei eintreffenden Telegrammen reagieren wir gezielt auf "Write" (gibt ja auch Read/Response)
+# und die spezifische Gruppenadresse, das Plugin k\xF6nnte ja bei mehreren "angemeldet" sein.
+if ($msg{'apci'} eq "A_GroupValue_Write" and $msg{'dst'} eq $wert_ga) {
+ $luftfeuchte = $msg{'value'};
+ #oder nur falls nicht importiert: $msg{'data'} ist dann leer/undef!
+ #$luftfeuchte = decode_dpt9($msg{'data'});
+
+} else { # zyklischer Aufruf
+ # "9" (DPT) kann entfallen falls richtig importiert!
+ $luftfeuchte = knx_read($wert_ga,300,9);
+}
+
+if ($luftfeuchte >= $schwellwert and $plugin_info{$plugname.'_merker_schwellwert1'} ne 1) {
+ # Sende an ZielGA den Wert "1" als 1bit-Wert (DPT1)
+ # "1" (DPT) kann entfallen falls richtig importiert!
+ knx_write($ziel_ga,1,1);
+ # und merken
+ $plugin_info{$plugname.'_merker_schwellwert1'} = 1;
+} elsif ($luftfeuchte < $schwellwert and $plugin_info{$plugname.'_merker_schwellwert1'} eq 1) {
+ # unter Schwellwert,vorher aktiv -> sende 0
+ knx_write($ziel_ga,0,1);
+ # und merken
+ $plugin_info{$plugname.'_merker_schwellwert1'} = 0;
+}
+
+return;
+# verf\xFCgbare Daten in %msg:
+# $msg{'repeated'} 0/1
+# $msg{'sequence'} 0-xxx
+# $msg{'buf'} Rohdaten LPDU
+# $msg{'src'} Quelladresse
+# $msg{'tpdu_type'} T_DATA_XXX_REQ
+# $msg{'data'} rohe Telegrammdaten
+# $msg{'rcount'} Routing-Z\xE4hler
+# $msg{'apci'} A_GroupValue_Write,A_GroupValue_Read,A_GroupValue_Response (u.v.m)
+# $msg{'class'} low/alarm/high/system
+# $msg{'dst'} Zieladresse x/y/z
+# $msg{'datalen'} Datenl\xE4nge
+# $msg{'value'} Dekodierter Klartext-Wert (nur falls ESF importiert!)
+
Added: wiregate/plugin/generic/Taupunkt.pl
===================================================================
--- wiregate/plugin/generic/Taupunkt.pl (rev 0)
+++ wiregate/plugin/generic/Taupunkt.pl 2011-05-28 23:19:24 UTC (rev 348)
@@ -0,0 +1,63 @@
+# Plugin zur Taupunktberechnung
+# Details zur N\xE4herungsformel unter http://www.wettermail.de/wetter/feuchte.html
+# Das Plugin geht da...
[truncated message content] |
|
From: <ma...@us...> - 2011-05-27 18:12:26
|
Revision: 347
http://openautomation.svn.sourceforge.net/openautomation/?rev=347&view=rev
Author: mayerch
Date: 2011-05-27 18:12:20 +0000 (Fri, 27 May 2011)
Log Message:
-----------
Added tranformation for DPT 9.004
Modified Paths:
--------------
CometVisu/trunk/visu/transforms/transform_knx.js
Modified: CometVisu/trunk/visu/transforms/transform_knx.js
===================================================================
--- CometVisu/trunk/visu/transforms/transform_knx.js 2011-05-26 15:33:39 UTC (rev 346)
+++ CometVisu/trunk/visu/transforms/transform_knx.js 2011-05-27 18:12:20 UTC (rev 347)
@@ -182,6 +182,9 @@
return (1 << exp) * 0.01 * mant;
}
},
+ '9.004': {
+ link : '9.001'
+ },
'9': {
link : '9.001'
},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-05-26 15:33:45
|
Revision: 346
http://openautomation.svn.sourceforge.net/openautomation/?rev=346&view=rev
Author: makki1
Date: 2011-05-26 15:33:39 +0000 (Thu, 26 May 2011)
Log Message:
-----------
Add missing icons for status/notification-bar
Added Paths:
-----------
CometVisu/trunk/visu/edit/images/
CometVisu/trunk/visu/edit/images/ui-bg_flat_0_aaaaaa_40x100.png
CometVisu/trunk/visu/edit/images/ui-bg_flat_75_ffffff_40x100.png
CometVisu/trunk/visu/edit/images/ui-bg_glass_55_fbf9ee_1x400.png
CometVisu/trunk/visu/edit/images/ui-bg_glass_65_ffffff_1x400.png
CometVisu/trunk/visu/edit/images/ui-bg_glass_75_dadada_1x400.png
CometVisu/trunk/visu/edit/images/ui-bg_glass_75_e6e6e6_1x400.png
CometVisu/trunk/visu/edit/images/ui-bg_glass_95_fef1ec_1x400.png
CometVisu/trunk/visu/edit/images/ui-bg_highlight-soft_75_cccccc_1x100.png
CometVisu/trunk/visu/edit/images/ui-icons_222222_256x240.png
CometVisu/trunk/visu/edit/images/ui-icons_2e83ff_256x240.png
CometVisu/trunk/visu/edit/images/ui-icons_454545_256x240.png
CometVisu/trunk/visu/edit/images/ui-icons_888888_256x240.png
CometVisu/trunk/visu/edit/images/ui-icons_cd0a0a_256x240.png
Added: CometVisu/trunk/visu/edit/images/ui-bg_flat_0_aaaaaa_40x100.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-bg_flat_0_aaaaaa_40x100.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/edit/images/ui-bg_flat_75_ffffff_40x100.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-bg_flat_75_ffffff_40x100.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/edit/images/ui-bg_glass_55_fbf9ee_1x400.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-bg_glass_55_fbf9ee_1x400.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/edit/images/ui-bg_glass_65_ffffff_1x400.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-bg_glass_65_ffffff_1x400.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/edit/images/ui-bg_glass_75_dadada_1x400.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-bg_glass_75_dadada_1x400.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/edit/images/ui-bg_glass_75_e6e6e6_1x400.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-bg_glass_75_e6e6e6_1x400.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/edit/images/ui-bg_glass_95_fef1ec_1x400.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-bg_glass_95_fef1ec_1x400.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/edit/images/ui-bg_highlight-soft_75_cccccc_1x100.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-bg_highlight-soft_75_cccccc_1x100.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/edit/images/ui-icons_222222_256x240.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-icons_222222_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/edit/images/ui-icons_2e83ff_256x240.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-icons_2e83ff_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/edit/images/ui-icons_454545_256x240.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-icons_454545_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/edit/images/ui-icons_888888_256x240.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-icons_888888_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/edit/images/ui-icons_cd0a0a_256x240.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/edit/images/ui-icons_cd0a0a_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <net...@us...> - 2011-05-23 17:29:36
|
Revision: 345
http://openautomation.svn.sourceforge.net/openautomation/?rev=345&view=rev
Author: netzkind
Date: 2011-05-23 17:29:29 +0000 (Mon, 23 May 2011)
Log Message:
-----------
allow attributes for pages, don't drop names of "empty" pages
Modified Paths:
--------------
CometVisu/trunk/visu/edit/save_config.php
CometVisu/trunk/visu/edit/visuconfig_edit.js
Modified: CometVisu/trunk/visu/edit/save_config.php
===================================================================
--- CometVisu/trunk/visu/edit/save_config.php 2011-05-23 07:05:49 UTC (rev 344)
+++ CometVisu/trunk/visu/edit/save_config.php 2011-05-23 17:29:29 UTC (rev 345)
@@ -91,6 +91,27 @@
$objXML->setAttribute("name", (string)$objJSON->name);
}
+ if (false === empty($objJSON->_attributes)) {
+ // some attributes are in a sub-element - it's easier to get them out of there
+ // into our main namespace
+ foreach ($objJSON->_attributes as $strKey => $strValue) {
+ $objJSON->$strKey = $strValue;
+ }
+ }
+
+ foreach ($objJSON as $strAttribute => $mixValue) {
+ if (0 === strpos($strAttribute, "_")) {
+ // Parameter die mit "_" beginnen sind special purpose
+ continue;
+ }
+
+ if ($strAttribute === "textContent") {
+ $objXML->nodeValue = $mixValue;
+ continue;
+ }
+ $objXML->setAttribute($strAttribute, $mixValue);
+ }
+
if (true === empty($objJSON->_elements) || false === is_array($objJSON->_elements)) {
return $objXML;
}
Modified: CometVisu/trunk/visu/edit/visuconfig_edit.js
===================================================================
--- CometVisu/trunk/visu/edit/visuconfig_edit.js 2011-05-23 07:05:49 UTC (rev 344)
+++ CometVisu/trunk/visu/edit/visuconfig_edit.js 2011-05-23 17:29:29 UTC (rev 345)
@@ -865,6 +865,10 @@
return myObj;
}
+function getPageData(element) {
+
+}
+
function createObjectFromPage(pageObject) {
var obj = {};
var elements = new Array();
@@ -873,6 +877,10 @@
// Seitenname
obj.name = $(element).text();
obj._type = "page";
+ if ($(element).parents("div.page").data("configData")) {
+ var data = $(element).parents("div.page").data("configData");
+ obj = jQuery.extend(obj, data.attributes);
+ }
} else {
var myObj = {};
myObj = getWidgetData(element);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-05-23 07:05:55
|
Revision: 344
http://openautomation.svn.sourceforge.net/openautomation/?rev=344&view=rev
Author: j-n-k
Date: 2011-05-23 07:05:49 +0000 (Mon, 23 May 2011)
Log Message:
-----------
Added widget "infotrigger"
Modified Paths:
--------------
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/visu_config.xsd
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2011-05-22 20:06:21 UTC (rev 343)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2011-05-23 07:05:49 UTC (rev 344)
@@ -214,7 +214,30 @@
border-radius: 5px;
}
+.switchInvisible
+{
+ border-style: solid;
+ border-width: 1px;
+ border-color: #000 #000 #000 #000;
+ -moz-border-radius: 7px;
+ -webkit-border-radius: 7px;
+ border-radius: 7px;
+ padding: 1px;
+}
+.switchInvisible div
+{
+ border-style: solid;
+ border-width: 1px;
+ border-color: #000 #000 #000 #000;
+ padding: 5px;
+ width: 5em;
+ float: left;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+}
+
.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; }
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-22 20:06:21 UTC (rev 343)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-05-23 07:05:49 UTC (rev 344)
@@ -623,6 +623,110 @@
content: false
});
+ this.addCreator('infotrigger', {
+ create: function( page, path ) {
+ var $p = $(page);
+ var ret_val = $('<div class="widget switch" />');
+
+ // handle label
+ var labelElement = $p.find('label')[0];
+ var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
+ ret_val.append( label );
+
+ // handle addresses
+ var address = {};
+ var addrread = {};
+ $p.find('address').each( function(){
+ var src = this.textContent;
+ var transform = this.getAttribute('transform');
+ var readonly = this.getAttribute('readonly');
+ ga_list.push( src )
+ if (readonly=='true') {
+ addrread[ '_' + src ] = [ transform, readonly=='true' ];
+ } else {
+ address[ '_' + src ] = [ transform, readonly=='true' ];
+ };
+ });
+
+ // create buttons + info
+ var buttons = $('<div style="float:left;"/>');
+ var buttonCount = 2;
+
+ var actor = '<div class="actor switchUnpressed '
+ if ( $p.attr( 'align' ) )
+ actor += $p.attr( 'align' );
+ actor += '">';
+ actor += '<div class="value">' + ($p.attr('downlabel') ? $p.attr('downlabel') : '-') + '</div>';
+ actor += '</div>';
+ var $actor = $(actor).data( {
+ 'address' : address,
+ 'mapping' : $p.attr('mapping'),
+ 'styling' : $p.attr('styling'),
+ 'value' : $p.attr('downvalue') || 0,
+ 'align' : $p.attr('align'),
+ 'type' : 'switch'
+ } ).bind( 'click', this.action );
+ buttons.append( $actor );
+
+ var actor = '<div class="actor switchUnpressed '
+ if ( $p.attr( 'align' ) )
+ actor += $p.attr( 'align' );
+ actor += '">';
+ actor += '<div class="value">' + ($p.attr('uplabel') ? $p.attr('uplabel') : '+') + '</div>';
+ actor += '</div>';
+ var $actor = $(actor).data( {
+ 'address' : address,
+ 'mapping' : $p.attr('mapping'),
+ 'styling' : $p.attr('styling'),
+ 'value' : $p.attr('upvalue') || 1,
+ 'align' : $p.attr('align'),
+ 'type' : 'switch'
+ } ).bind( 'click', this.action );
+ buttons.append( $actor );
+
+ var actor = '<div class="actor switchInvisible "><div class="value">-</div></div>';
+ var $actor = $(actor).data({
+ 'address' : addrread,
+ 'format' : $p.attr('format'),
+ 'mapping' : $p.attr('mapping'),
+ 'styling' : $p.attr('styling'),
+ });
+ for( var addr in addrread ) $actor.bind( addr, this.update );
+ buttons.append( $actor );
+
+ ret_val.append( buttons );
+ return ret_val;
+ },
+
+ update: function(e,d) {
+ var element = $(this);
+ var value = defaultUpdate( e, d, element );
+ element.addClass('switchInvisible');
+ },
+ action: function() {
+ var data = $(this).data();
+ for( var addr in data.address )
+ {
+ if( data.address[addr][1] == true ) continue; // skip read only
+ visu.write( addr.substr(1), transformEncode( data.address[addr][0], data.value ) );
+ }
+ },
+ attributes: {
+ uplabel: { type: 'string' , required: false },
+ upvalue: { type: 'string' , required: false },
+ downlabel: { type: 'string' , required: false },
+ downvalue: { type: 'string' , required: false },
+ mapping: { type: 'mapping' , required: false },
+ styling: { type: 'styling' , required: false },
+ align: { type: 'string' , required: false }
+ },
+ elements: {
+ label: { type: 'string', required: false, multi: false },
+ address: { type: 'address', required: true, multi: true }
+ },
+ content: false
+ });
+
this.addCreator('unknown', {
create: function( page, path ) {
var ret_val = $('<div class="widget" />');
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2011-05-22 20:06:21 UTC (rev 343)
+++ CometVisu/trunk/visu/visu_config.xsd 2011-05-23 07:05:49 UTC (rev 344)
@@ -47,9 +47,6 @@
<!-- simple elements -->
<!-- attributes -->
-<xsd:attribute name="pre" type="xsd:string" />
-<xsd:attribute name="post" type="xsd:string" />
-
<xsd:attribute name="min" type="xsd:decimal" />
<xsd:attribute name="max" type="xsd:decimal" />
<xsd:attribute name="step" type="xsd:decimal" />
@@ -169,7 +166,8 @@
<xsd:element name="switch" type="switch" />
<xsd:element name="toggle" type="switch" />
<xsd:element name="trigger" type="trigger" />
- <xsd:element name="multitrigger" type="multitrigger" />
+ <xsd:element name="multitrigger" type="multitrigger" />
+ <xsd:element name="infotrigger" type="infotrigger" />
<xsd:element name="designtoggle" type="designtoggle" />
<xsd:element name="slide" type="slide" />
<xsd:element name="info" type="info" />
@@ -215,9 +213,7 @@
<xsd:attribute ref="mapping" use="optional" />
<xsd:attribute name="on_value" type="xsd:string" use="optional" />
<xsd:attribute name="off_value" type="xsd:string" use="optional" />
- <xsd:attribute ref="pre" use="optional" />
- <xsd:attribute ref="post" use="optional" />
-
+ <xsd:attribute ref="align" use="optional" />
</xsd:complexType>
<xsd:complexType name="trigger">
@@ -228,10 +224,23 @@
<xsd:attribute ref="value" use="required" />
<xsd:attribute ref="mapping" use="optional"/>
<xsd:attribute ref="styling" use="optional"/>
- <xsd:attribute ref="pre" use="optional" />
- <xsd:attribute ref="post" use="optional" />
</xsd:complexType>
+<xsd:complexType name="infotrigger">
+ <xsd:choice maxOccurs="unbounded" minOccurs="1">
+ <xsd:element name="label" type="xsd:string" />
+ <xsd:element name="address" type="address" minOccurs="2" maxOccurs="unbounded"/>
+ </xsd:choice>
+ <xsd:attribute name="upvalue" type="xsd:string" use="optional"/>
+ <xsd:attribute name="downvalue" type="xsd:string" use="optional"/>
+ <xsd:attribute name="uplabel" type="xsd:string" use="optional"/>
+ <xsd:attribute name="downlabel" type="xsd:string" use="optional"/>
+ <xsd:attribute ref="mapping" use="optional"/>
+ <xsd:attribute ref="styling" use="optional"/>
+ <xsd:attribute ref="align" use="optional" />
+ <xsd:attribute ref="format" use="optional" />
+</xsd:complexType>
+
<xsd:complexType name="multitrigger">
<xsd:choice maxOccurs="unbounded" minOccurs="1">
<xsd:element name="label" type="xsd:string" />
@@ -266,8 +275,6 @@
<xsd:element name="label" type="xsd:string" maxOccurs="1" />
<xsd:element name="address" type="address" minOccurs="1"/>
</xsd:choice>
- <xsd:attribute ref="pre" use="optional" />
- <xsd:attribute ref="post" use="optional" />
<xsd:attribute ref="format" use="optional" />
<xsd:attribute ref="styling" use="optional" />
<xsd:attribute ref="mapping" use="optional" />
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-05-22 20:06:21 UTC (rev 343)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-05-23 07:05:49 UTC (rev 344)
@@ -270,5 +270,10 @@
</slide>
<diagram_popup rrd="200_DALI_Linie_1_Strom" unit="mA" series="day" refresh="300">DALI Strom L1</diagram_popup>
<diagram_inline rrd="200_DALI_Linie_1_Strom" width="600" height="400"/>
+ <infotrigger uplabel="wärmer" downlabel="kälter" upvalue="1" downvalue="0" align="center" format="%.1f °C">
+ <label>Temperatur Sollwert</label>
+ <address transform="DPT:1.001">4/1/3</address>
+ <address transform="DPT:9" readonly="true">4/2/3</address>
+ </infotrigger>
</page>
</pages>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-05-22 20:06:27
|
Revision: 343
http://openautomation.svn.sourceforge.net/openautomation/?rev=343&view=rev
Author: mayerch
Date: 2011-05-22 20:06:21 +0000 (Sun, 22 May 2011)
Log Message:
-----------
polished the groups
Modified Paths:
--------------
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2011-05-22 16:17:43 UTC (rev 342)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2011-05-22 20:06:21 UTC (rev 343)
@@ -367,11 +367,14 @@
{
background-color: #000000;
}
-
.flavour_black .link a
{
color: #000000;
}
+.flavour_black.group
+{
+ border: #000000 1px solid;
+}
.flavour_white hr
{
@@ -381,16 +384,23 @@
{
color: #ffffff;
}
+.flavour_white.group
+{
+ border: #ffffff 1px solid;
+}
.flavour_antimony hr
{
background-color: #00ddff;
}
-
.flavour_antimony .link a
{
color: #00ddff;
}
+.flavour_antimony.group
+{
+ border: #00ddff 1px solid;
+}
.flavour_boron hr
{
@@ -400,6 +410,10 @@
{
color: #00ff11;
}
+.flavour_boron.group
+{
+ border: #00ff11 1px solid;
+}
.flavour_lithium hr
{
@@ -409,6 +423,10 @@
{
color: #ff0000;
}
+.flavour_lithium.group
+{
+ border: #ff0000 1px solid;
+}
.flavour_potassium hr
{
@@ -418,6 +436,10 @@
{
color: #d00055;
}
+.flavour_potassium.group
+{
+ border: #d00055 1px solid;
+}
.flavour_sodium hr
{
@@ -427,4 +449,8 @@
{
color: #ff8000;
}
+.flavour_sodium.group
+{
+ border: #ff8000 1px solid;
+}
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-22 16:17:43 UTC (rev 342)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-05-22 20:06:21 UTC (rev 343)
@@ -88,22 +88,19 @@
this.addCreator('group', {
create: function( page, path, flavour ) {
var $p = $(page);
- var ret_val = $('<div class="widget" />');
- var name = $p.attr('name');
+ var ret_val = $('<div class="widget group" />');
if( $p.attr('flavour') ) flavour = $p.attr('flavour');// sub design choice
- var wstyle = ''; // widget style
- if( $p.attr('align') ) wstyle += 'text-align:' + $p.attr('align') + ';';
- if( wstyle != '' ) wstyle = 'style="' + wstyle + '"';
+ var hstyle = ''; // heading style
+ if( $p.attr('align') ) hstyle += 'text-align:' + $p.attr('align') + ';';
+ if( hstyle != '' ) hstyle = 'style="' + hstyle + '"';
var childs = $p.children();
var container = $( '<div class="clearfix"/>' );
- container.append( '<h2>' + name + '</h2>' );
+ if( $p.attr('name') ) container.append( '<h2 ' + hstyle + '>' + $p.attr('name') + '</h2>' );
$( childs ).each( function(i){
container.append( create_pages( childs[i], path + '_' + i, flavour ) );
} );
- var group = $( '<div class="group" id="' + path + '"/>' );
- group.append(container);
- if( flavour ) group.addClass( 'flavour_' + flavour );
- ret_val.append( group );
+ if( flavour ) ret_val.addClass( 'flavour_' + flavour );
+ ret_val.append( container );
return ret_val;
},
attributes: {
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-05-22 16:17:43 UTC (rev 342)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-05-22 20:06:21 UTC (rev 343)
@@ -75,13 +75,12 @@
<label>Trigger - Terrasse Licht</label>
<address transform="DPT:1.001" readonly="false" type="">1/0/2</address>
</trigger>
- <group name="Slide group" flavour="potassium">
+ <group name="Slide group" flavour="potassium" align="center">
<info styling="BluePurpleRed">
<label>Slide Info</label>
<address transform="DPT:9" type="">12/4/250</address>
<address transform="DPT:9.001" type="">12/4/251</address>
</info>
- <line />
<slide min="-18" max="26">
<label>Slide</label>
<address transform="DPT:9" type="">12/4/250</address>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-05-22 16:17:50
|
Revision: 342
http://openautomation.svn.sourceforge.net/openautomation/?rev=342&view=rev
Author: mayerch
Date: 2011-05-22 16:17:43 +0000 (Sun, 22 May 2011)
Log Message:
-----------
New feature: groups
Note: this will need some additional polishing
Modified Paths:
--------------
CometVisu/trunk/visu/designs/discreet/basic.css
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/designs/discreet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/basic.css 2011-05-21 16:31:52 UTC (rev 341)
+++ CometVisu/trunk/visu/designs/discreet/basic.css 2011-05-22 16:17:43 UTC (rev 342)
@@ -17,6 +17,14 @@
padding-left: 15px;
}
+h2
+{
+ font-size: 1.25em;
+ margin-left: 15px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+
body hr
{
clear:both;
@@ -90,6 +98,11 @@
background-color: #101010;
}
+.widget .widget
+{
+ width:98%;
+}
+
.text > div,
.link > a {
float:left;
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2011-05-21 16:31:52 UTC (rev 341)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2011-05-22 16:17:43 UTC (rev 342)
@@ -19,6 +19,14 @@
margin-left: 15px;
}
+h2
+{
+ font-size: 1.25em;
+ margin-left: 15px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+
body hr
{
clear:both;
@@ -68,6 +76,11 @@
min-height: 2em;
}
+.widget .widget
+{
+ width:98%;
+}
+
.widget .label,
.widget.info .actor,
.text > div,
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-21 16:31:52 UTC (rev 341)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-05-22 16:17:43 UTC (rev 342)
@@ -84,6 +84,37 @@
},
content: true
});
+
+ this.addCreator('group', {
+ create: function( page, path, flavour ) {
+ var $p = $(page);
+ var ret_val = $('<div class="widget" />');
+ var name = $p.attr('name');
+ if( $p.attr('flavour') ) flavour = $p.attr('flavour');// sub design choice
+ var wstyle = ''; // widget style
+ if( $p.attr('align') ) wstyle += 'text-align:' + $p.attr('align') + ';';
+ if( wstyle != '' ) wstyle = 'style="' + wstyle + '"';
+ var childs = $p.children();
+ var container = $( '<div class="clearfix"/>' );
+ container.append( '<h2>' + name + '</h2>' );
+ $( childs ).each( function(i){
+ container.append( create_pages( childs[i], path + '_' + i, flavour ) );
+ } );
+ var group = $( '<div class="group" id="' + path + '"/>' );
+ group.append(container);
+ if( flavour ) group.addClass( 'flavour_' + flavour );
+ ret_val.append( group );
+ return ret_val;
+ },
+ attributes: {
+ align: { type: 'string', required: false },
+ flavour:{ type: 'string', required: false },
+ name: { type: 'string', required: true }
+ },
+ elements: {
+ },
+ content: true
+ });
this.addCreator('line', {
create: function( page, path ) {
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-05-21 16:31:52 UTC (rev 341)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-05-22 16:17:43 UTC (rev 342)
@@ -61,21 +61,11 @@
</meta>
<page name="Übersicht">
<text align="center">CometVisu Widget Demo</text>
- <info styling="BluePurpleRed">
- <label>Slide Info</label>
- <address transform="DPT:9" type="">12/4/250</address>
- <address transform="DPT:9.001" type="">12/4/251</address>
- </info>
<switch mapping="OnOff" styling="RedGreen">
<label>Switch - Terrase Licht</label>
<address transform="DPT:1.001" readonly="false" type="">1/0/2</address>
<address transform="DPT:9.001" readonly="true" type="">12/4/253</address>
</switch>
- <slide min="-18" max="26">
- <label>Slide</label>
- <address transform="DPT:9" type="">12/4/250</address>
- <address transform="DPT:9.001" readonly="true" type="">12/4/253</address>
- </slide>
<break/>
<trigger pre="pre" post="post" value="0" mapping="OnOff">
<label>Trigger - Terrasse Licht</label>
@@ -85,6 +75,19 @@
<label>Trigger - Terrasse Licht</label>
<address transform="DPT:1.001" readonly="false" type="">1/0/2</address>
</trigger>
+ <group name="Slide group" flavour="potassium">
+ <info styling="BluePurpleRed">
+ <label>Slide Info</label>
+ <address transform="DPT:9" type="">12/4/250</address>
+ <address transform="DPT:9.001" type="">12/4/251</address>
+ </info>
+ <line />
+ <slide min="-18" max="26">
+ <label>Slide</label>
+ <address transform="DPT:9" type="">12/4/250</address>
+ <address transform="DPT:9.001" readonly="true" type="">12/4/253</address>
+ </slide>
+ </group>
<multitrigger pre="pre" post="post" button1label="An" button1value="0" button2label="Aus" button2value="1" button3label="Essen" button3value="2" button4label="Fernsehen" button4value="3">
<label>Multitrigger - Szenenaufruf</label>
<address transform="DPT:5.010" readonly="false" type="">11/2/50</address>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-05-21 16:32:00
|
Revision: 341
http://openautomation.svn.sourceforge.net/openautomation/?rev=341&view=rev
Author: makki1
Date: 2011-05-21 16:31:52 +0000 (Sat, 21 May 2011)
Log Message:
-----------
Add jnotify statusbar instead of alerts in editor
Modified Paths:
--------------
CometVisu/trunk/visu/edit/style_edit.css
CometVisu/trunk/visu/edit/visuconfig_edit.js
CometVisu/trunk/visu/edit_config.html
CometVisu/trunk/visu/visu_config.xsd
Added Paths:
-----------
CometVisu/trunk/visu/edit/jquery-ui.css
CometVisu/trunk/visu/lib/jquery.jnotify.js
Property Changed:
----------------
CometVisu/trunk/visu/
Property changes on: CometVisu/trunk/visu
___________________________________________________________________
Added: svn:ignore
+ visu_config.xml
Added: CometVisu/trunk/visu/edit/jquery-ui.css
===================================================================
--- CometVisu/trunk/visu/edit/jquery-ui.css (rev 0)
+++ CometVisu/trunk/visu/edit/jquery-ui.css 2011-05-21 16:31:52 UTC (rev 341)
@@ -0,0 +1,572 @@
+/*
+ * jQuery UI CSS Framework 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }/*
+ * jQuery UI Autocomplete 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+ list-style:none;
+ padding: 2px;
+ margin: 0;
+ display:block;
+ float: left;
+}
+.ui-menu .ui-menu {
+ margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+ margin:0;
+ padding: 0;
+ zoom: 1;
+ float: left;
+ clear: left;
+ width: 100%;
+}
+.ui-menu .ui-menu-item a {
+ text-decoration:none;
+ display:block;
+ padding:.2em .4em;
+ line-height:1.5;
+ zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+ font-weight: normal;
+ margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; }
+button.ui-button-icons-only { width: 3.7em; }
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4; }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative; }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; }
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*
+ * jQuery UI Slider 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; 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: -.3em; margin-left: -.6em; }
+.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; }/*
+ * jQuery UI Tabs 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+ display: none; /*sorry for IE5*/
+ display/**/: block; /*sorry for IE5*/
+ position: absolute; /*must have*/
+ z-index: -1; /*must have*/
+ filter: mask(); /*must have*/
+ top: -4px; /*must have*/
+ left: -4px; /*must have*/
+ width: 200px; /*must have*/
+ height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.6
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
Modified: CometVisu/trunk/visu/edit/style_edit.css
===================================================================
--- CometVisu/trunk/visu/edit/style_edit.css 2011-05-21 12:34:39 UTC (rev 340)
+++ CometVisu/trunk/visu/edit/style_edit.css 2011-05-21 16:31:52 UTC (rev 341)
@@ -193,4 +193,25 @@
#addMaster button {
margin: .4em;
-}
\ No newline at end of file
+}
+
+/* jnotify stuff */
+.jnotify-item
+{
+ height: auto;
+ width: 80%;
+ padding: 4px 4px 4px 4px;
+ margin: 0 0 5px 0;
+ display: block;
+ position: fixed;
+ left: 1em;
+ top: 1em;
+ z-index: 6;
+}
+
+.jnotify-item-close
+{
+ float: right;
+ margin-left: 2px;
+}
+
Modified: CometVisu/trunk/visu/edit/visuconfig_edit.js
===================================================================
--- CometVisu/trunk/visu/edit/visuconfig_edit.js 2011-05-21 12:34:39 UTC (rev 340)
+++ CometVisu/trunk/visu/edit/visuconfig_edit.js 2011-05-21 16:31:52 UTC (rev 341)
@@ -7,7 +7,10 @@
save_bad: "Config not saved. Error: '%s'",
value_required: "Field '%s' is required but empty. Please correct your input.",
value_invalid: "The value for field '%s' is invalid. Please correct your input.",
- regexp_invalid: "There's something wrong with the cable."
+ regexp_invalid: "There's something wrong with the cable.",
+ getaddr_bad: "Failed to get address-config. Error: '%s'.",
+ getdpt_bad: "Failed to get DPT-config. Error: '%s'.",
+ getrrd_bad: "Failed to get available RRDs. Error: '%s'."
}
if (typeof texts[element] == "undefined") {
@@ -25,19 +28,19 @@
var addressesCache;
var dptCache;
+var rrdCache
jQuery(document).ready(function() {
+ $('#StatusBar').jnotifyInizialize({ oneAtTime: false })
+
jQuery("div#addwidgetcontrol").bind("click", function() {
$("#addMaster").triggerHandler("cleanup");
jQuery("#addMaster").trigger("show").find("#add_type").triggerHandler("change");
});
$("#saveconfigcontrol").bind("click", function () {
- var b = confirm(lingua("confirm_save"));
- if (b) {
- saveConfig();
- }
+ saveConfig();
});
// get all GAs from the server
@@ -46,10 +49,16 @@
type: "GET",
dataType: "json",
success: function(data) {
- addressesCache = data;
+ addressesCache = data;
},
error: function(xhr, textStatus, e) {
addressesCache = false;
+ $('#StatusBar').jnotifyAddMessage({
+ text: lingua("getaddr_bad", textStatus + " " +e),
+ permanent: false,
+ type: 'error',
+ disappearTime: 30000
+ });
}
});
@@ -63,9 +72,34 @@
},
error: function(xhr, textStatus, e) {
dptCache = false;
+ $('#StatusBar').jnotifyAddMessage({
+ text: lingua("getdpt_bad", textStatus + " " +e),
+ permanent: false,
+ type: 'error',
+ disappearTime: 30000
+ });
}
});
+ // get all rrds from the server
+ $.ajax({
+ url: "edit/get_widget_diagram.php",
+ type: "GET",
+ dataType: "json",
+ success: function(data) {
+ rrdCache = data;
+ },
+ error: function(xhr, textStatus, e) {
+ rrdCache = false;
+ $('#StatusBar').jnotifyAddMessage({
+ text: lingua("getrrd_bad", textStatus + " " +e),
+ permanent: false,
+ type: 'error',
+ disappearTime: 30000
+ });
+ }
+ });
+
jQuery("#pages").bind("done", function() {
$("#pages hr, #pages br").each(function() {
if ($(this).closest(".widget").length == 0) {
@@ -586,14 +620,22 @@
if ($(this).val() != "") {
// validating
if (false === isInputValid($(this).val(), $(this).data("type"))) {
- alert(lingua("value_invalid", name));
+ $('#StatusBar').jnotifyAddMessage({
+ text: lingua("value_invalid", name),
+ permanent: false,
+ type: 'error'
+ });
// do not save
error = true;
}
dataObject.append($("<" + name + " />").append($(this).val()));
} else if ($(this).data("required") === true) {
// do not save
- alert(lingua("value_required", name));
+ $('#StatusBar').jnotifyAddMessage({
+ text: lingua("value_required", name),
+ permanent: false,
+ type: 'error'
+ });
error = true;
}
} else {
@@ -619,14 +661,22 @@
if ($(this).val() != "") {
// validating
if (false === isInputValid($(this).val(), $(this).data("type"))) {
- alert(lingua("value_invalid", name));
+ $('#StatusBar').jnotifyAddMessage({
+ text: lingua("value_invalid", name),
+ permanent: false,
+ type: 'error'
+ });
// do not save
error = true;
}
dataObject.attr(name, $(this).val());
} else if ($(this).data("required") === true) {
// do not save
- alert(lingua("value_required", name));
+ $('#StatusBar').jnotifyAddMessage({
+ text: lingua("value_required", name),
+ permanent: false,
+ type: 'error'
+ });
error = true;
}
});
@@ -655,7 +705,7 @@
jQuery("#addMaster").trigger("hide").trigger("cleanup");
})
.end();
-
+
});
/**
@@ -676,7 +726,11 @@
}
} catch (e) {
- alert(lingua("regexp_invalid"));
+ $('#StatusBar').jnotifyAddMessage({
+ text: lingua("regexp_invalid", name),
+ permanent: false,
+ type: 'error'
+ });
return false;
}
}
@@ -719,14 +773,28 @@
cache: false,
dataType: "json",
error: function(XMLHttpRequest, textStatus, errorThrown) {
- alert(lingua("save_bad", errorThrown));
+ $('#StatusBar').jnotifyAddMessage({
+ text: lingua("save_bad", errorThrown),
+ permanent: false,
+ type: 'error',
+ disappearTime: 30000
+ });
},
success: function(data, textStatus, XMLHttpRequest) {
if (data != 1) {
- alert(lingua("save_bad", data));
+ $('#StatusBar').jnotifyAddMessage({
+ text: lingua("save_bad", data),
+ permanent: false,
+ type: 'error',
+ disappearTime: 30000
+ });
return;
}
- alert(lingua("save_good"));
+ $('#StatusBar').jnotifyAddMessage({
+ text: lingua("save_good"),
+ permanent: false,
+ type: 'message'
+ });
}
});
}
@@ -932,4 +1000,4 @@
return elementDiv;
-}
\ No newline at end of file
+}
Modified: CometVisu/trunk/visu/edit_config.html
===================================================================
--- CometVisu/trunk/visu/edit_config.html 2011-05-21 12:34:39 UTC (rev 340)
+++ CometVisu/trunk/visu/edit_config.html 2011-05-21 16:31:52 UTC (rev 341)
@@ -6,6 +6,7 @@
<title>Visu - Editor-Modus</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" type="text/css" href="edit/style_edit.css" />
+ <link rel="stylesheet" type="text/css" href="edit/jquery-ui.css" />
<script src="lib/compatibility.js" type="text/javascript"></script>
<script src="lib/jquery.js" type="text/javascript"></script>
<script src="lib/jquery-ui.js" type="text/javascript"></script>
@@ -18,6 +19,7 @@
<script src="transforms/transform_default.js" type="text/javascript"></script>
<script src="transforms/transform_knx.js" type="text/javascript"></script>
<script src="edit/visuconfig_edit.js" type="text/javascript"></script>
+ <script src="lib/jquery.jnotify.js" type="text/javascript"></script>
<script src="edit/json2.js" type="text/javascript"></script>
<style type="text/css">
.loading { display: none; }
@@ -64,6 +66,8 @@
</div>
</form>
</div>
+ <div id="StatusBar" style="height: 20px;">
+ </div>
<div id="controlcontainer" class="loading">
<div id="saveconfigcontrol">save</div>
<div id="addwidgetcontrol">+</div>
Added: CometVisu/trunk/visu/lib/jquery.jnotify.js
===================================================================
--- CometVisu/trunk/visu/lib/jquery.jnotify.js (rev 0)
+++ CometVisu/trunk/visu/lib/jquery.jnotify.js 2011-05-21 16:31:52 UTC (rev 341)
@@ -0,0 +1,143 @@
+/**
+* jQuery.jNotify
+* jQuery Notification Engine
+*
+* Copyright (c) 2010 Fabio Franzini
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notify and this permission notify shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* @author Fabio Franzini
+* @copyright 2010 www.fabiofranzini.com
+* @version 1
+**/
+
+(function(jQuery) {
+ jQuery.fn.jnotifyInizialize = function(options) {
+ var element = this;
+
+ var defaults = {
+ oneAtTime: false,
+ appendType: 'append'
+ };
+
+ var options = jQuery.extend({}, defaults, options);
+
+ this.addClass('notify-wrapper');
+
+ if (options.oneAtTime)
+ this.addClass('notify-wrapper-oneattime');
+
+ if (options.appendType == 'prepend' && options.oneAtTime == false)
+ this.addClass('notify-wrapper-prepend');
+
+ return this;
+ };
+ jQuery.fn.jnotifyAddMessage = function(options) {
+
+ var notifyWrapper = this;
+
+ if (notifyWrapper.hasClass('notify-wrapper')) {
+
+ var defaults = {
+ text: '',
+ type: 'message',
+ showIcon: true,
+ permanent: false,
+ disappearTime: 3000
+ };
+
+ var options = jQuery.extend({}, defaults, options);
+ var styleClass;
+ var iconClass;
+
+ switch (options.type) {
+ case 'message':
+ {
+ styleClass = 'ui-state-highlight';
+ iconClass = 'ui-icon-info';
+ }
+ break;
+ case 'error':
+ {
+ styleClass = 'ui-state-error';
+ iconClass = 'ui-icon-alert';
+ }
+ break;
+ default:
+ {
+ styleClass = 'ui-state-highlight';
+ iconClass = 'ui-icon-info';
+ }
+ break;
+ }
+
+ if (notifyWrapper.hasClass('notify-wrapper-oneattime')) {
+ this.children().remove();
+ }
+
+ var notifyItemWrapper = jQuery('<div class="jnotify-item-wrapper"></div>');
+ var notifyItem = jQuery('<div class="ui-corner-all jnotify-item"></div>')
+ .addClass(styleClass);
+
+ if (notifyWrapper.hasClass('notify-wrapper-prepend'))
+ notifyItem.prependTo(notifyWrapper);
+ else
+ notifyItem.appendTo(notifyWrapper);
+
+ notifyItem.wrap(notifyItemWrapper);
+
+ if (options.showIcon)
+ jQuery('<span class="ui-icon" style="float:left; margin-right: .3em;" />')
+ .addClass(iconClass)
+ .appendTo(notifyItem);
+
+ jQuery('<span></span>').html(options.text).appendTo(notifyItem);
+ jQuery('<div class="jnotify-item-close"><span class="ui-icon ui-icon-circle-close"/></div>')
+ .prependTo(notifyItem)
+ .click(function() { remove(notifyItem) });
+
+ // IEsucks
+ if (navigator.userAgent.match(/MSIE (\d+\.\d+);/)) {
+ notifyWrapper.css({ top: document.documentElement.scrollTop });
+ //http://groups.google.com/group/jquery-dev/browse_thread/thread/ba38e6474e3e9a41
+ notifyWrapper.removeClass('IEsucks');
+ }
+ // ------
+
+ if (!options.permanent) {
+ setTimeout(function() { remove(notifyItem); }, options.disappearTime);
+ }
+ }
+
+ function remove(obj) {
+ obj.animate({ opacity: '0' }, 600, function() {
+ obj.parent().animate({ height: '0px' }, 300,
+ function() {
+ obj.parent().remove();
+ // IEsucks
+ if (navigator.userAgent.match(/MSIE (\d+\.\d+);/)) {
+ //http://groups.google.com/group/jquery-dev/browse_thread/thread/ba38e6474e3e9a41
+ obj.parent().parent().removeClass('IEsucks');
+ }
+ // -------
+ });
+ });
+ }
+ };
+})(jQuery);
\ No newline at end of file
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2011-05-21 12:34:39 UTC (rev 340)
+++ CometVisu/trunk/visu/visu_config.xsd 2011-05-21 16:31:52 UTC (rev 341)
@@ -318,6 +318,7 @@
<xsd:attribute name="height" type="dimension" use="optional"/>
<xsd:attribute name="refresh" type="xsd:integer" use="optional" />
<xsd:attribute name="period" type="xsd:string" use="optional" />
+ <xsd:attribute name="datasource" type="xsd:string" use="optional" />
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
@@ -344,4 +345,4 @@
<!-- shade is not yet implemented -->
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-05-21 12:34:45
|
Revision: 340
http://openautomation.svn.sourceforge.net/openautomation/?rev=340&view=rev
Author: mayerch
Date: 2011-05-21 12:34:39 +0000 (Sat, 21 May 2011)
Log Message:
-----------
Fix switch pressed / unpressed optics when using maps
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-20 21:56:05 UTC (rev 339)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-05-21 12:34:39 UTC (rev 340)
@@ -288,7 +288,7 @@
'styling' : $p.attr('styling'),
'on_value' : $p.attr('on_value' ) || 1,
'off_value' : $p.attr('off_value') || 0,
- 'align' : $p.attr('align'),
+ 'align' : $p.attr('align'),
'type' : 'switch'
} ).bind( 'click', this.action );
for( var addr in address ) $actor.bind( addr, this.update );
@@ -298,7 +298,7 @@
update: function(e,d) {
var element = $(this);
var value = defaultUpdate( e, d, element );
- var off = element.data( 'off_value' );
+ var off = map( element.data( 'off_value' ), element );
element.removeClass( value == off ? 'switchPressed' : 'switchUnpressed' );
element.addClass( value == off ? 'switchUnpressed' : 'switchPressed' );
},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-05-20 21:56:11
|
Revision: 339
http://openautomation.svn.sourceforge.net/openautomation/?rev=339&view=rev
Author: mayerch
Date: 2011-05-20 21:56:05 +0000 (Fri, 20 May 2011)
Log Message:
-----------
Format cleanup
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-18 08:34:17 UTC (rev 338)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-05-20 21:56:05 UTC (rev 339)
@@ -288,7 +288,7 @@
'styling' : $p.attr('styling'),
'on_value' : $p.attr('on_value' ) || 1,
'off_value' : $p.attr('off_value') || 0,
- 'align' : $p.attr('align'),
+ 'align' : $p.attr('align'),
'type' : 'switch'
} ).bind( 'click', this.action );
for( var addr in address ) $actor.bind( addr, this.update );
@@ -315,7 +315,7 @@
off_value: { type: 'string' , required: false },
mapping: { type: 'mapping' , required: false },
styling: { type: 'styling' , required: false },
- align: { type: 'string' , required: false }
+ align: { type: 'string' , required: false }
},
elements: {
label: { type: 'string', required: true, multi: false },
@@ -446,7 +446,7 @@
button4value: { type: 'string' , required: false },
mapping: { type: 'mapping' , required: false },
styling: { type: 'styling' , required: false },
- align: { type: 'string' , required: false }
+ align: { type: 'string' , required: false }
},
elements: {
label: { type: 'string', required: false, multi: false },
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-05-18 08:34:25
|
Revision: 338
http://openautomation.svn.sourceforge.net/openautomation/?rev=338&view=rev
Author: j-n-k
Date: 2011-05-18 08:34:17 +0000 (Wed, 18 May 2011)
Log Message:
-----------
added "align"-attribute to switch, trigger, multitrigger
Modified Paths:
--------------
CometVisu/trunk/documentation/widgets.htm
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/documentation/widgets.htm
===================================================================
--- CometVisu/trunk/documentation/widgets.htm 2011-05-15 13:31:30 UTC (rev 337)
+++ CometVisu/trunk/documentation/widgets.htm 2011-05-18 08:34:17 UTC (rev 338)
@@ -14,15 +14,15 @@
<o:DocumentProperties>
<o:Author>Jan N. Klug</o:Author>
<o:LastAuthor>Jan N. Klug</o:LastAuthor>
- <o:Revision>5</o:Revision>
+ <o:Revision>8</o:Revision>
<o:Created>2011-05-12T10:58:00Z</o:Created>
- <o:LastSaved>2011-05-13T08:43:00Z</o:LastSaved>
- <o:Pages>2</o:Pages>
- <o:Words>369</o:Words>
- <o:Characters>2328</o:Characters>
- <o:Lines>19</o:Lines>
+ <o:LastSaved>2011-05-14T07:38:00Z</o:LastSaved>
+ <o:Pages>3</o:Pages>
+ <o:Words>409</o:Words>
+ <o:Characters>2579</o:Characters>
+ <o:Lines>21</o:Lines>
<o:Paragraphs>5</o:Paragraphs>
- <o:CharactersWithSpaces>2692</o:CharactersWithSpaces>
+ <o:CharactersWithSpaces>2983</o:CharactersWithSpaces>
<o:Version>12.00</o:Version>
</o:DocumentProperties>
</xml><![endif]-->
@@ -497,7 +497,7 @@
mso-fareast-language:EN-US;}
</style>
<![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="4098"/>
+ <o:shapedefaults v:ext="edit" spidmax="5122"/>
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1"/>
@@ -745,7 +745,7 @@
normal'>previously defined styling</p>
</td>
</tr>
- <tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:2'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
@@ -767,6 +767,50 @@
normal'>previously defined mapping</p>
</td>
</tr>
+ <tr style='mso-yfti-irow:3'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>on_value</p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>string (default: \x841\x93)</p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>off_value</p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>string (default:\x930\x93)</p>
+ </td>
+ </tr>
</table>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
@@ -805,7 +849,7 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -967,7 +1011,7 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -1296,7 +1340,7 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -1410,14 +1454,14 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>optional </p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal</p>
+ normal'>numeric (default: 0)</p>
</td>
</tr>
<tr style='mso-yfti-irow:4'>
@@ -1432,14 +1476,14 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>optional </p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal</p>
+ normal'>numeric (default: 100)</p>
</td>
</tr>
<tr style='mso-yfti-irow:5;mso-yfti-lastrow:yes'>
@@ -1461,7 +1505,7 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal</p>
+ normal'>numeric (default: 0.5)</p>
</td>
</tr>
</table>
@@ -1502,7 +1546,7 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -1664,7 +1708,7 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -1763,10 +1807,10 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal</p>
+ normal'>numeric</p>
</td>
</tr>
- <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:3'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
@@ -1785,9 +1829,31 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal</p>
+ normal'>numeric</p>
</td>
</tr>
+ <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>refresh</p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>numeric</p>
+ </td>
+ </tr>
</table>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
@@ -1880,21 +1946,21 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>src<o:p></o:p></p>
+ normal'>src</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>required<o:p></o:p></p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>URI<o:p></o:p></p>
+ normal'>URI</p>
</td>
</tr>
<tr style='mso-yfti-irow:2'>
@@ -1902,45 +1968,67 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>width<o:p></o:p></p>
+ normal'>width</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>numeric</p>
</td>
</tr>
- <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:3'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>height<o:p></o:p></p>
+ normal'>height</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>numeric</p>
</td>
</tr>
+ <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>refresh</p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>numeric</p>
+ </td>
+ </tr>
</table>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
@@ -1970,7 +2058,10 @@
<tr style='mso-yfti-irow:1'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
- padding:0cm 5.4pt 0cm 5.4pt'></td>
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>label</p>
+ </td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
@@ -2030,21 +2121,21 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>src<o:p></o:p></p>
+ normal'>src</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>required<o:p></o:p></p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>URI<o:p></o:p></p>
+ normal'>URI</p>
</td>
</tr>
<tr style='mso-yfti-irow:2'>
@@ -2052,45 +2143,67 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>width<o:p></o:p></p>
+ normal'>width</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>numeric</p>
</td>
</tr>
- <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:3'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>height<o:p></o:p></p>
+ normal'>height</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>numeric</p>
</td>
</tr>
+ <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>refresh</p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>numeric</p>
+ </td>
+ </tr>
</table>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
@@ -2120,7 +2233,10 @@
<tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
- padding:0cm 5.4pt 0cm 5.4pt'></td>
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>label</p>
+ </td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
@@ -2143,7 +2259,7 @@
<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -2162,26 +2278,52 @@
normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
</td>
</tr>
+</table>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
<tr style='mso-yfti-irow:1'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>src<o:p></o:p></p>
+ normal'>label</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>required<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>URI<o:p></o:p></p>
+ normal'>string</p>
</td>
</tr>
<tr style='mso-yfti-irow:2'>
@@ -2189,48 +2331,70 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>width<o:p></o:p></p>
+ normal'>address</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>required </p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>KNX group address w/ <span style='font-family:"Courier New"'>color=\x93r\x93</span></p>
</td>
</tr>
- <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:3'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>height<o:p></o:p></p>
+ normal'>address</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>required </p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>KNX group address w/ <span style='font-family:"Courier New"'>color=\x93g\x93</span></p>
</td>
</tr>
+ <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>address</p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>required </p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>KNX group address w/ <span style='font-family:"Courier New"'>color=\x93b\x93</span></p>
+ </td>
+ </tr>
</table>
-<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
+<h1 style='margin-bottom:10.0pt'>diagram_inline</h1>
<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
@@ -2239,7 +2403,7 @@
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
+ normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
</td>
<td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
@@ -2259,14 +2423,14 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>label</p>
+ normal'>rrd</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -2281,21 +2445,21 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>address<o:p></o:p></p>
+ normal'>width</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>required <o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>KNX group address w/ <span style='font-family:"Courier New"'>color=\x93r\x93</span><o:p></o:p></p>
+ normal'>numeric</p>
</td>
</tr>
<tr style='mso-yfti-irow:3'>
@@ -2303,135 +2467,109 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>address<o:p></o:p></p>
+ normal'>height</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>required <o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>KNX group address w/ <span style='font-family:"Courier New"'>color=\x93g\x93</span><o:p></o:p></p>
+ normal'>numeric</p>
</td>
</tr>
- <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:4'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>address<o:p></o:p></p>
+ normal'>unit</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>required <o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>KNX group address w/ <span style='font-family:"Courier New"'>color=\x93b\x93</span><o:p></o:p></p>
+ normal'>string</p>
</td>
</tr>
-</table>
-
-<h1 style='margin-bottom:10.0pt'>diagram_inline</h1>
-
-<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
- mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <tr style='mso-yfti-irow:5'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
- mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
- </td>
- <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
- border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
- solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
- </td>
- <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
- border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
- solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
- </td>
- </tr>
- <tr style='mso-yfti-irow:1'>
- <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>rrd<o:p></o:p></p>
+ normal'>period</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>required<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>string<o:p></o:p></p>
+ normal'>string</p>
</td>
</tr>
- <tr style='mso-yfti-irow:2'>
+ <tr style='mso-yfti-irow:6'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>width<o:p></o:p></p>
+ normal'>refresh</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>numeric</p>
</td>
</tr>
- <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:7;mso-yfti-lastrow:yes'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>height<o:p></o:p></p>
+ normal'>series</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>string</p>
</td>
</tr>
</table>
@@ -2463,10 +2601,7 @@
<tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
- padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>label</p>
- </td>
+ padding:0cm 5.4pt 0cm 5.4pt'></td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
@@ -2535,7 +2670,7 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>unit<o:p></o:p></p>
+ normal'>datasource<o:p></o:p></p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -2557,7 +2692,7 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>series<o:p></o:p></p>
+ normal'>unit<o:p></o:p></p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -2574,28 +2709,72 @@
normal'>string<o:p></o:p></p>
</td>
</tr>
- <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:4'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>refresh</p>
+ normal'>period<o:p></o:p></p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>optional<o:p></o:p></p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal</p>
+ normal'>string<o:p></o:p></p>
</td>
</tr>
+ <tr style='mso-yfti-irow:5'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>refresh<o:p></o:p></p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional<o:p></o:p></p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>numeric<o:p></o:p></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:6;mso-yfti-lastrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>series<o:p></o:p></p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional<o:p></o:p></p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>string<o:p></o:p></p>
+ </td>
+ </tr>
</table>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2011-05-15 13:31:30 UTC (rev 337)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2011-05-18 08:34:17 UTC (rev 338)
@@ -84,25 +84,38 @@
text-align:right;
/* border:blue 1px solid; */
}
+
.widget .actor
{
float:left;
margin-left:1em;
- /*width:49%;*/
- text-align:left;
-/* color:green; */
-/* border:blue 1px solid; */
}
+
.widget .actor div
{
float:left;
white-space: pre-wrap;
}
+.center
+{
+ text-align:center;
+}
+
+.left
+{
+ text-align:left;
+}
+
+.right
+{
+ text-align:right;
+}
+
.red
{
color:#f44;
- font-weight:bold;
+
}
.green
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-15 13:31:30 UTC (rev 337)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-05-18 08:34:17 UTC (rev 338)
@@ -288,6 +288,7 @@
'styling' : $p.attr('styling'),
'on_value' : $p.attr('on_value' ) || 1,
'off_value' : $p.attr('off_value') || 0,
+ 'align' : $p.attr('align'),
'type' : 'switch'
} ).bind( 'click', this.action );
for( var addr in address ) $actor.bind( addr, this.update );
@@ -313,7 +314,8 @@
on_value: { type: 'string' , required: false },
off_value: { type: 'string' , required: false },
mapping: { type: 'mapping' , required: false },
- styling: { type: 'styling' , required: false }
+ styling: { type: 'styling' , required: false },
+ align: { type: 'string' , required: false }
},
elements: {
label: { type: 'string', required: true, multi: false },
@@ -342,7 +344,11 @@
if( $p.attr('button1label') )
{
//buttonCount++;
- var actor = '<div class="actor switchUnpressed">';
+ var actor = '<div class="actor switchUnpressed '
+ if ( $p.attr( 'align' ) )
+ actor += $p.attr( 'align' );
+ actor += '">';
+
actor += '<div class="value">' + $p.attr('button1label') + '</div>';
actor += '</div>';
var $actor = $(actor).data( {
@@ -350,14 +356,18 @@
'mapping' : $p.attr('mapping'),
'styling' : $p.attr('styling'),
'value' : $p.attr('button1value'),
- 'type' : 'switch'
+ 'align' : $p.attr('align'),
+ 'type' : 'switch'
} ).bind( 'click', this.action );
buttons.append( $actor );
if( 1 == (buttonCount++ % 2) ) buttons.append( $('<br/>') );
}
if( $p.attr('button2label') )
{
- var actor = '<div class="actor switchUnpressed">';
+ var actor = '<div class="actor switchUnpressed '
+ if ( $p.attr( 'align' ) )
+ actor += $p.attr( 'align' );
+ actor += '">';
actor += '<div class="value">' + $p.attr('button2label') + '</div>';
actor += '</div>';
var $actor = $(actor).data( {
@@ -365,14 +375,18 @@
'mapping' : $p.attr('mapping'),
'styling' : $p.attr('styling'),
'value' : $p.attr('button2value'),
- 'type' : 'switch'
+ 'type' : 'switch',
+ 'align' : $p.attr('align')
} ).bind( 'click', this.action );
buttons.append( $actor );
if( 1 == (buttonCount++ % 2) ) buttons.append( $('<br/>') );
}
if( $p.attr('button3label') )
{
- var actor = '<div class="actor switchUnpressed">';
+ var actor = '<div class="actor switchUnpressed '
+ if ( $p.attr( 'align' ) )
+ actor += $p.attr( 'align' );
+ actor += '">';
actor += '<div class="value">' + $p.attr('button3label') + '</div>';
actor += '</div>';
var $actor = $(actor).data( {
@@ -380,14 +394,17 @@
'mapping' : $p.attr('mapping'),
'styling' : $p.attr('styling'),
'value' : $p.attr('button3value'),
- 'type' : 'switch'
+ 'type' : 'switch'
} ).bind( 'click', this.action );
buttons.append( $actor );
if( 1 == buttonCount++ % 2 ) buttons.append( $('<br/>') );
}
if( $p.attr('button4label') )
{
- var actor = '<div class="actor switchUnpressed">';
+ var actor = '<div class="actor switchUnpressed '
+ if ( $p.attr( 'align' ) )
+ actor += $p.attr( 'align' );
+ actor += '">';
actor += '<div class="value">' + $p.attr('button4label') + '</div>';
actor += '</div>';
var $actor = $(actor).data( {
@@ -395,8 +412,8 @@
'mapping' : $p.attr('mapping'),
'styling' : $p.attr('styling'),
'value' : $p.attr('button4value'),
- 'type' : 'switch'
- } ).bind( 'click', this.action );
+ 'type' : 'switch',
+ } ).bind( 'click', this.action );
buttons.append( $actor );
if( 1 == buttonCount++ % 2 ) buttons.append( $('<br/>') );
}
@@ -428,7 +445,8 @@
button4label: { type: 'string' , required: false },
button4value: { type: 'string' , required: false },
mapping: { type: 'mapping' , required: false },
- styling: { type: 'styling' , required: false }
+ styling: { type: 'styling' , required: false },
+ align: { type: 'string' , required: false }
},
elements: {
label: { type: 'string', required: false, multi: false },
@@ -452,7 +470,10 @@
ga_list.push( src )
address[ '_' + src ] = [ transform, readonly=='true' ];
});
- var actor = '<div class="actor switchUnpressed">';
+ var actor = '<div class="actor switchUnpressed '
+ if ( $p.attr( 'align' ) )
+ actor += $p.attr( 'align' );
+ actor += '">';
var map = $p.attr('mapping');
if( mappings[map] && mappings[map][value] )
actor += '<div class="value">' + mappings[map][value] + '</div>';
@@ -464,6 +485,7 @@
'mapping' : $(page).attr('mapping'),
'styling' : $(page).attr('styling'),
'type' : 'trigger',
+ 'align' : $p.attr('align'),
'sendValue': value
} ).bind( 'click', this.action );
ret_val.append( label ).append( $actor );
@@ -480,7 +502,8 @@
attributes: {
value: { type: 'string' , required: true },
mapping: { type: 'mapping' , required: false },
- styling: { type: 'styling' , required: false }
+ styling: { type: 'styling' , required: false },
+ align: { type: 'string' , required: false },
},
elements: {
label: { type: 'string', required: true, multi: false },
@@ -777,10 +800,13 @@
not_found = false;
break;
}
- if( not_found ) element.addClass( 'actor' );
+ if( not_found ) element.addClass( 'actor ' );
}
}
+ if( element.data( 'align' ) )
+ element.addClass(element.data( 'align' ) );
+
if( element.data( 'precision' ) )
value = Number( value ).toPrecision( element.data( 'precision' ) );
if( element.data( 'format' ) )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-05-15 13:31:36
|
Revision: 337
http://openautomation.svn.sourceforge.net/openautomation/?rev=337&view=rev
Author: makki1
Date: 2011-05-15 13:31:30 +0000 (Sun, 15 May 2011)
Log Message:
-----------
Add selectable config to check_config.php
Modified Paths:
--------------
CometVisu/trunk/visu/check_config.php
Modified: CometVisu/trunk/visu/check_config.php
===================================================================
--- CometVisu/trunk/visu/check_config.php 2011-05-15 13:06:31 UTC (rev 336)
+++ CometVisu/trunk/visu/check_config.php 2011-05-15 13:31:30 UTC (rev 337)
@@ -8,12 +8,17 @@
<?php
$dom = new DomDocument();
-$dom->load("visu_config.xml");
+$conffile = "visu_config";
+if ($_GET['config']) {
+ $conffile .= "_" . $_GET['config'];
+}
+$dom->load($conffile . ".xml");
+
if ($dom->schemaValidate("visu_config.xsd")) {
- print ("config is valid XML");
+ print ("config <b>" . $conffile . " is valid </b> XML");
} else {
- print ("config is NOT valid XML");
+ print ("config <b>" . $conffile . " is NOT </b> valid XML");
}
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-05-15 13:06:39
|
Revision: 336
http://openautomation.svn.sourceforge.net/openautomation/?rev=336&view=rev
Author: makki1
Date: 2011-05-15 13:06:31 +0000 (Sun, 15 May 2011)
Log Message:
-----------
fix diagram_popup preview in design pure
Modified Paths:
--------------
CometVisu/trunk/visu/designs/pure/basic.css
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2011-05-14 07:17:13 UTC (rev 335)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2011-05-15 13:06:31 UTC (rev 336)
@@ -315,8 +315,15 @@
.diagram_inline {
margin-left: 1em;
+ width: 320px;
+ height: 180px;
}
+.diagram_preview {
+ width: 240px;
+ height: 2em;
+}
+
#diagramTooltip {
z-index: 1000;
color: black;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-05-14 07:17:20
|
Revision: 335
http://openautomation.svn.sourceforge.net/openautomation/?rev=335&view=rev
Author: j-n-k
Date: 2011-05-14 07:17:13 +0000 (Sat, 14 May 2011)
Log Message:
-----------
Fix bug #3301566
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/visu_config.xsd
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-14 06:42:23 UTC (rev 334)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-05-14 07:17:13 UTC (rev 335)
@@ -135,11 +135,7 @@
ga_list.push( src )
address[ '_' + src ] = [ this.getAttribute('transform') ];
});
- var actor = '<div class="actor">';
- if( $p.attr('pre') ) actor += '<div>' + $p.attr('pre') + '</div>';
- actor += '<div class="value">-</div>';
- if( $p.attr('post') ) actor += '<div>' + $p.attr('post') + '</div>';
- actor += '</div>';
+ var actor = '<div class="actor"><div class="value">-</div></div>';
var $actor = $(actor).data({
'address' : address,
'format' : $p.attr('format'),
@@ -152,8 +148,6 @@
},
update: defaultUpdate,
attributes: {
- pre: { type: 'string', required: false },
- post: { type: 'string', required: false },
format: { type: 'format', required: false },
mapping: { type: 'mapping', required: false },
styling: { type: 'styling', required: false }
@@ -287,11 +281,7 @@
ga_list.push( src )
address[ '_' + src ] = [ transform, readonly=='true' ];
});
- var actor = '<div class="actor switchUnpressed">';
- if( $p.attr('pre') ) actor += $p.attr('pre');
- actor += '<div class="value">-</div>';
- if( $p.attr('post') ) actor += $p.attr('post');
- actor += '</div>';
+ var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
var $actor = $(actor).data( {
'address' : address,
'mapping' : $p.attr('mapping'),
@@ -322,8 +312,6 @@
attributes: {
on_value: { type: 'string' , required: false },
off_value: { type: 'string' , required: false },
- pre: { type: 'string' , required: false },
- post: { type: 'string' , required: false },
mapping: { type: 'mapping' , required: false },
styling: { type: 'styling' , required: false }
},
@@ -465,13 +453,11 @@
address[ '_' + src ] = [ transform, readonly=='true' ];
});
var actor = '<div class="actor switchUnpressed">';
- if( $p.attr('pre') ) actor += $p.attr('pre');
var map = $p.attr('mapping');
if( mappings[map] && mappings[map][value] )
actor += '<div class="value">' + mappings[map][value] + '</div>';
else
actor += '<div class="value">' + value + '</div>';
- if( $p.attr('post') ) actor += $p.attr('post');
actor += '</div>';
var $actor = $(actor).data( {
'address' : address,
@@ -493,8 +479,6 @@
},
attributes: {
value: { type: 'string' , required: true },
- pre: { type: 'string' , required: false },
- post: { type: 'string' , required: false },
mapping: { type: 'mapping' , required: false },
styling: { type: 'styling' , required: false }
},
@@ -583,7 +567,7 @@
height: { type: 'string', required: false }
},
elements: {
- label: { type: 'string', required: false, multi: false }
+ label: { type: 'string', required: false, multi: false }
},
content: false
});
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2011-05-14 06:42:23 UTC (rev 334)
+++ CometVisu/trunk/visu/visu_config.xsd 2011-05-14 07:17:13 UTC (rev 335)
@@ -213,8 +213,12 @@
</xsd:choice>
<xsd:attribute ref="styling" use="optional" />
<xsd:attribute ref="mapping" use="optional" />
- </xsd:complexType>
+ <xsd:attribute name="on_value" type="xsd:string" use="optional" />
+ <xsd:attribute name="off_value" type="xsd:string" use="optional" />
+ <xsd:attribute ref="pre" use="optional" />
+ <xsd:attribute ref="post" use="optional" />
+</xsd:complexType>
<xsd:complexType name="trigger">
<xsd:choice maxOccurs="unbounded" minOccurs="1">
@@ -224,6 +228,8 @@
<xsd:attribute ref="value" use="required" />
<xsd:attribute ref="mapping" use="optional"/>
<xsd:attribute ref="styling" use="optional"/>
+ <xsd:attribute ref="pre" use="optional" />
+ <xsd:attribute ref="post" use="optional" />
</xsd:complexType>
<xsd:complexType name="multitrigger">
@@ -245,7 +251,7 @@
<xsd:complexType name="slide">
<xsd:choice maxOccurs="unbounded" minOccurs="1">
- <xsd:element name="label" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="label" type="xsd:string" minOccurs="0" maxOccurs="1" />
<xsd:element name="address" type="address" minOccurs="1" />
</xsd:choice>
<xsd:attribute ref="min" />
@@ -256,15 +262,15 @@
</xsd:complexType>
<xsd:complexType name="info">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="label" type="xsd:string" />
- <xsd:element name="address" type="address" minOccurs="1"/>
- </xsd:choice>
- <xsd:attribute ref="pre" use="optional" />
- <xsd:attribute ref="post" use="optional" />
- <xsd:attribute ref="format" use="optional" />
- <xsd:attribute ref="styling" use="optional" />
- <xsd:attribute ref="mapping" use="optional" />
+ <xsd:choice maxOccurs="unbounded" minOccurs="1">
+ <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+ <xsd:element name="address" type="address" minOccurs="1"/>
+ </xsd:choice>
+ <xsd:attribute ref="pre" use="optional" />
+ <xsd:attribute ref="post" use="optional" />
+ <xsd:attribute ref="format" use="optional" />
+ <xsd:attribute ref="styling" use="optional" />
+ <xsd:attribute ref="mapping" use="optional" />
</xsd:complexType>
<xsd:complexType name="image">
@@ -278,36 +284,42 @@
</xsd:complexType>
<xsd:complexType name="video">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attribute name="src" type="uri" use="required" />
- <xsd:attribute name="width" type="dimension" />
- <xsd:attribute name="height" type="dimension" />
- </xsd:extension>
- </xsd:simpleContent>
-</xsd:complexType>
+ <xsd:choice maxOccurs="unbounded" minOccurs="0">
+ <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+ </xsd:choice>
+ <xsd:attribute name="src" type="uri" use="required" />
+ <xsd:attribute name="width" type="dimension" />
+ <xsd:attribute name="height" type="dimension" />
+ </xsd:complexType>
<xsd:complexType name="iframe">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attribute name="src" type="uri" use="required" />
- <xsd:attribute name="width" type="dimension" />
- <xsd:attribute name="height" type="dimension" />
- </xsd:extension>
- </xsd:simpleContent>
+ <xsd:choice maxOccurs="unbounded" minOccurs="0">
+ <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+ </xsd:choice>
+ <xsd:attribute name="src" type="uri" use="required" />
+ <xsd:attribute name="width" type="dimension" />
+ <xsd:attribute name="height" type="dimension" />
</xsd:complexType>
<xsd:complexType name="colorchooser" >
<xsd:choice maxOccurs="unbounded" minOccurs="0" >
- <xsd:element name="label" type="xsd:string" />
+ <xsd:element name="label" type="xsd:string" maxOccurs="1" />
<xsd:element name="address" type="address" minOccurs="3" maxOccurs="3"/>
</xsd:choice>
</xsd:complexType>
<xsd:complexType name="diagram_inline">
- <xsd:attribute name="rrd" type="xsd:string" use="required" />
- <xsd:attribute name="width" type="dimension" use="optional"/>
- <xsd:attribute name="height" type="dimension" use="optional"/>
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="rrd" type="xsd:string" use="required" />
+ <xsd:attribute name="unit" type="xsd:string" use="optional" />
+ <xsd:attribute name="width" type="dimension" use="optional"/>
+ <xsd:attribute name="series" type="xsd:string" use="optional"/>
+ <xsd:attribute name="height" type="dimension" use="optional"/>
+ <xsd:attribute name="refresh" type="xsd:integer" use="optional" />
+ <xsd:attribute name="period" type="xsd:string" use="optional" />
+ </xsd:extension>
+ </xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="diagram_popup" >
@@ -317,6 +329,9 @@
<xsd:attribute name="unit" type="xsd:string" use="optional" />
<xsd:attribute name="series" type="xsd:string" use="optional" />
<xsd:attribute name="refresh" type="xsd:integer" use="optional" />
+ <xsd:attribute name="period" type="xsd:string" use="optional" />
+ <xsd:attribute name="datasource" type="xsd:string" use="optional" />
+ <xsd:attribute name="tooltip" type="xsd:string" use="optional" />
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
@@ -329,6 +344,4 @@
<!-- shade is not yet implemented -->
-
-
</xsd:schema>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-05-14 06:42:32
|
Revision: 334
http://openautomation.svn.sourceforge.net/openautomation/?rev=334&view=rev
Author: j-n-k
Date: 2011-05-14 06:42:23 +0000 (Sat, 14 May 2011)
Log Message:
-----------
updated widgets docu
Modified Paths:
--------------
CometVisu/trunk/documentation/widgets.htm
Modified: CometVisu/trunk/documentation/widgets.htm
===================================================================
--- CometVisu/trunk/documentation/widgets.htm 2011-05-12 19:19:04 UTC (rev 333)
+++ CometVisu/trunk/documentation/widgets.htm 2011-05-14 06:42:23 UTC (rev 334)
@@ -14,15 +14,15 @@
<o:DocumentProperties>
<o:Author>Jan N. Klug</o:Author>
<o:LastAuthor>Jan N. Klug</o:LastAuthor>
- <o:Revision>2</o:Revision>
+ <o:Revision>5</o:Revision>
<o:Created>2011-05-12T10:58:00Z</o:Created>
- <o:LastSaved>2011-05-12T10:58:00Z</o:LastSaved>
+ <o:LastSaved>2011-05-13T08:43:00Z</o:LastSaved>
<o:Pages>2</o:Pages>
- <o:Words>215</o:Words>
- <o:Characters>1359</o:Characters>
- <o:Lines>11</o:Lines>
- <o:Paragraphs>3</o:Paragraphs>
- <o:CharactersWithSpaces>1571</o:CharactersWithSpaces>
+ <o:Words>369</o:Words>
+ <o:Characters>2328</o:Characters>
+ <o:Lines>19</o:Lines>
+ <o:Paragraphs>5</o:Paragraphs>
+ <o:CharactersWithSpaces>2692</o:CharactersWithSpaces>
<o:Version>12.00</o:Version>
</o:DocumentProperties>
</xml><![endif]-->
@@ -55,6 +55,7 @@
<w:Word11KerningPairs/>
<w:CachedColBalance/>
</w:Compatibility>
+ <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
<m:mathPr>
<m:mathFont m:val="Cambria Math"/>
<m:brkBin m:val="before"/>
@@ -425,6 +426,9 @@
.MsoChpDefault
{mso-style-type:export-only;
mso-default-props:yes;
+ font-size:10.0pt;
+ mso-ansi-font-size:10.0pt;
+ mso-bidi-font-size:10.0pt;
mso-ascii-font-family:Calibri;
mso-ascii-theme-font:minor-latin;
mso-fareast-font-family:Calibri;
@@ -434,10 +438,6 @@
mso-bidi-font-family:"Times New Roman";
mso-bidi-theme-font:minor-bidi;
mso-fareast-language:EN-US;}
-.MsoPapDefault
- {mso-style-type:export-only;
- margin-bottom:10.0pt;
- line-height:115%;}
@page WordSection1
{size:595.3pt 841.9pt;
margin:70.85pt 70.85pt 2.0cm 70.85pt;
@@ -460,13 +460,10 @@
mso-style-qformat:yes;
mso-style-parent:"";
mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
- mso-para-margin-top:0cm;
- mso-para-margin-right:0cm;
- mso-para-margin-bottom:10.0pt;
- mso-para-margin-left:0cm;
- line-height:115%;
+ mso-para-margin:0cm;
+ mso-para-margin-bottom:.0001pt;
mso-pagination:widow-orphan;
- font-size:11.0pt;
+ font-size:10.0pt;
font-family:"Calibri","sans-serif";
mso-ascii-font-family:Calibri;
mso-ascii-theme-font:minor-latin;
@@ -500,7 +497,7 @@
mso-fareast-language:EN-US;}
</style>
<![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="3074"/>
+ <o:shapedefaults v:ext="edit" spidmax="4098"/>
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1"/>
@@ -517,18 +514,18 @@
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -536,20 +533,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>align</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -567,18 +564,18 @@
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -586,20 +583,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><o:p> </o:p></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -609,26 +606,24 @@
</tr>
</table>
-<p class=MsoNormal><o:p> </o:p></p>
-
<h1 style='margin-bottom:10.0pt'>designtoggle</h1>
<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -636,20 +631,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>-</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><o:p> </o:p></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -665,18 +660,18 @@
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -684,49 +679,44 @@
</td>
</tr>
<tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
- padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>-</p>
- </td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ padding:0cm 5.4pt 0cm 5.4pt'></td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><o:p> </o:p></p>
+ normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><o:p> </o:p></p>
+ normal'>string</p>
</td>
</tr>
</table>
-<p class=MsoNormal><o:p> </o:p></p>
-
<h1 style='margin-bottom:10.0pt'>switch</h1>
<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -734,20 +724,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:1'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>styling</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -756,20 +746,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>mapping</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -785,18 +775,18 @@
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -804,20 +794,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:1'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>label</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -826,20 +816,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>address</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>required</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -849,26 +839,24 @@
</tr>
</table>
-<p class=MsoNormal><o:p> </o:p></p>
-
<h1 style='margin-bottom:10.0pt'>trigger</h1>
<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -876,20 +864,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:1'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>value</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>required</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -898,20 +886,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:2'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>styling</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -920,20 +908,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>mapping</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -949,18 +937,18 @@
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -968,20 +956,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:1'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>label</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -989,21 +977,21 @@
normal'>string</p>
</td>
</tr>
- <tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <tr style='mso-yfti-irow:2'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>address</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>required</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -1011,28 +999,39 @@
normal'>KNX group address</p>
</td>
</tr>
+ <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'></td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'></td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'></td>
+ </tr>
</table>
-<h1 style='margin-bottom:10.0pt'><o:p> </o:p></h1>
-
<h1 style='margin-bottom:10.0pt'>multitrigger</h1>
<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -1040,20 +1039,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:1'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>styling</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -1062,20 +1061,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:2'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>mapping</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -1084,20 +1083,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:3'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>button1label</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -1106,20 +1105,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:4'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>button1value</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -1128,135 +1127,135 @@
</td>
</tr>
<tr style='mso-yfti-irow:5'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>button2label<o:p></o:p></p>
+ normal'>button2label</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>string<o:p></o:p></p>
+ normal'>string</p>
</td>
</tr>
<tr style='mso-yfti-irow:6'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>button2value<o:p></o:p></p>
+ normal'>button2value</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>depends on DPT<o:p></o:p></p>
+ normal'>depends on DPT</p>
</td>
</tr>
<tr style='mso-yfti-irow:7'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>button3label<o:p></o:p></p>
+ normal'>button3label</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>string<o:p></o:p></p>
+ normal'>string</p>
</td>
</tr>
<tr style='mso-yfti-irow:8'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>button3value<o:p></o:p></p>
+ normal'>button3value</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>depends on DPT<o:p></o:p></p>
+ normal'>depends on DPT</p>
</td>
</tr>
<tr style='mso-yfti-irow:9'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>button4label<o:p></o:p></p>
+ normal'>button4label</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>string<o:p></o:p></p>
+ normal'>string</p>
</td>
</tr>
<tr style='mso-yfti-irow:10;mso-yfti-lastrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>button4value<o:p></o:p></p>
+ normal'>button4value</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>depends on DPT<o:p></o:p></p>
+ normal'>depends on DPT</p>
</td>
</tr>
</table>
@@ -1267,18 +1266,18 @@
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -1286,20 +1285,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:1'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>label</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -1308,20 +1307,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>address</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>required</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -1331,26 +1330,24 @@
</tr>
</table>
-<p class=MsoNormal><o:p> </o:p></p>
-
<h1 style='margin-bottom:10.0pt'>slide</h1>
<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
</td>
- <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -1358,20 +1355,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:1'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>styling</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -1380,20 +1377,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:2'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>mapping</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>optional</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
@@ -1402,20 +1399,20 @@
</td>
</tr>
<tr style='mso-yfti-irow:3'>
- <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
normal'>min</p>
</td>
- <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-borde...
[truncated message content] |
|
From: <ma...@us...> - 2011-05-12 19:19:10
|
Revision: 333
http://openautomation.svn.sourceforge.net/openautomation/?rev=333&view=rev
Author: mayerch
Date: 2011-05-12 19:19:04 +0000 (Thu, 12 May 2011)
Log Message:
-----------
Test commit to check the SVN mailinglist settings.
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-12 18:25:06 UTC (rev 332)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-05-12 19:19:04 UTC (rev 333)
@@ -818,4 +818,5 @@
element.find('.value').text( value );
return value;
-}
\ No newline at end of file
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-05-12 18:25:15
|
Revision: 332
http://openautomation.svn.sourceforge.net/openautomation/?rev=332&view=rev
Author: j-n-k
Date: 2011-05-12 18:25:06 +0000 (Thu, 12 May 2011)
Log Message:
-----------
updated config scheme, added documentaion for widgets
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config.xsd
CometVisu/trunk/visu/visu_config_demo.xml
Added Paths:
-----------
CometVisu/trunk/documentation/
CometVisu/trunk/documentation/widgets.htm
Added: CometVisu/trunk/documentation/widgets.htm
===================================================================
--- CometVisu/trunk/documentation/widgets.htm (rev 0)
+++ CometVisu/trunk/documentation/widgets.htm 2011-05-12 18:25:06 UTC (rev 332)
@@ -0,0 +1,1712 @@
+<html xmlns:v="urn:schemas-microsoft-com:vml"
+xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 12">
+<meta name=Originator content="Microsoft Word 12">
+<link rel=File-List href="widgets-Dateien/filelist.xml">
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+ <o:Author>Jan N. Klug</o:Author>
+ <o:LastAuthor>Jan N. Klug</o:LastAuthor>
+ <o:Revision>2</o:Revision>
+ <o:Created>2011-05-12T10:58:00Z</o:Created>
+ <o:LastSaved>2011-05-12T10:58:00Z</o:LastSaved>
+ <o:Pages>2</o:Pages>
+ <o:Words>215</o:Words>
+ <o:Characters>1359</o:Characters>
+ <o:Lines>11</o:Lines>
+ <o:Paragraphs>3</o:Paragraphs>
+ <o:CharactersWithSpaces>1571</o:CharactersWithSpaces>
+ <o:Version>12.00</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]-->
+<link rel=themeData href="widgets-Dateien/themedata.thmx">
+<link rel=colorSchemeMapping href="widgets-Dateien/colorschememapping.xml">
+<!--[if gte mso 9]><xml>
+ <w:WordDocument>
+ <w:TrackMoves>false</w:TrackMoves>
+ <w:TrackFormatting/>
+ <w:HyphenationZone>21</w:HyphenationZone>
+ <w:PunctuationKerning/>
+ <w:ValidateAgainstSchemas/>
+ <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
+ <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
+ <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
+ <w:DoNotPromoteQF/>
+ <w:LidThemeOther>DE</w:LidThemeOther>
+ <w:LidThemeAsian>X-NONE</w:LidThemeAsian>
+ <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>
+ <w:Compatibility>
+ <w:BreakWrappedTables/>
+ <w:SnapToGridInCell/>
+ <w:WrapTextWithPunct/>
+ <w:UseAsianBreakRules/>
+ <w:DontGrowAutofit/>
+ <w:SplitPgBreakAndParaMark/>
+ <w:DontVertAlignCellWithSp/>
+ <w:DontBreakConstrainedForcedTables/>
+ <w:DontVertAlignInTxbx/>
+ <w:Word11KerningPairs/>
+ <w:CachedColBalance/>
+ </w:Compatibility>
+ <m:mathPr>
+ <m:mathFont m:val="Cambria Math"/>
+ <m:brkBin m:val="before"/>
+ <m:brkBinSub m:val="--"/>
+ <m:smallFrac m:val="off"/>
+ <m:dispDef/>
+ <m:lMargin m:val="0"/>
+ <m:rMargin m:val="0"/>
+ <m:defJc m:val="centerGroup"/>
+ <m:wrapIndent m:val="1440"/>
+ <m:intLim m:val="subSup"/>
+ <m:naryLim m:val="undOvr"/>
+ </m:mathPr></w:WordDocument>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:LatentStyles DefLockedState="false" DefUnhideWhenUsed="true"
+ DefSemiHidden="true" DefQFormat="false" DefPriority="99"
+ LatentStyleCount="267">
+ <w:LsdException Locked="false" Priority="0" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Normal"/>
+ <w:LsdException Locked="false" Priority="9" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="heading 1"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 2"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 3"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 4"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 5"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 6"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 7"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 8"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 9"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 1"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 2"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 3"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 4"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 5"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 6"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 7"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 8"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 9"/>
+ <w:LsdException Locked="false" Priority="35" QFormat="true" Name="caption"/>
+ <w:LsdException Locked="false" Priority="10" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Title"/>
+ <w:LsdException Locked="false" Priority="1" Name="Default Paragraph Font"/>
+ <w:LsdException Locked="false" Priority="11" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Subtitle"/>
+ <w:LsdException Locked="false" Priority="22" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Strong"/>
+ <w:LsdException Locked="false" Priority="20" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Emphasis"/>
+ <w:LsdException Locked="false" Priority="59" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Table Grid"/>
+ <w:LsdException Locked="false" UnhideWhenUsed="false" Name="Placeholder Text"/>
+ <w:LsdException Locked="false" Priority="1" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="No Spacing"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 1"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 1"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 1"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 1"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 1"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 1"/>
+ <w:LsdException Locked="false" UnhideWhenUsed="false" Name="Revision"/>
+ <w:LsdException Locked="false" Priority="34" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="List Paragraph"/>
+ <w:LsdException Locked="false" Priority="29" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Quote"/>
+ <w:LsdException Locked="false" Priority="30" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Intense Quote"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 1"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 1"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 1"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 1"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 1"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 1"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 1"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 1"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 2"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 2"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 2"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 2"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 2"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 2"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 2"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 2"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 2"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 2"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 2"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 2"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 2"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 2"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 3"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 3"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 3"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 3"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 3"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 3"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 3"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 3"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 3"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 3"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 3"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 3"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 3"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 3"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 4"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 4"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 4"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 4"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 4"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 4"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 4"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 4"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 4"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 4"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 4"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 4"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 4"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 4"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 5"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 5"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 5"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 5"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 5"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 5"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 5"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 5"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 5"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 5"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 5"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 5"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 5"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 5"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 6"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 6"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 6"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 6"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 6"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 6"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 6"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 6"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 6"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 6"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 6"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 6"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 6"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 6"/>
+ <w:LsdException Locked="false" Priority="19" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Subtle Emphasis"/>
+ <w:LsdException Locked="false" Priority="21" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Intense Emphasis"/>
+ <w:LsdException Locked="false" Priority="31" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Subtle Reference"/>
+ <w:LsdException Locked="false" Priority="32" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Intense Reference"/>
+ <w:LsdException Locked="false" Priority="33" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Book Title"/>
+ <w:LsdException Locked="false" Priority="37" Name="Bibliography"/>
+ <w:LsdException Locked="false" Priority="39" QFormat="true" Name="TOC Heading"/>
+ </w:LatentStyles>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ @font-face
+ {font-family:"Cambria Math";
+ panose-1:2 4 5 3 5 4 6 3 2 4;
+ mso-font-charset:0;
+ mso-generic-font-family:roman;
+ mso-font-pitch:variable;
+ mso-font-signature:-536870145 1107305727 0 0 415 0;}
+@font-face
+ {font-family:Cambria;
+ panose-1:2 4 5 3 5 4 6 3 2 4;
+ mso-font-charset:0;
+ mso-generic-font-family:roman;
+ mso-font-pitch:variable;
+ mso-font-signature:-536870145 1073743103 0 0 415 0;}
+@font-face
+ {font-family:Calibri;
+ panose-1:2 15 5 2 2 2 4 3 2 4;
+ mso-font-charset:0;
+ mso-generic-font-family:swiss;
+ mso-font-pitch:variable;
+ mso-font-signature:-520092929 1073786111 9 0 415 0;}
+ /* Style Definitions */
+ p.MsoNormal, li.MsoNormal, div.MsoNormal
+ {mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-parent:"";
+ margin-top:0cm;
+ margin-right:0cm;
+ margin-bottom:10.0pt;
+ margin-left:0cm;
+ line-height:115%;
+ mso-pagination:widow-orphan;
+ font-size:11.0pt;
+ font-family:"Calibri","sans-serif";
+ mso-ascii-font-family:Calibri;
+ mso-ascii-theme-font:minor-latin;
+ mso-fareast-font-family:Calibri;
+ mso-fareast-theme-font:minor-latin;
+ mso-hansi-font-family:Calibri;
+ mso-hansi-theme-font:minor-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:minor-bidi;
+ mso-fareast-language:EN-US;}
+h1
+ {mso-style-priority:9;
+ mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-link:"\xDCberschrift 1 Zchn";
+ mso-style-next:Standard;
+ margin-top:24.0pt;
+ margin-right:0cm;
+ margin-bottom:0cm;
+ margin-left:0cm;
+ margin-bottom:.0001pt;
+ line-height:115%;
+ mso-pagination:widow-orphan lines-together;
+ page-break-after:avoid;
+ mso-outline-level:1;
+ font-size:14.0pt;
+ font-family:"Cambria","serif";
+ mso-ascii-font-family:Cambria;
+ mso-ascii-theme-font:major-latin;
+ mso-fareast-font-family:"Times New Roman";
+ mso-fareast-theme-font:major-fareast;
+ mso-hansi-font-family:Cambria;
+ mso-hansi-theme-font:major-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:major-bidi;
+ color:#365F91;
+ mso-themecolor:accent1;
+ mso-themeshade:191;
+ mso-font-kerning:0pt;
+ mso-fareast-language:EN-US;}
+span.berschrift1Zchn
+ {mso-style-name:"\xDCberschrift 1 Zchn";
+ mso-style-priority:9;
+ mso-style-unhide:no;
+ mso-style-locked:yes;
+ mso-style-link:"\xDCberschrift 1";
+ mso-ansi-font-size:14.0pt;
+ mso-bidi-font-size:14.0pt;
+ font-family:"Cambria","serif";
+ mso-ascii-font-family:Cambria;
+ mso-ascii-theme-font:major-latin;
+ mso-fareast-font-family:"Times New Roman";
+ mso-fareast-theme-font:major-fareast;
+ mso-hansi-font-family:Cambria;
+ mso-hansi-theme-font:major-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:major-bidi;
+ color:#365F91;
+ mso-themecolor:accent1;
+ mso-themeshade:191;
+ font-weight:bold;}
+.MsoChpDefault
+ {mso-style-type:export-only;
+ mso-default-props:yes;
+ mso-ascii-font-family:Calibri;
+ mso-ascii-theme-font:minor-latin;
+ mso-fareast-font-family:Calibri;
+ mso-fareast-theme-font:minor-latin;
+ mso-hansi-font-family:Calibri;
+ mso-hansi-theme-font:minor-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:minor-bidi;
+ mso-fareast-language:EN-US;}
+.MsoPapDefault
+ {mso-style-type:export-only;
+ margin-bottom:10.0pt;
+ line-height:115%;}
+@page WordSection1
+ {size:595.3pt 841.9pt;
+ margin:70.85pt 70.85pt 2.0cm 70.85pt;
+ mso-header-margin:35.4pt;
+ mso-footer-margin:35.4pt;
+ mso-paper-source:0;}
+div.WordSection1
+ {page:WordSection1;}
+-->
+</style>
+<!--[if gte mso 10]>
+<style>
+ /* Style Definitions */
+ table.MsoNormalTable
+ {mso-style-name:"Normale Tabelle";
+ mso-tstyle-rowband-size:0;
+ mso-tstyle-colband-size:0;
+ mso-style-noshow:yes;
+ mso-style-priority:99;
+ mso-style-qformat:yes;
+ mso-style-parent:"";
+ mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
+ mso-para-margin-top:0cm;
+ mso-para-margin-right:0cm;
+ mso-para-margin-bottom:10.0pt;
+ mso-para-margin-left:0cm;
+ line-height:115%;
+ mso-pagination:widow-orphan;
+ font-size:11.0pt;
+ font-family:"Calibri","sans-serif";
+ mso-ascii-font-family:Calibri;
+ mso-ascii-theme-font:minor-latin;
+ mso-hansi-font-family:Calibri;
+ mso-hansi-theme-font:minor-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:minor-bidi;
+ mso-fareast-language:EN-US;}
+table.MsoTableGrid
+ {mso-style-name:Tabellengitternetz;
+ mso-tstyle-rowband-size:0;
+ mso-tstyle-colband-size:0;
+ mso-style-priority:59;
+ mso-style-unhide:no;
+ border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;
+ mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
+ mso-border-insideh:.5pt solid windowtext;
+ mso-border-insidev:.5pt solid windowtext;
+ mso-para-margin:0cm;
+ mso-para-margin-bottom:.0001pt;
+ mso-pagination:widow-orphan;
+ font-size:11.0pt;
+ font-family:"Calibri","sans-serif";
+ mso-ascii-font-family:Calibri;
+ mso-ascii-theme-font:minor-latin;
+ mso-hansi-font-family:Calibri;
+ mso-hansi-theme-font:minor-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:minor-bidi;
+ mso-fareast-language:EN-US;}
+</style>
+<![endif]--><!--[if gte mso 9]><xml>
+ <o:shapedefaults v:ext="edit" spidmax="3074"/>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <o:shapelayout v:ext="edit">
+ <o:idmap v:ext="edit" data="1"/>
+ </o:shapelayout></xml><![endif]-->
+</head>
+
+<body lang=DE style='tab-interval:35.4pt'>
+
+<div class=WordSection1>
+
+<h1 style='margin-bottom:10.0pt'>text</h1>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>align</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><span style='font-family:"Courier New"'>left</span>, <span
+ style='font-family:"Courier New"'>right</span>, <span style='font-family:
+ "Courier New"'>center</span></p>
+ </td>
+ </tr>
+</table>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><o:p> </o:p></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>string</p>
+ </td>
+ </tr>
+</table>
+
+<p class=MsoNormal><o:p> </o:p></p>
+
+<h1 style='margin-bottom:10.0pt'>designtoggle</h1>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>-</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><o:p> </o:p></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><o:p> </o:p></p>
+ </td>
+ </tr>
+</table>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>-</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><o:p> </o:p></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><o:p> </o:p></p>
+ </td>
+ </tr>
+</table>
+
+<p class=MsoNormal><o:p> </o:p></p>
+
+<h1 style='margin-bottom:10.0pt'>switch</h1>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:1'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>styling</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>previously defined styling</p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>mapping</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>previously defined mapping</p>
+ </td>
+ </tr>
+</table>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:1'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>label</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>string</p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>address</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>required</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>KNX group address</p>
+ </td>
+ </tr>
+</table>
+
+<p class=MsoNormal><o:p> </o:p></p>
+
+<h1 style='margin-bottom:10.0pt'>trigger</h1>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:1'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>value</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>required</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>depends on DPT</p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:2'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>styling</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>previously defined styling</p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>mapping</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>previously defined mapping</p>
+ </td>
+ </tr>
+</table>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:1'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>label</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>string</p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>address</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>required</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>KNX group address</p>
+ </td>
+ </tr>
+</table>
+
+<h1 style='margin-bottom:10.0pt'><o:p> </o:p></h1>
+
+<h1 style='margin-bottom:10.0pt'>multitrigger</h1>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:1'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>styling</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>previously defined styling</p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:2'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>mapping</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>previously defined mapping</p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:3'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>button1label</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>string</p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:4'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>button1value</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>depends on DPT</p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:5'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>button2label<o:p></o:p></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional<o:p></o:p></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>string<o:p></o:p></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:6'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowte...
[truncated message content] |
|
From: <ma...@us...> - 2011-05-12 17:03:45
|
Revision: 331
http://openautomation.svn.sourceforge.net/openautomation/?rev=331&view=rev
Author: mayerch
Date: 2011-05-12 17:03:39 +0000 (Thu, 12 May 2011)
Log Message:
-----------
Fix bug #3300926: "Multitrigger display broken"
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-05-11 16:04:16 UTC (rev 330)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-05-12 17:03:39 UTC (rev 331)
@@ -349,8 +349,11 @@
address[ '_' + src ] = [ transform, readonly=='true' ];
});
ret_val.append( label );
+ var buttons = $('<div style="float:left"/>');
+ var buttonCount = 0;
if( $p.attr('button1label') )
{
+ //buttonCount++;
var actor = '<div class="actor switchUnpressed">';
actor += '<div class="value">' + $p.attr('button1label') + '</div>';
actor += '</div>';
@@ -361,7 +364,8 @@
'value' : $p.attr('button1value'),
'type' : 'switch'
} ).bind( 'click', this.action );
- ret_val.append( $actor );
+ buttons.append( $actor );
+ if( 1 == (buttonCount++ % 2) ) buttons.append( $('<br/>') );
}
if( $p.attr('button2label') )
{
@@ -375,7 +379,8 @@
'value' : $p.attr('button2value'),
'type' : 'switch'
} ).bind( 'click', this.action );
- ret_val.append( $actor );
+ buttons.append( $actor );
+ if( 1 == (buttonCount++ % 2) ) buttons.append( $('<br/>') );
}
if( $p.attr('button3label') )
{
@@ -389,7 +394,8 @@
'value' : $p.attr('button3value'),
'type' : 'switch'
} ).bind( 'click', this.action );
- ret_val.append( $actor );
+ buttons.append( $actor );
+ if( 1 == buttonCount++ % 2 ) buttons.append( $('<br/>') );
}
if( $p.attr('button4label') )
{
@@ -403,11 +409,12 @@
'value' : $p.attr('button4value'),
'type' : 'switch'
} ).bind( 'click', this.action );
- ret_val.append( $actor );
+ buttons.append( $actor );
+ if( 1 == buttonCount++ % 2 ) buttons.append( $('<br/>') );
}
//for( var addr in address ) $actor.bind( addr, this.update );
// ret_val.append( label ).append( $actor );
- return ret_val;
+ return ret_val.append( buttons );
},
update: function(e,d) {
var element = $(this);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
