[Openautomation-svn] SF.net SVN: openautomation:[633] tools/russconnectd/trunk

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

Revision: 633
          http://openautomation.svn.sourceforge.net/openautomation/?rev=633&view=rev
Author:   makki1
Date:     2012-01-05 13:32:10 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
russconnectd: Release 0.21, fixed bass/treble, better cfgmaker

Modified Paths:
--------------
    tools/russconnectd/trunk/cfgmaker.pl
    tools/russconnectd/trunk/openwrt/russconnectd/Makefile
    tools/russconnectd/trunk/russ_galist.ods

Modified: tools/russconnectd/trunk/cfgmaker.pl
===================================================================
--- tools/russconnectd/trunk/cfgmaker.pl	2012-01-03 21:07:03 UTC (rev 632)
+++ tools/russconnectd/trunk/cfgmaker.pl	2012-01-05 13:32:10 UTC (rev 633)
@@ -1,14 +1,18 @@
 #!/usr/bin/perl
 use strict;
 
-my $ZONES_PER_CONTROLLER = 6; #static
-my @gfuncnames = qw(SetAllZonesPower WRITEONLYACT NA3 NA4 NA5 AllZonesPowerState);
 my @funcnames = qw(SetPower SetSource SetVol SetBass SetTreble SetLoudness SetBalance SetParty SetDnD SetOnVol SourceSetCMD SourceKeypadCMD SetVolRelative);
 my @statenames = qw(PowerState SourceSelected VolumeState BassState TrebleState LoudnessState BalanceState PartyState DnDState OnVolState);
 my $NamePrefix = "Multiroom";
 my @SourceNames = qw(UKW-Tuner vdr/mpd Denon-WZ WG1 WG2 Hobby);
+my $CV_switch_mapping = "On_Off";
+my $CV_switch_styling = "Green_Red";
+my $CV_source_mapping_name = "RussoundSRC";
+
 ### End config - Don't change below ###
 #######################################
+my $ZONES_PER_CONTROLLER = 6; #static
+my @gfuncnames = qw(SetAllZonesPower WRITEONLYACT NA3 NA4 NA5 AllZonesPowerState);
 
 use File::Copy; 
 use Config::Tiny;
@@ -58,7 +62,7 @@
 print VISU1 "    <page name=\"$NamePrefix\">\n";
 
 print VISU2 "<!-- Change SourceNames in script and insert this on top between <mappings> and </mappings> -->\n";
-print VISU2 "      <mapping name=\"RussoundSRC\">\n"
+print VISU2 "      <mapping name=\"$CV_source_mapping_name\">\n"
 ."        <entry value=\"0\">$SourceNames[0]</entry>\n"
 ."        <entry value=\"1\">$SourceNames[1]</entry>\n"
 ."        <entry value=\"2\">$SourceNames[2]</entry>\n"
@@ -103,7 +107,7 @@
         print ESF "$NamePrefix.Controller$ctrl." . addr2str($basega+$i+20,1) . "\t" . "$NamePrefix $zonenames[$zone] C" . ($ctrl+1) . "-Z" . ($czone+1) . " $statenames[$i]" . "\t" . $EISmap{$statedpts[$i]} . "\tLow\n";
         print XML "\t\t<object id=\"$zonenames[$zone]_C" . ($ctrl+1) . "_Z" . ($czone+1) . "_" . "$statenames[$i]\" gad=\"" . addr2str($basega+$i+20,1) . "\" type=\"$statedpts[$i]\">" . "$NamePrefix $zonenames[$zone] (C" . ($ctrl+1) . "/Z" . ($czone+1) . ") $statenames[$i]" . "</object>\n";
     }
-    print VISU1 '      <switch mapping="OnOff" styling="GreenRed">'
+    print VISU1 '      <switch mapping="'. $CV_switch_mapping .'" styling="'. $CV_switch_styling .'">'
              ."\n        <label>$zonenames[$zone]</label>\n"
                .'        <address transform="DPT:1.001" readonly="false" type="">' . addr2str($basega,1) . "</address>\n"
                .'        <address transform="DPT:1.001" readonly="true" type="">' .  addr2str($basega+20,1) . "</address>\n"
@@ -115,7 +119,7 @@
                ."      </slide>\n";
                
     print VISU2 "    <page name=\"$NamePrefix $zonenames[$zone]\">\n";
-    print VISU2 '      <switch mapping="OnOff" styling="GreenRed">'
+    print VISU2 '      <switch mapping="'. $CV_switch_mapping .'" styling="'. $CV_switch_styling .'">'
              ."\n        <label>Power</label>\n"
                .'        <address transform="DPT:1.001" readonly="false" type="">' . addr2str($basega,1) . "</address>\n"
                .'        <address transform="DPT:1.001" readonly="true" type="">' .  addr2str($basega+20,1) . "</address>\n"
@@ -136,7 +140,7 @@
                .'        <address transform="DPT:5.010" readonly="false">' . addr2str($basega+1,1) . "</address>\n"
                .'        <address transform="DPT:5.010" readonly="true">' .  addr2str($basega+21,1) . "</address>\n"
                ."      </infotrigger>\n";
-    print VISU2 '      <switch mapping="OnOff" styling="GreenRed">'
+    print VISU2 '      <switch mapping="'. $CV_switch_mapping .'" styling="'. $CV_switch_styling .'">'
              ."\n        <label>Loudness</label>\n"
                .'        <address transform="DPT:1.001" readonly="false" type="">' . addr2str($basega+5,1) . "</address>\n"
                .'        <address transform="DPT:1.001" readonly="true" type="">' .  addr2str($basega+25,1) . "</address>\n"
@@ -172,12 +176,12 @@
                .'        <address transform="DPT:6.001" readonly="false" type="">' . addr2str($basega+6,1) . "</address>\n"
                .'        <address transform="DPT:6.001" readonly="true" type="">' .  addr2str($basega+26,1) . "</address>\n"
                ."      </infotrigger>\n";
-    print VISU2 '      <switch mapping="OnOff" styling="GreenRed">'
+    print VISU2 '      <switch mapping="'. $CV_switch_mapping .'" styling="'. $CV_switch_styling .'">'
              ."\n        <label>Party</label>\n"
                .'        <address transform="DPT:1.001" readonly="false" type="">' . addr2str($basega+7,1) . "</address>\n"
                .'        <address transform="DPT:1.001" readonly="true" type="">' .  addr2str($basega+27,1) . "</address>\n"
                ."      </switch>\n";
-    print VISU2 '      <switch mapping="OnOff" styling="GreenRed">'
+    print VISU2 '      <switch mapping="'. $CV_switch_mapping .'" styling="'. $CV_switch_styling .'">'
              ."\n        <label>DnD</label>\n"
                .'        <address transform="DPT:1.001" readonly="false" type="">' . addr2str($basega+8,1) . "</address>\n"
                .'        <address transform="DPT:1.001" readonly="true" type="">' .  addr2str($basega+28,1) . "</address>\n"

Modified: tools/russconnectd/trunk/openwrt/russconnectd/Makefile
===================================================================
--- tools/russconnectd/trunk/openwrt/russconnectd/Makefile	2012-01-03 21:07:03 UTC (rev 632)
+++ tools/russconnectd/trunk/openwrt/russconnectd/Makefile	2012-01-05 13:32:10 UTC (rev 633)
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=russconnectd
-PKG_VERSION:=0.1
+PKG_VERSION:=0.21
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

Modified: tools/russconnectd/trunk/russ_galist.ods
===================================================================
(Binary files differ)

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