openautomation-svn Mailing List for Open Automation (Page 183)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 755
          http://openautomation.svn.sourceforge.net/openautomation/?rev=755&view=rev
Author:   pfry
Date:     2012-04-15 08:39:43 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
etwas eleganter mit given...when

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

Modified: wiregate/plugin/generic/Ansagen.pl
===================================================================

--- wiregate/plugin/generic/Ansagen.pl	2012-04-14 22:05:09 UTC (rev 754)
+++ wiregate/plugin/generic/Ansagen.pl	2012-04-15 08:39:43 UTC (rev 755)
@@ -71,6 +71,7 @@
 elsif($event=~/bus/ && $msg{'apci'} eq 'A_GroupValue_Write')
 {
     my $ga=$msg{'dst'};
+    my $val=$msg{'value'};
     my $dpt=$eibgaconf{$ga}{'DPTSubId'};
     $dpt=1.017 unless defined $dpt; # = Trigger, bedeutet Textansage ohne Daten
     
@@ -102,78 +103,64 @@
     }
     
     # Informationsteil (Inhalt des Telegramms)
-    if($dpt == 1.017) 
+    given($dpt)
     {
-	# kein Datenzusatz
-    }
-    elsif($dpt == 1.001) # An/Aus
-    {
-	push(@statement, 'Zahlen/'.($msg{'value'}?'an':'aus').'.wav');
-    }
-    elsif($dpt == 1.008) # Hoch/Runter
-    {
-	push(@statement, 'Zahlen/'.($msg{'value'}?'hoch':'runter').'.wav');
-    }
-    elsif($dpt == 1.009) # Auf/Zu
-    {
-	push(@statement, 'Zahlen/'.($msg{'value'}?'auf':'zu').'.wav');
-    }
-    elsif($dpt == 5.010 || $dpt == 7.001) # Ordinalzahl
-    {
-	push(@statement, number(\@speech, $msg{'value'}, -1));
-    }
-    elsif($dpt == 6.010 || $dpt == 8.001) # Kardinalzahl
-    {
-	push(@statement, number(\@speech, $msg{'value'}));
-    }
-    elsif($dpt == 6.001 || $dpt == 5.001) # Prozent
-    {
-	push(@statement, number(\@speech, $msg{'value'}));
-	push(@statement, 'Zahlen/Prozent.wav');
-    }
-    elsif($dpt == 9.001) # Temperatur
-    {
-	push(@statement, number(\@speech, $msg{'value'}, 1));
-	push(@statement, 'Zahlen/Grad.wav');
-    }
-    elsif($dpt == 11.001) # Datum
-    {
-	if($msg{'value'}=~/^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])/)
-	{
-	    my @monat=qw(Januar Februar Maerz April Mai Juni Juli August September Oktober November Dezember);
-	    push(@statement, number(\@speech, $3, -1));
-	    push(@statement, 'Monate/'.$monat[$2-1].'.wav') if defined $2 && $2>0 && $2<13;
+	when (1.001) # An/Aus
+	{ push(@statement, 'Zahlen/'.($val?'an':'aus').'.wav'); } 
+	when (1.008) # Hoch/Runter
+	{ push(@statement, 'Zahlen/'.($val?'hoch':'runter').'.wav'); }
+	when(1.009) # Auf/Zu
+	{ push(@statement, 'Zahlen/'.($val?'auf':'zu').'.wav'); }
+	when([5.010,7.001,12.001]) # Ordinalzahl
+	{ push(@statement, number(\@speech, $val, -1)); }
+	when([6.010,8.001,13.001]) # Kardinalzahl
+	{ push(@statement, number(\@speech, $val)); }
+	when([5.001,6.001]) # Prozent
+	{ 
+	    push(@statement, number(\@speech, $val));
+	    push(@statement, 'Zahlen/Prozent.wav'); 
 	}
-	else
+	when(9.001) # Temperatur
 	{
-	    return "Unbekanntes Datumsformat $msg{value}";
+	    push(@statement, number(\@speech, $val, 1));
+	    push(@statement, 'Zahlen/Grad.wav');
 	}
-    }
-    elsif($dpt == 10.001) # Uhrzeit
-    {
-	if($msg{'value'}=~/^(Mo|Di|Mi|Do|Fr|Sa|So)\s+([0-9][0-9])\:([0-9][0-9])/)
+	when(11.001) # Datum
 	{
-	    push(@statement, "Wochentage/$1.wav");
-	    push(@statement, number(\@speech, $2));
-	    push(@statement, "Zeiten/Uhr.wav");
-	    push(@statement, number(\@speech, $3));
+	    if($val=~/^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])/)
+	    {
+		my @monat=qw(Januar Februar Maerz April Mai Juni Juli August September Oktober November Dezember);
+		push(@statement, number(\@speech, $3, -1));
+		push(@statement, 'Monate/'.$monat[$2-1].'.wav') if defined $2 && $2>0 && $2<13;
+	    }    
+	    else
+	    {
+		return "Unbekanntes Datumsformat $val";
+	    }
 	}
-	elsif($msg{'value'}=~/^([0-9][0-9])\:([0-9][0-9])}\:([0-9][0-9])/)
+	when(10.001) # Uhrzeit
 	{
-	    push(@statement, number(\@speech, $2));
-	    push(@statement, "Zeiten/Uhr.wav");
-	    push(@statement, number(\@speech, $3));
+	    if($val=~/^(Mo|Di|Mi|Do|Fr|Sa|So)\s+([0-9][0-9])\:([0-9][0-9])/)
+	    {
+		push(@statement, "Wochentage/$1.wav");
+		push(@statement, number(\@speech, $2));
+		push(@statement, "Zeiten/Uhr.wav");
+		push(@statement, number(\@speech, $3));
+	    }
+	    elsif($val=~/^([0-9][0-9])\:([0-9][0-9])}\:([0-9][0-9])/)
+	    {
+		push(@statement, number(\@speech, $2));
+		push(@statement, "Zeiten/Uhr.wav");
+		push(@statement, number(\@speech, $3));
+	    }
+	    else
+	    {
+		return "Unbekanntes Uhrzeitformat $msg{value}";
+	    }
 	}
-	else
-	{
-	    return "Unbekanntes Uhrzeitformat $msg{value}";
-	}
+	when(1.017) {}  # kein Datenzusatz  
+	default	{ return "Datentyp $dpt nicht implementiert"; }
     }
-    else
-    {
-	return "Datentyp $dpt nicht implementiert";
-    }
-    
     # Das komplette Statement in die Ausgabe geben
     speak($channel, $name, @statement);
     

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





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

openautomation-svn Mailing List for Open Automation (Page 183)

Building automation (like KNX or OpenHAB) software (like CometVisu).

openautomation-svn — Mailinglist that shows all subversion commits