BuzzerDevice: Poll() - Fixed an error in the query of the individual …

…buttons. Now in the "Buttons" mode each user can make a selection.
gueggel · Aug 23, 2022 · cfb9853 · cfb9853
1 parent 3a1576c
commit cfb9853
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/SJ.Buzzer/Helper/BuzzerDevice.cs b/SJ.Buzzer/Helper/BuzzerDevice.cs
@@ -10,7 +10,7 @@
  * @link       https://stefanjahn.de
  *
  * @date       20.04.2012 21:58
- * @version    20210528
+ * @version    20220823
  * @license    http://www.gnu.org/copyleft/gpl.html
  * ------------------------------------------------------------------------
  * This program is free software: you can redistribute it and/or modify
@@ -459,11 +459,11 @@ public void Poll()
                 return;
             }
 
-            //Beenden falls ein Auswahlbutton eines Buzzers schon gedrueckt worden ist
+            //Beenden falls die Auswahlbuttons der Buzzers schon gedrueckt worden ist
             if( QueryButtons[BuzzerNumber.One] == QueryButtonsType.IsPressed
-                 || QueryButtons[BuzzerNumber.Two] == QueryButtonsType.IsPressed
-                 || QueryButtons[BuzzerNumber.Three] == QueryButtonsType.IsPressed
-                 || QueryButtons[BuzzerNumber.Four] == QueryButtonsType.IsPressed )
+                 && QueryButtons[BuzzerNumber.Two] == QueryButtonsType.IsPressed
+                 && QueryButtons[BuzzerNumber.Three] == QueryButtonsType.IsPressed
+                 && QueryButtons[BuzzerNumber.Four] == QueryButtonsType.IsPressed )
             {
                 return;
             }
@@ -480,7 +480,7 @@ public void Poll()
             Random rnd = new Random(Environment.TickCount);
             List<int> randomList = ListOrderButtons.OrderBy(item=>rnd.Next()).ToList();
 
-            //Alle Buttons aller Buzzer durchgehen
+            //Alle Buttons aller Buzzer durchgehen            
             foreach( int buttonNumber in randomList )
             {
                 //Nummer des aktuellen Buzzer bestimmen (1...4)

diff --git a/SJ.Buzzer/Properties/AssemblyInfo.cs b/SJ.Buzzer/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration( "" )]
 [assembly: AssemblyCompany( "" )]
 [assembly: AssemblyProduct( "SJ.App.Buzzer" )]
-[assembly: AssemblyCopyright( "Copyright (C)  2012-2021 Stefan Jahn" )]
+[assembly: AssemblyCopyright( "Copyright (C)  2012-2022 Stefan Jahn" )]
 [assembly: AssemblyTrademark( "" )]
 [assembly: AssemblyCulture( "" )]
 
@@ -33,8 +33,8 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.2.0" )]
-[assembly: AssemblyFileVersion( "1.0.2.0" )]
+[assembly: AssemblyVersion( "1.0.3.0" )]
+[assembly: AssemblyFileVersion( "1.0.3.0" )]
 [assembly: NeutralResourcesLanguageAttribute( "en" )]
 
 // CLS Compliant