diff --git a/RateAppSource/RateController/Classes/clsRelays.cs b/RateAppSource/RateController/Classes/clsRelays.cs index b0f0dc00..987e1a0e 100644 --- a/RateAppSource/RateController/Classes/clsRelays.cs +++ b/RateAppSource/RateController/Classes/clsRelays.cs @@ -263,7 +263,7 @@ public int SetRelays(int ModuleID) } // build return int - if (Rly.IsON) Result |= (int)Math.Pow(2, i); + if (Rly.IsON) Result |= (int)Math.Pow(2, Rly.ID); } } } @@ -284,7 +284,8 @@ private void BuildPowerRelays() cPowerRelays[i] = 0; for (int j = 0; j < cRelays.Count; j++) { - if (cRelays[j].Type == RelayTypes.Power && cRelays[j].ModuleID == i) cPowerRelays[i] |= (int)Math.Pow(2, j); + clsRelay Rly = cRelays[j]; + if (Rly.Type == RelayTypes.Power && Rly.ModuleID == i) cPowerRelays[i] |= (int)Math.Pow(2, Rly.ID); } } } @@ -296,7 +297,8 @@ private void BuildInvertedRelays() cInvertedRelays[i] = 0; for (int j = 0; j < cRelays.Count; j++) { - if (cRelays[j].Type == RelayTypes.Invert_Section && cRelays[j].ModuleID == i) cInvertedRelays[i] |= (int)Math.Pow(2, j); + clsRelay Rly = cRelays[j]; + if (Rly.Type == RelayTypes.Invert_Section && Rly.ModuleID == i) cInvertedRelays[i] |= (int)Math.Pow(2, Rly.ID); } } } diff --git a/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 4382aa9f..6a55e5da 100644 Binary files a/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 69d20bb9..2d01e769 100644 Binary files a/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/RateAppSource/RateController/obj/Debug/RateController.csproj.GenerateResource.cache b/RateAppSource/RateController/obj/Debug/RateController.csproj.GenerateResource.cache index a7666aea..70bc4bfb 100644 Binary files a/RateAppSource/RateController/obj/Debug/RateController.csproj.GenerateResource.cache and b/RateAppSource/RateController/obj/Debug/RateController.csproj.GenerateResource.cache differ diff --git a/RateAppSource/RateController/obj/Debug/RateController.exe b/RateAppSource/RateController/obj/Debug/RateController.exe index 0a0ae6df..cdb05515 100644 Binary files a/RateAppSource/RateController/obj/Debug/RateController.exe and b/RateAppSource/RateController/obj/Debug/RateController.exe differ diff --git a/RateAppSource/RateController/obj/Debug/RateController.pdb b/RateAppSource/RateController/obj/Debug/RateController.pdb index 33e0a9b0..cc4d3072 100644 Binary files a/RateAppSource/RateController/obj/Debug/RateController.pdb and b/RateAppSource/RateController/obj/Debug/RateController.pdb differ diff --git a/RateAppSource/RateController/obj/Debug/de/RateController.resources.dll b/RateAppSource/RateController/obj/Debug/de/RateController.resources.dll index 1566cbfc..c9e0edb8 100644 Binary files a/RateAppSource/RateController/obj/Debug/de/RateController.resources.dll and b/RateAppSource/RateController/obj/Debug/de/RateController.resources.dll differ diff --git a/RateAppSource/RateController/obj/Debug/nl/RateController.resources.dll b/RateAppSource/RateController/obj/Debug/nl/RateController.resources.dll index 6e740d62..343977ed 100644 Binary files a/RateAppSource/RateController/obj/Debug/nl/RateController.resources.dll and b/RateAppSource/RateController/obj/Debug/nl/RateController.resources.dll differ diff --git a/RateControllerApp/RateController.exe b/RateControllerApp/RateController.exe index 0a0ae6df..cdb05515 100644 Binary files a/RateControllerApp/RateController.exe and b/RateControllerApp/RateController.exe differ diff --git a/RateControllerApp/de/RateController.resources.dll b/RateControllerApp/de/RateController.resources.dll index 1566cbfc..c9e0edb8 100644 Binary files a/RateControllerApp/de/RateController.resources.dll and b/RateControllerApp/de/RateController.resources.dll differ diff --git a/RateControllerApp/fr/RateController.resources.dll b/RateControllerApp/fr/RateController.resources.dll index dad8e3c7..60b31bb1 100644 Binary files a/RateControllerApp/fr/RateController.resources.dll and b/RateControllerApp/fr/RateController.resources.dll differ diff --git a/RateControllerApp/hu/RateController.resources.dll b/RateControllerApp/hu/RateController.resources.dll index 7065f89e..77796b2e 100644 Binary files a/RateControllerApp/hu/RateController.resources.dll and b/RateControllerApp/hu/RateController.resources.dll differ diff --git a/RateControllerApp/nl/RateController.resources.dll b/RateControllerApp/nl/RateController.resources.dll index 6e740d62..343977ed 100644 Binary files a/RateControllerApp/nl/RateController.resources.dll and b/RateControllerApp/nl/RateController.resources.dll differ diff --git a/RateControllerApp/pl/RateController.resources.dll b/RateControllerApp/pl/RateController.resources.dll index 52638b18..63e6d980 100644 Binary files a/RateControllerApp/pl/RateController.resources.dll and b/RateControllerApp/pl/RateController.resources.dll differ diff --git a/RateControllerApp/ru/RateController.resources.dll b/RateControllerApp/ru/RateController.resources.dll index b20ab726..41c5258d 100644 Binary files a/RateControllerApp/ru/RateController.resources.dll and b/RateControllerApp/ru/RateController.resources.dll differ