境界チェック不具合修正，UBX特化の座標コンストラクタ廃止，パケット実装の拡充と修正

[yubeshi/yubeshi.git] / Yubeshi / Ubx / NavTimeUtc.cs

diff --git a/Yubeshi/Ubx/NavTimeUtc.cs b/Yubeshi/Ubx/NavTimeUtc.cs
index 552601b..b456b41 100755 (executable)
--- a/Yubeshi/Ubx/NavTimeUtc.cs
+++ b/Yubeshi/Ubx/NavTimeUtc.cs
@@ -13,6 +13,18 @@ namespace Yubeshi.Ubx
 {\r
     public class NavTimeUtc : Packet\r
     {\r
+        #region type definitions\r
+\r
+        [Flags]\r
+        public enum Validity : byte\r
+        { \r
+            TimeOfWeek = 0x01,\r
+            WeekNumber = 0x02,\r
+            Utc = 0x04,\r
+        }\r
+\r
+        #endregion\r
+\r
         #region constructors\r
 \r
         public NavTimeUtc(byte[] sentence, int length)\r
@@ -48,16 +60,24 @@ namespace Yubeshi.Ubx
             { \r
                 int y = BitConverter.ToUInt16(Raw, 6 + 12);\r
                 int m = Raw[6 + 14];\r
-                int d = Raw[6 + 14];\r
-                int h = Raw[6 + 14];\r
-                int min = Raw[6 + 14];\r
-                int s = Raw[6 + 14];\r
+                int d = Raw[6 + 15];\r
+                int h = Raw[6 + 16];\r
+                int min = Raw[6 + 17];\r
+                int s = Raw[6 + 18];\r
                 int ftow = BitConverter.ToInt32(Raw, 6 + 8);\r
                 DateTime utc = new DateTime(y, m, d, h, min, s, \r
                                                             DateTimeKind.Utc);\r
                 return utc.AddTicks(ftow / 100);\r
             }\r
         }\r
+\r
+        public Validity ValidityFlag\r
+        {\r
+            get\r
+            {\r
+                return (Validity)Raw[19];\r
+            }\r
+        }\r
         #endregion\r
 \r
         #region public methods\r