ソースを参照

Update settings checks.
Remove debug values.

Gregory 3 年 前
コミット
a474a5ade8
1 ファイル変更11 行追加8 行削除
  1. 11 8
      crusherScanner/SettingsHandler.cs

+ 11 - 8
crusherScanner/SettingsHandler.cs

@@ -36,7 +36,8 @@ namespace crusherScanner
                 replyMessage += "Crusher No must be a value between 1 and 3.\n";
                 settingsCheckPassed = false;
             }
-
+            settings.PrepmasterConnection = true;
+            settings.PrepmasterMagazineSerial = "COM3,";
             if (settings.PrepmasterConnection)
             {
                 if (settings.PrepmasterMagazineSerial == "" || settings.PrepmasterMagazineSerial == null)
@@ -46,8 +47,9 @@ namespace crusherScanner
                 }
                 else
                 {
-                    //TODO check serial connection details.
-                    CheckSerial(settings.PrepmasterMagazineSerial);
+                    string tmpMsg;
+                    (settingsCheckPassed, tmpMsg) = CheckSerial(settings.PrepmasterMagazineSerial);
+                    replyMessage += tmpMsg + "\n";
                 }
             }
             else
@@ -159,18 +161,19 @@ namespace crusherScanner
             string[] Parity = { "Parity.None", "Parity.Odd", "Parity.Even", "Parity.Mark", "Parity.Space" };
             string[] DataBits = { "5", "6", "7", "8" };
             string[] StopBits = { "StopBits.None", "StopBits.One", "StopBits.Two", "StopBits.OnePointFive" };
-            
+            string[][] serialVals = {comPorts, BaudRate, Parity, DataBits, StopBits };
             //COM1,9600,Parity.None,8,StopBits.One
             if (serialSetup.Contains(','))
             {
                 string[] serialConfig = serialSetup.Split(',');
 
-                if (serialConfig.Length>4)
+                for (int i = 0; i < serialConfig.Length; i++)
                 {
-                    return (Validate(serialConfig[4], StopBits), "");
+                    if(!Validate(serialConfig[i], serialVals[i])){
+                        return (false, "Serial connection settings error, please fix. example 'COM1,9600,Parity.None,8,StopBits.One' (no trailing comma)");
+                    }
                 }
-
-                return (Validate(serialSetup, comPorts), "");
+                return (true, "");
             }
             else
             {