fix multi-module relays

SK21 · Feb 29, 2024 · 2ea8adb · 2ea8adb
1 parent 465c5cb
commit 2ea8adb
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 3 deletions.
diff --git 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
diff --git a/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/RateAppSource/RateController/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/RateAppSource/RateController/obj/Debug/RateController.csproj.GenerateResource.cache b/RateAppSource/RateController/obj/Debug/RateController.csproj.GenerateResource.cache
diff --git a/RateAppSource/RateController/obj/Debug/RateController.exe b/RateAppSource/RateController/obj/Debug/RateController.exe
diff --git a/RateAppSource/RateController/obj/Debug/RateController.pdb b/RateAppSource/RateController/obj/Debug/RateController.pdb
diff --git a/RateAppSource/RateController/obj/Debug/de/RateController.resources.dll b/RateAppSource/RateController/obj/Debug/de/RateController.resources.dll
diff --git a/RateAppSource/RateController/obj/Debug/nl/RateController.resources.dll b/RateAppSource/RateController/obj/Debug/nl/RateController.resources.dll
diff --git a/RateControllerApp/RateController.exe b/RateControllerApp/RateController.exe
diff --git a/RateControllerApp/de/RateController.resources.dll b/RateControllerApp/de/RateController.resources.dll
diff --git a/RateControllerApp/fr/RateController.resources.dll b/RateControllerApp/fr/RateController.resources.dll
diff --git a/RateControllerApp/hu/RateController.resources.dll b/RateControllerApp/hu/RateController.resources.dll
diff --git a/RateControllerApp/nl/RateController.resources.dll b/RateControllerApp/nl/RateController.resources.dll
diff --git a/RateControllerApp/pl/RateController.resources.dll b/RateControllerApp/pl/RateController.resources.dll
diff --git a/RateControllerApp/ru/RateController.resources.dll b/RateControllerApp/ru/RateController.resources.dll