Subversion Repositories HomeAutomation

Rev

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

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