Subversion Repositories HomeAutomation

Rev

Rev 2078 | Rev 2099 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed

Rev 2078 Rev 2079
Line 86... Line 86...
86 
   
 86 
   
87 
    return true;
 87 
    return true;
88 
}
 88 
}
89 
Console_RegisterCommand(Dimmer_StopFade, function(arg_index, args) { return Console_StandardAutocomplete(arg_index, args, Dimmer_Aliases()); });
 89 
Console_RegisterCommand(Dimmer_StopFade, function(arg_index, args) { return Console_StandardAutocomplete(arg_index, args, Dimmer_Aliases()); });
90 
 
 90 
 
91 
function Dimmer_AbsoluteFade(alias_name, speed, level_in)
 91 
function Dimmer_AbsoluteFade(alias_name, speed, level)
92 
{
 92 
{
93 
    if (arguments.length < 3)
 93 
    if (arguments.length < 3)
94 
    {
 94 
    {
95 
        Log("\033[31mNot enough parameters given.\033[0m\n");
 95 
        Log("\033[31mNot enough parameters given.\033[0m\n");
96 
        return false;
 96 
        return false;
97 
    }
 97 
    }
98 
   
 98 
   
99 
    var aliases_data = Module_ResolveAlias(alias_name, Dimmer_ModuleNames);
 99 
    var aliases_data = Module_ResolveAlias(alias_name, Dimmer_ModuleNames);
100 
    var found = false;
 100 
    var found = false;
101 
    var level = level_in;
 101 
    var level_set = level;
102 
   
 102 
   
103 
    for (var name in aliases_data)
 103 
    for (var name in aliases_data)
104 
    {
 104 
    {
105 
        if (aliases_data[name]["module_name"]=="hwPWM") {
 105 
        if (aliases_data[name]["module_name"]=="hwPWM") {
106 
          level = level_in*39;
 106 
            level_set = level*39;
107 
        }
 107 
        }
- 
 
 108 
       
- 
 
 109 
        //Check for undefined Channel parameter in alias
- 
 
 110 
        if (typeof aliases_data[name]["specific"]["Channel"] == 'undefined') {
- 
 
 111 
            Log("\033[31mFailed to send command to " + name + ", Alias does not contain specific parameter \"Channel\".\033[0m\n");
- 
 
 112 
            break;
- 
 
 113 
        }
- 
 
 114 
       
108 
        var variables = {
 115 
        var variables = {
109 
        "Channel"   : aliases_data[name]["specific"]["Channel"],
 116 
            "Channel"   : aliases_data[name]["specific"]["Channel"],
110 
        "Speed"     : speed,
 117 
            "Speed"     : speed,
111 
        "EndValue"  : level };
 118 
            "EndValue"  : level_set
- 
 
 119 
        };
112 
       
 120 
       
113 
        if (Module_SendMessage(aliases_data[name]["module_name"], aliases_data[name]["module_id"], "Abs_Fade", variables))
 121 
        if (Module_SendMessage(aliases_data[name]["module_name"], aliases_data[name]["module_id"], "Abs_Fade", variables))
114 
        {
 122 
        {
115 
            //Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
 123 
            //Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
116 
        }
 124 
        }
117 
        else
 125 
        else
118 
        {
 126 
        {
119 
            Log("\033[31mFailed to send command to " + name + ".\033[0m\n");
 127 
            Log("\033[31mFailed to send command to " + name + ".\033[0m\n");
120 
        }
 128 
        }
121 
       
 129 
       
122 
        found = true;
 130 
        found = true;
- 
 
 131 
       
123 
    }
 132 
    }
124 
   
 133 
   
125 
    if (!found)
 134 
    if (!found)
126 
    {
 135 
    {
127 
        Log("\033[31mNo aliases by the name " + alias_name + " were applicable for this command.\033[0m\n");
 136 
        Log("\033[31mNo aliases by the name " + alias_name + " were applicable for this command.\033[0m\n");
128 
        return false;
 137 
        return false;
129 
    }
 138 
    }
130 
   
 139 
   
131 
    return true;
 140 
    return true;
132 
}
 141 
}
133 
Console_RegisterCommand(Dimmer_AbsoluteFade, function(arg_index, args) { return Console_StandardAutocomplete(arg_index, args, Dimmer_Aliases(), Dimmer_SpeedLevels(), Dimmer_StrengthLevels()); });
 142 
Console_RegisterCommand(Dimmer_AbsoluteFade, function(arg_index, args) { return Console_StandardAutocomplete(arg_index, args, Dimmer_Aliases(), Dimmer_SpeedLevels(), Dimmer_StrengthLevels()); });
134 
 
 143 
 
135 
function Dimmer_RelativeFade(alias_name, speed, direction, steps)
 144 
function Dimmer_RelativeFade(alias_name, speed, direction, steps)
136 
{
 145 
{
137 
    if (arguments.length < 4)
 146 
    if (arguments.length < 4)
138 
    {
 147 
    {
139 
        Log("\033[31mNot enough parameters given.\033[0m\n");
 148 
        Log("\033[31mNot enough parameters given.\033[0m\n");
140 
        return false;
 149 
        return false;
141 
    }
 150 
    }
142 
   
 151 
   
143 
    var aliases_data = Module_ResolveAlias(alias_name, Dimmer_ModuleNames);
 152 
    var aliases_data = Module_ResolveAlias(alias_name, Dimmer_ModuleNames);
144 
    var found = false;
 153 
    var found = false;
- 
 
 154 
    var steps_set = steps;
145 
   
 155 
   
146 
    for (var name in aliases_data)
 156 
    for (var name in aliases_data)
147 
    {
 157 
    {
148 
        if (aliases_data[name]["module_name"]=="hwPWM") {
 158 
        if (aliases_data[name]["module_name"]=="hwPWM") {
149 
          steps = steps*39;
 159 
            steps_set = steps*39;
150 
        }
 160 
        }
151 
        var variables = {
 161 
        var variables = {
152 
        "Channel"   : aliases_data[name]["specific"]["Channel"],
 162 
            "Channel"   : aliases_data[name]["specific"]["Channel"],
153 
        "Speed"     : speed,
 163 
            "Speed"     : speed,
154 
        "Direction" : direction,
 164 
            "Direction" : direction,
155 
        "Steps"     : steps };
 165 
            "Steps"     : steps_set
- 
 
 166 
        };
- 
 
 167 
       
- 
 
 168 
        //Check for undefined Channel parameter in alias
- 
 
 169 
        if (typeof aliases_data[name]["specific"]["Channel"] == 'undefined') {
- 
 
 170 
            Log("\033[31mFailed to send command to " + name + ", Alias does not contain specific parameter \"Channel\".\033[0m\n");
- 
 
 171 
            break;
- 
 
 172 
        }
156 
       
 173 
       
157 
        if (Module_SendMessage(aliases_data[name]["module_name"], aliases_data[name]["module_id"], "Rel_Fade", variables))
 174 
        if (Module_SendMessage(aliases_data[name]["module_name"], aliases_data[name]["module_id"], "Rel_Fade", variables))
158 
        {
 175 
        {
159 
            //Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
 176 
            //Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
160 
        }
 177 
        }
161 
        else
 178 
        else
162 
        {
 179 
        {
163 
            Log("\033[31mFailed to send command to " + name + ".\033[0m\n");
 180 
            Log("\033[31mFailed to send command to " + name + ".\033[0m\n");
164 
        }
 181 
        }
165 
       
 182 
       
166 
        found = true;
 183 
        found = true;
167 
    }
 184 
    }
168 
   
 185 
   
169 
    if (!found)
 186 
    if (!found)
Line 181... Line 198...
181 
    if (arguments.length < 3)
 198 
    if (arguments.length < 3)
182 
    {
 199 
    {
183 
        Log("\033[31mNot enough parameters given.\033[0m\n");
 200 
        Log("\033[31mNot enough parameters given.\033[0m\n");
184 
        return false;
 201 
        return false;
185 
    }
 202 
    }
186 
   
 203 
   
187 
    var aliases_data = Module_ResolveAlias(alias_name, Dimmer_ModuleNames);
 204 
    var aliases_data = Module_ResolveAlias(alias_name, Dimmer_ModuleNames);
188 
    var found = false;
 205 
    var found = false;
- 
 
 206 
    var steps_set = steps;
189 
   
 207 
   
190 
    for (var name in aliases_data)
 208 
    for (var name in aliases_data)
191 
    {
 209 
    {
192 
        if (aliases_data[name]["module_name"]=="hwPWM") {
 210 
        if (aliases_data[name]["module_name"]=="hwPWM") {
193 
          steps = steps*39;
 211 
            steps_set = steps*39;
194 
        }
 212 
        }
195 
        var variables = {
 213 
        var variables = {
196 
        "Channel"   : aliases_data[name]["specific"]["Channel"],
 214 
            "Channel"   : aliases_data[name]["specific"]["Channel"],
197 
        "Speed"     : speed,
 215 
            "Speed"     : speed,
198 
        "Steps"     : steps };
 216 
            "Steps"     : steps_set
- 
 
 217 
        };
- 
 
 218 
       
- 
 
 219 
        //Check for undefined Channel parameter in alias
- 
 
 220 
        if (typeof aliases_data[name]["specific"]["Channel"] == 'undefined') {
- 
 
 221 
            Log("\033[31mFailed to send command to " + name + ", Alias does not contain specific parameter \"Channel\".\033[0m\n");
- 
 
 222 
            break;
- 
 
 223 
        }
199 
       
 224 
       
200 
        if (Module_SendMessage(aliases_data[name]["module_name"], aliases_data[name]["module_id"], "Demo", variables))
 225 
        if (Module_SendMessage(aliases_data[name]["module_name"], aliases_data[name]["module_id"], "Demo", variables))
201 
        {
 226 
        {
202 
            //Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
 227 
            //Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
203 
        }
 228 
        }