Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom1.5/script/interface/dimmer.js @ 1663 – Rev 1687 → 1765

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

             "Speed"     : speed,
             "Direction" : direction };
         if (Module_SendMessage(aliases_data[name]["module_name"], aliases_data[name]["module_id"], "Start_Fade", variables))
+        {
-            Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
+            //Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
+        }
         else
+        {
             Log("\033[31mFailed to send command to " + name + ".\033[0m\n");
+        }
         var variables = {
         "Channel" : aliases_data[name]["specific"]["Channel"] };
         if (Module_SendMessage(aliases_data[name]["module_name"], aliases_data[name]["module_id"], "Stop_Fade", variables))
+        {
-            Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
+            //Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
+        }
         else
+        {
             Log("\033[31mFailed to send command to " + name + ".\033[0m\n");
+        }
     var aliases_data = Module_ResolveAlias(alias_name, Dimmer_ModuleNames);
     var found = false;
     for (var name in aliases_data)
+    {
+        if (aliases_data[name]["module_name"]=="hwPWM") {
+          level = level*39;
+        }
         var variables = {
         "Channel"   : aliases_data[name]["specific"]["Channel"],
         "Speed"     : speed,
         "EndValue"  : level };
         if (Module_SendMessage(aliases_data[name]["module_name"], aliases_data[name]["module_id"], "Abs_Fade", variables))
         {
-            Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
+            //Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
         }
         else
         {
             Log("\033[31mFailed to send command to " + name + ".\033[0m\n");
         }
         found = true;
     }
     if (!found)
     {
         Log("\033[31mNo aliases by the name " + alias_name + " were applicable for this command.\033[0m\n");
         return false;
     }
     return true;
+}
 Console_RegisterCommand(Dimmer_AbsoluteFade, function(arg_index, args) { return Console_StandardAutocomplete(arg_index, args, Dimmer_Aliases(), Dimmer_SpeedLevels(), Dimmer_StrengthLevels()); });
 function Dimmer_RelativeFade(alias_name, speed, direction, steps)
 {
     if (arguments.length < 4)
     {
         Log("\033[31mNot enough parameters given.\033[0m\n");
         return false;
     }
     var aliases_data = Module_ResolveAlias(alias_name, Dimmer_ModuleNames);
     var found = false;
     for (var name in aliases_data)
+    {
+        if (aliases_data[name]["module_name"]=="hwPWM") {
+          steps = steps*39;
+        }
         var variables = {
         "Channel"   : aliases_data[name]["specific"]["Channel"],
         "Speed"     : speed,
         "Direction" : direction,
         "Steps"     : steps };
         if (Module_SendMessage(aliases_data[name]["module_name"], aliases_data[name]["module_id"], "Rel_Fade", variables))
         {
-            Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
+            //Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
         }
         else
         {
             Log("\033[31mFailed to send command to " + name + ".\033[0m\n");
         }
         found = true;
     }
     if (!found)
+    {
         Log("\033[31mNo aliases by the name " + alias_name + " were applicable for this command.\033[0m\n");
         return false;
     }
     return true;
+}
 Console_RegisterCommand(Dimmer_RelativeFade, function(arg_index, args) { return Console_StandardAutocomplete(arg_index, args, Dimmer_Aliases(), Dimmer_SpeedLevels(), Dimmer_Directions(), Dimmer_StepsLevels()); });
 function Dimmer_Demo(alias_name, speed, steps)
+{
     if (arguments.length < 3)
     {
         Log("\033[31mNot enough parameters given.\033[0m\n");
         return false;
     }
     var aliases_data = Module_ResolveAlias(alias_name, Dimmer_ModuleNames);
     var found = false;
     for (var name in aliases_data)
+    {
+        if (aliases_data[name]["module_name"]=="hwPWM") {
+          steps = steps*39;
+        }
         var variables = {
         "Channel"   : aliases_data[name]["specific"]["Channel"],
         "Speed"     : speed,
         "Steps"     : steps };
         if (Module_SendMessage(aliases_data[name]["module_name"], aliases_data[name]["module_id"], "Demo", variables))
         {
-            Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
+            //Log("\033[32mCommand sent successfully to " + name + ".\033[0m\n");
+        }
         else
         {
             Log("\033[31mFailed to send command to " + name + ".\033[0m\n");
         }
         found = true;
     }
     if (!found)
+    {
         Log("\033[31mNo aliases by the name " + alias_name + " were applicable for this command.\033[0m\n");
         return false;
+    }
     return true;
 }
 Console_RegisterCommand(Dimmer_Demo, function(arg_index, args) { return Console_StandardAutocomplete(arg_index, args, Dimmer_Aliases(), Dimmer_SpeedLevels(), Dimmer_StepsLevels()); });
 function Dimmer_OnMessage(module_name, module_id, command, variables)
+{
     if (in_array(Dimmer_ModuleNames, module_name))
         switch (command)
+        {
             case "Netinfo":
+            {
                 for (var alias_name in aliases_data)
-                {
-                    if (aliases_data[alias_name]["specific"]["Channel"] != variables["Channel"])
+                {
+                    if (aliases_data[alias_name]["specific"]["Channel"] != variables["Channel"])
+                    {
                         continue;
+                    }
+                    var last_value = {};
+                    var last_value_string = Storage_GetParameter("LastValues", alias_name);
+                    if (last_value_string)
+                    {
+                        last_value = eval("(" + last_value_string + ")");
+                    }
+                    last_value["Connection"] = { "value" : variables["Connection"], "timestamp" : get_time() };
+                    last_value["Frequency"] = { "value" : variables["Frequency"], "timestamp" : get_time() };
+                    last_value["Level"] = { "value" : variables["DimmerValue"], "timestamp" : get_time() };
+                    Storage_SetParameter("LastValues", alias_name, JSON.stringify(last_value));
+                }
+                break;
+            }
+            case "Pwm":
+            {
+                for (var alias_name in aliases_data)
+                {
+                    if (aliases_data[alias_name]["specific"]["Channel"] != variables["Id"])
+                    {
+                        continue;
+                    }
                     var last_value = {};
                     var last_value_string = Storage_GetParameter("LastValues", alias_name);
                     if (last_value_string)
+                    {
                         last_value = eval("(" + last_value_string + ")");
+                    }
-                    last_value["Connection"] = { "value" : variables["Connection"], "timestamp" : get_time() };
+                    var value = 0 + variables["Value"];
+                    value = value / 39;
-                    last_value["Frequency"] = { "value" : variables["Frequency"], "timestamp" : get_time() };
+                    value = parseInt(value).toString();
-                    last_value["Level"] = { "value" : variables["DimmerValue"], "timestamp" : get_time() };
+                    last_value["Level"] = { "value" : value, "timestamp" : get_time() };
                     Storage_SetParameter("LastValues", alias_name, JSON.stringify(last_value));
+                }
                 break;