From dcaccbaaf2ef6e47360d405efb02631901483813 Mon Sep 17 00:00:00 2001
From: Denis Denisov <ftc.denis@gmail.com>
Date: Mon, 1 Apr 2024 22:15:06 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=B0=D0=BB=D0=B8=D0=B1=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=B4=D0=B0=D1=82=D1=87=D0=B8=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D1=82=D0=BE=D0=BA=D0=B0.=20=D0=9A=D0=BE=D1=80=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BD=D0=BE=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=80=D1=8F?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=BD=D0=B0=D0=BF=D1=80=D1=8F=D0=B6=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D0=B0=D0=BA=D0=BA=D1=83=D0=BC?=
 =?UTF-8?q?=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                   |  1 +
 charger-gui/MainWindow.xaml                  | 32 +++++----
 charger-gui/MainWindow.xaml.cs               | 12 +++-
 charger-gui/MainWindowViewModel.cs           | 30 ++++++--
 charger-gui/Properties/app.manifest          | 73 ++++++++++++++++++++
 charger-gui/UpdateWorker.cs                  |  2 +-
 charger-gui/charger-gui.csproj               | 18 +++--
 charger-gui/charger-gui.csproj.user          |  5 +-
 charger-gui/operations/CalibrateOperation.cs | 52 ++++++++++++++
 charger-gui/operations/ChargeOperation.cs    |  4 +-
 charger-gui/operations/DischargeOperation.cs |  2 +-
 charger-gui/operations/TrainOperation.cs     |  2 +-
 12 files changed, 203 insertions(+), 30 deletions(-)
 create mode 100644 charger-gui/Properties/app.manifest
 create mode 100644 charger-gui/operations/CalibrateOperation.cs

diff --git a/.gitignore b/.gitignore
index 6cf7b8f..1a16dd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 charger-gui/.vs/
 charger-gui/bin/
 charger-gui/obj/
+charger-gui/publish/
diff --git a/charger-gui/MainWindow.xaml b/charger-gui/MainWindow.xaml
index a6936e3..ac9c394 100644
--- a/charger-gui/MainWindow.xaml
+++ b/charger-gui/MainWindow.xaml
@@ -36,21 +36,26 @@
 				<RowDefinition Height="30"/>
 				<RowDefinition Height="30"/>
 				<RowDefinition Height="30"/>
+				<RowDefinition Height="30"/>
 			</Grid.RowDefinitions>
 			<TextBlock Grid.Row="0" Grid.Column="0" FontSize="20" Text="I_acc"/>
-			<TextBlock Grid.Row="0" Grid.Column="1" FontSize="20" Text="{Binding Path=IAcc,Mode=OneWay,StringFormat=F4}" />
-			<TextBlock Grid.Row="1" Grid.Column="0" FontSize="20" Text="U2"/>
-			<TextBlock Grid.Row="1" Grid.Column="1" FontSize="20" Text="{Binding Path=U2,Mode=OneWay,StringFormat=F4}" />
-			<TextBlock Grid.Row="2" Grid.Column="0" FontSize="20" Text="U3"/>
-			<TextBlock Grid.Row="2" Grid.Column="1" FontSize="20" Text="{Binding Path=U3,Mode=OneWay,StringFormat=F4}" />
-			<TextBlock Grid.Row="3" Grid.Column="0" FontSize="20" Text="U4"/>
-			<TextBlock Grid.Row="3" Grid.Column="1" FontSize="20" Text="{Binding Path=U4,Mode=OneWay,StringFormat=F4}" />
-			<TextBlock Grid.Row="4" Grid.Column="0" FontSize="20" Text="U5"/>
-			<TextBlock Grid.Row="4" Grid.Column="1" FontSize="20" Text="{Binding Path=U5,Mode=OneWay,StringFormat=F4}" />
-			<TextBlock Grid.Row="5" Grid.Column="0" FontSize="20" Text="CHARGE"/>
-			<Ellipse Grid.Row="5" Grid.Column="1" Width="20" Height="20" Fill="{Binding Path=ChargeStatus,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" />
-			<TextBlock Grid.Row="6" Grid.Column="0" FontSize="20" Text="LAMP"/>
-			<Ellipse Grid.Row="6" Grid.Column="1" Width="20" Height="20" Fill="{Binding Path=LampStatus,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" />
+			<TextBlock Grid.Row="0" Grid.Column="1" FontSize="20" Text="{Binding Path=IReal,Mode=OneWay,StringFormat=F4}" />
+			<TextBlock Grid.Row="1" Grid.Column="0" FontSize="20" Text="U_acc"/>
+			<TextBlock Grid.Row="1" Grid.Column="1" FontSize="20" Text="{Binding Path=UAcc,Mode=OneWay,StringFormat=F4}" />
+			<TextBlock Grid.Row="2" Grid.Column="0" FontSize="20" Text="I_raw"/>
+			<TextBlock Grid.Row="2" Grid.Column="1" FontSize="20" Text="{Binding Path=IRaw,Mode=OneWay,StringFormat=F4}" />
+			<TextBlock Grid.Row="3" Grid.Column="0" FontSize="20" Text="U2"/>
+			<TextBlock Grid.Row="3" Grid.Column="1" FontSize="20" Text="{Binding Path=U2,Mode=OneWay,StringFormat=F4}" />
+			<TextBlock Grid.Row="4" Grid.Column="0" FontSize="20" Text="U3"/>
+			<TextBlock Grid.Row="4" Grid.Column="1" FontSize="20" Text="{Binding Path=U3,Mode=OneWay,StringFormat=F4}" />
+			<TextBlock Grid.Row="5" Grid.Column="0" FontSize="20" Text="U4"/>
+			<TextBlock Grid.Row="5" Grid.Column="1" FontSize="20" Text="{Binding Path=U4,Mode=OneWay,StringFormat=F4}" />
+			<TextBlock Grid.Row="6" Grid.Column="0" FontSize="20" Text="U5"/>
+			<TextBlock Grid.Row="6" Grid.Column="1" FontSize="20" Text="{Binding Path=U5,Mode=OneWay,StringFormat=F4}" />
+			<TextBlock Grid.Row="7" Grid.Column="0" FontSize="20" Text="CHARGE"/>
+			<Ellipse Grid.Row="7" Grid.Column="1" Width="20" Height="20" Fill="{Binding Path=ChargeStatus,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" />
+			<TextBlock Grid.Row="8" Grid.Column="0" FontSize="20" Text="LAMP"/>
+			<Ellipse Grid.Row="8" Grid.Column="1" Width="20" Height="20" Fill="{Binding Path=LampStatus,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" />
 		</Grid>
 		<StackPanel Grid.Row="1" Grid.Column="1">
 			<TextBlock FontSize="24" Text="MANUAL"/>
@@ -61,6 +66,7 @@
 			<TextBlock FontSize="24" Text="AUTO"/>
 			<Button Content="Discharge" Height="40" Click="DischargeButton_Click"/>
 			<Button Content="Сharge" Height="40" Click="ChargeButton_Click"/>
+			<Button Content="Calibrate I" Height="40" Click="CalibrateButton_Click"/>
 		</StackPanel>
 		<StackPanel Grid.Row="1" Grid.Column="3">
 			<TextBlock FontSize="24" Text="TRAIN"/>
diff --git a/charger-gui/MainWindow.xaml.cs b/charger-gui/MainWindow.xaml.cs
index 3da0169..0468117 100644
--- a/charger-gui/MainWindow.xaml.cs
+++ b/charger-gui/MainWindow.xaml.cs
@@ -60,6 +60,16 @@ namespace charger_gui
 			model.IsCharging = !model.IsCharging;
 		}
 
+		private void CalibrateButton_Click(object sender, RoutedEventArgs e)
+		{
+			if (model.CurrentOperation != null)
+			{
+				model.CurrentOperation.Cancel();
+			}
+			model.CurrentOperation = new CalibrateOperation(log, model);
+			model.CurrentOperation.Start();
+		}
+
 		private void DischargeButton_Click(object sender, RoutedEventArgs e)
 		{
 			if (model.CurrentOperation != null)
@@ -92,7 +102,7 @@ namespace charger_gui
 		protected override void OnClosed(EventArgs e)
 		{
 			base.OnClosed(e);
-			Application.Current.Shutdown();
+			Environment.Exit(0);
 		}
 	}
 }
diff --git a/charger-gui/MainWindowViewModel.cs b/charger-gui/MainWindowViewModel.cs
index 5cf1d3a..aafb9fb 100644
--- a/charger-gui/MainWindowViewModel.cs
+++ b/charger-gui/MainWindowViewModel.cs
@@ -21,17 +21,27 @@ namespace charger_gui
 			}
 		}
 
-		private float iAcc;
-		public float IAcc
+		private float iRaw;
+		public float IRaw
 		{
 			get
 			{
-				return iAcc;
+				return iRaw;
 			}
 			set
 			{
-				iAcc = value; 
-				OnPropertyChanged("IAcc");
+				iRaw = value; 
+				OnPropertyChanged("IRaw");
+				OnPropertyChanged("IReal");
+			}
+		}
+		public float IZero { get; internal set; }
+
+		public float IReal
+		{
+			get
+			{
+				return IRaw - IZero;
 			}
 		}
 
@@ -60,6 +70,7 @@ namespace charger_gui
 			{
 				u3 = value;
 				OnPropertyChanged("U3");
+				OnPropertyChanged("UAcc");
 			}
 		}
 
@@ -88,6 +99,15 @@ namespace charger_gui
 			{
 				u5 = value;
 				OnPropertyChanged("U5");
+				OnPropertyChanged("UAcc");
+			}
+		}
+
+		public float UAcc
+		{
+			get
+			{
+				return U3 - U5;
 			}
 		}
 
diff --git a/charger-gui/Properties/app.manifest b/charger-gui/Properties/app.manifest
new file mode 100644
index 0000000..3d38900
--- /dev/null
+++ b/charger-gui/Properties/app.manifest
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- Параметры манифеста UAC
+             Если вы хотите изменить уровень контроля учетных записей Windows, замените узел 
+             requestedExecutionLevel на один из следующих.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            При указании элемента requestedExecutionLevel будет отключена виртуализация файлов и реестра. 
+            Удалите этот элемент, если виртуализация требуется приложению для обратной
+            совместимости.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+      <applicationRequestMinimum>
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
+      </applicationRequestMinimum>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Список версий Windows, на которых это приложение было протестировано
+           и будет работать. Раскомментируйте соответствующие элементы, чтобы ОС Windows 
+           автоматически выбрала наиболее совместимое окружение. -->
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+    </application>
+  </compatibility>
+  <!-- Указывает, что приложение поддерживает определение DPI и не будет автоматически масштабироваться Windows при более высоких
+       значениях DPI. Приложения Windows Presentation Foundation (WPF) по умолчанию поддерживают определение DPI, им не нужно 
+       специально включать параметр для этого. Для приложений Windows Forms на платформе .NET Framework 4.6, для которых задан этот параметр, необходимо 
+       также задать для "EnableWindowsFormsHighDpiAutoResizing" значение "true" в файле app.config. 
+       
+       При этом приложение начинает учитывать длинные пути. Дополнительные сведения см. на странице https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation.-->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+    </windowsSettings>
+  </application>
+  -->
+  <!-- Включите темы для общих элементов управления и диалоговых окон Windows (Windows XP и более поздние версии) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+</assembly>
\ No newline at end of file
diff --git a/charger-gui/UpdateWorker.cs b/charger-gui/UpdateWorker.cs
index a815e28..f3bd07a 100644
--- a/charger-gui/UpdateWorker.cs
+++ b/charger-gui/UpdateWorker.cs
@@ -68,7 +68,7 @@ namespace charger_gui
 						while (!shouldRestart)
 						{
 							var r1 = master.ReadHoldingRegisters(SLAVE_ADDRESS, 0, 2);
-							model.IAcc = ToFloat(r1[0], r1[1]);
+							model.IRaw = ToFloat(r1[0], r1[1]);
 							var r2 = master.ReadHoldingRegisters(SLAVE_ADDRESS, 6, 8);
 							model.U2 = ToFloat(r2[0], r2[1]);
 							model.U3 = ToFloat(r2[2], r2[3]);
diff --git a/charger-gui/charger-gui.csproj b/charger-gui/charger-gui.csproj
index 9a3deb7..e6bfa0d 100644
--- a/charger-gui/charger-gui.csproj
+++ b/charger-gui/charger-gui.csproj
@@ -13,7 +13,8 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <Deterministic>true</Deterministic>
-    <PublishUrl>C:\Work\charger\charger-gui\publish\</PublishUrl>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>W:\temp\charger-gui\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -23,12 +24,11 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>4</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <BootstrapperEnabled>false</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -59,7 +59,13 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NModbus4, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -86,6 +92,7 @@
     </ApplicationDefinition>
     <Compile Include="Logger.cs" />
     <Compile Include="operations\AutomaticOperation.cs" />
+    <Compile Include="operations\CalibrateOperation.cs" />
     <Compile Include="operations\TrainOperation.cs" />
     <Compile Include="operations\ChargeOperation.cs" />
     <Compile Include="operations\DischargeOperation.cs" />
@@ -124,6 +131,7 @@
     </EmbeddedResource>
     <None Include="charger-gui_TemporaryKey.pfx" />
     <None Include="packages.config" />
+    <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/charger-gui/charger-gui.csproj.user b/charger-gui/charger-gui.csproj.user
index 9d9e44c..c69ee8e 100644
--- a/charger-gui/charger-gui.csproj.user
+++ b/charger-gui/charger-gui.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PublishUrlHistory />
+    <PublishUrlHistory>W:\temp\charger-gui\|C:\Work\charger\charger-gui\publish\</PublishUrlHistory>
     <InstallUrlHistory />
     <SupportUrlHistory />
     <UpdateUrlHistory />
@@ -10,4 +10,7 @@
     <FallbackCulture>ru-RU</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
   </PropertyGroup>
+  <PropertyGroup>
+    <EnableSecurityDebugging>false</EnableSecurityDebugging>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/charger-gui/operations/CalibrateOperation.cs b/charger-gui/operations/CalibrateOperation.cs
new file mode 100644
index 0000000..e75da72
--- /dev/null
+++ b/charger-gui/operations/CalibrateOperation.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+
+namespace charger_gui.operations
+{
+	class CalibrateOperation : AutomaticOperation
+	{
+		const float SECONDS_TO_PASS = 10f;
+
+		private int passed;
+		private bool isComplete = false;
+		public override string Status
+		{
+			get
+			{
+				if (isComplete) return "Calibrating complete in " + passed + " seconds";
+				else return "Calibrating, passed " + passed + " seconds";
+			}
+		}
+
+		public CalibrateOperation(Logger log, MainWindowViewModel model) : base(log, model)
+		{
+		}
+
+		protected override void Work()
+		{
+			log.Log("Calibrating started");
+			var start = DateTime.Now;
+			model.IsCharging = false;
+			model.IsLampOn = false;
+			Thread.Sleep(500);
+			float sum = 0;
+			int cnt = 0;
+			while (passed < SECONDS_TO_PASS)
+			{
+				Thread.Sleep(20);
+				sum += model.IRaw;
+				cnt++;
+				passed = (int)((DateTime.Now - start).TotalSeconds);
+				OnStatusChanged();
+			}
+			model.IZero = sum / cnt;
+			log.Log("Calibrating complete in " + passed + " seconds");
+			model.IsLampOn = false;
+			isComplete = true;
+			OnStatusChanged();
+		}
+	}
+}
diff --git a/charger-gui/operations/ChargeOperation.cs b/charger-gui/operations/ChargeOperation.cs
index 64efe09..fd53e7f 100644
--- a/charger-gui/operations/ChargeOperation.cs
+++ b/charger-gui/operations/ChargeOperation.cs
@@ -32,12 +32,12 @@ namespace charger_gui.operations
 			model.IsCharging = true;
 			model.IsLampOn = false;
 			Thread.Sleep(500);
-			while (model.U3 < MAX_VOLTAGE)
+			while (model.UAcc < MAX_VOLTAGE)
 			{
 				Thread.Sleep(1000);
 				passed = (int)((DateTime.Now - start).TotalSeconds);
 				OnStatusChanged();
-				log.Log("Charging " + passed + "s " + model.U3.ToString("F4"));
+				log.Log("Charging " + passed + "s " + model.UAcc.ToString("F4"));
 				if (model.U2 < 10f)
 				{
 					log.Log("Charging error: NO POWER. " + model.U2.ToString("F4"));
diff --git a/charger-gui/operations/DischargeOperation.cs b/charger-gui/operations/DischargeOperation.cs
index bffd6d5..a56c097 100644
--- a/charger-gui/operations/DischargeOperation.cs
+++ b/charger-gui/operations/DischargeOperation.cs
@@ -32,7 +32,7 @@ namespace charger_gui.operations
 			model.IsCharging = false;
 			model.IsLampOn = true;
 			Thread.Sleep(500);
-			while (model.U3 > MIN_VOLTAGE)
+			while (model.UAcc > MIN_VOLTAGE)
 			{
 				Thread.Sleep(1000);
 				passed = (int)((DateTime.Now - start).TotalSeconds);
diff --git a/charger-gui/operations/TrainOperation.cs b/charger-gui/operations/TrainOperation.cs
index 861d229..ab49443 100644
--- a/charger-gui/operations/TrainOperation.cs
+++ b/charger-gui/operations/TrainOperation.cs
@@ -47,7 +47,7 @@ namespace charger_gui.operations
 				Thread.Sleep(50);
 				passed = (int)((DateTime.Now - start).TotalSeconds);
 				OnStatusChanged();
-				log.Log("Training" + passed + "s " + model.U3.ToString("F4"));
+				log.Log("Training" + passed + "s " + model.UAcc.ToString("F4"));
 				if (model.U2 < 10f)
 				{
 					log.Log("Training error: NO POWER. " + model.U2.ToString("F4"));