UtcTimeZone value added.

Manufacturer settings updated.
polfosol · Dec 20, 2016 · 79ff626 · 79ff626
1 parent 61978f4
commit 79ff626
Show file tree

Hide file tree

Showing 9 changed files with 611 additions and 489 deletions.
diff --git a/Development/DevicePropertiesForm.Designer.cs b/Development/DevicePropertiesForm.Designer.cs
diff --git a/Development/GXDLMSCommunicator.cs b/Development/GXDLMSCommunicator.cs
@@ -6,8 +6,8 @@
 //
 // Filename: $HeadURL: svn:https://mars/Projects/GuruxClub/GXDLMSDirector/Development/GXDLMSCommunicator.cs $
 //
-// Version: $Revision: 8991 $,
-// $Date: 2016-12-02 13:54:21 +0200 (pe, 02 joulu 2016) $
+// Version: $Revision: 9048 $,
+// $Date: 2016-12-20 16:35:34 +0200 (ti, 20 joulu 2016) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
@@ -127,14 +127,6 @@ public byte[] DisconnectRequest()
  return data;
  }
 
- public bool UseLogicalNameReferencing
- {
- get
- {
- return client.UseLogicalNameReferencing;
- }
- }
-
  public void ReadDLMSPacket(byte[] data, GXReplyData reply)
  {
  ReadDLMSPacket(data, 3, reply);
@@ -464,6 +456,7 @@ public void UpdateManufactureSettings(string id)
  client.Password = CryptHelper.Decrypt(this.parent.Password, Password.Key);
  }
  client.UseLogicalNameReferencing = this.parent.UseLogicalNameReferencing;
+ client.UtcTimeZone = parent.UtcTimeZone;
  //Show media verbose.
  if (this.parent.Verbose && media.Trace != System.Diagnostics.TraceLevel.Verbose)
  {

diff --git a/Development/GXDLMSDevice.cs b/Development/GXDLMSDevice.cs
@@ -6,8 +6,8 @@
 //
 // Filename: $HeadURL: svn:https://mars/Projects/GuruxClub/GXDLMSDirector/Development/GXDLMSDevice.cs $
 //
-// Version: $Revision: 8914 $,
-// $Date: 2016-11-21 17:40:57 +0200 (ma, 21 marras 2016) $
+// Version: $Revision: 9048 $,
+// $Date: 2016-12-20 16:35:34 +0200 (ti, 20 joulu 2016) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
@@ -256,6 +256,18 @@ public object ClientID
  }
  }
 
+
+ /// <summary>
+ /// Standard says that Time zone is from normal time to UTC in minutes.
+ /// If meter is configured to use UTC time (UTC to normal time) set this to true.
+ /// </summary>
+ [DefaultValue(false)]
+ public bool UtcTimeZone
+ {
+ get;
+ set;
+ }
+
  /// <summary>
  /// USed logical client ID.
  /// </summary>

diff --git a/Development/GXDLMSDirector.csproj b/Development/GXDLMSDirector.csproj
@@ -97,12 +97,12 @@
  <HintPath>packages\Gurux.Common.8.1.1611.2901\lib\portable-win+net35\Gurux.Common.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Gurux.DLMS, Version=8.5.1612.1501, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>packages\Gurux.DLMS.8.5.1612.1501\lib\portable-win+net35\Gurux.DLMS.dll</HintPath>
+ <Reference Include="Gurux.DLMS, Version=8.5.1612.2006, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>packages\Gurux.DLMS.8.5.1612.2006\lib\portable-win+net35\Gurux.DLMS.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Gurux.DLMS.UI, Version=8.5.1612.1501, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>packages\Gurux.DLMS.UI.8.5.1612.1501\lib\portable-win+net35\Gurux.DLMS.UI.dll</HintPath>
+ <Reference Include="Gurux.DLMS.UI, Version=8.5.1612.2005, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>packages\Gurux.DLMS.UI.8.5.1612.2005\lib\portable-win+net35\Gurux.DLMS.UI.dll</HintPath>
  <Private>True</Private>
  </Reference>
  <Reference Include="Gurux.Net, Version=8.1.1611.2903, Culture=neutral, processorArchitecture=MSIL">