From ac7045e063e46d271cdf7e4a4fb69e26acd210ce Mon Sep 17 00:00:00 2001
From: Denis Denisov <ftc.denis@gmail.com>
Date: Sun, 10 Mar 2024 16:09:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20UI,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=83=20=D0=B0=D0=B2=D1=82?=
 =?UTF-8?q?=D0=BE=D1=82=D1=80=D0=B5=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B0=D0=BA=D0=BA=D1=83=D0=BC=D1=83=D0=BB=D1=8F=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 charger-gui/MainWindow.xaml                  |  36 +++++++----
 charger-gui/MainWindow.xaml.cs               |  15 +++++
 charger-gui/MainWindowViewModel.cs           |  64 ++++++++-----------
 charger-gui/UpdateWorker.cs                  |  11 ++--
 charger-gui/charger-gui.csproj               |  37 +++++++++++
 charger-gui/charger-gui.csproj.user          |  13 ++++
 charger-gui/charger-gui_TemporaryKey.pfx     | Bin 0 -> 1668 bytes
 charger-gui/operations/ChargeOperation.cs    |   9 +--
 charger-gui/operations/DischargeOperation.cs |   5 +-
 charger-gui/operations/TrainOperation.cs     |  63 ++++++++++++++++++
 10 files changed, 189 insertions(+), 64 deletions(-)
 create mode 100644 charger-gui/charger-gui.csproj.user
 create mode 100644 charger-gui/charger-gui_TemporaryKey.pfx
 create mode 100644 charger-gui/operations/TrainOperation.cs

diff --git a/charger-gui/MainWindow.xaml b/charger-gui/MainWindow.xaml
index fd02aa5..a6936e3 100644
--- a/charger-gui/MainWindow.xaml
+++ b/charger-gui/MainWindow.xaml
@@ -39,29 +39,37 @@
 			</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="U1_acc"/>
-			<TextBlock Grid.Row="1" Grid.Column="1" FontSize="20" Text="{Binding Path=U1Acc,Mode=OneWay,StringFormat=F4}" />
-			<TextBlock Grid.Row="2" Grid.Column="0" FontSize="20" Text="U2_acc"/>
-			<TextBlock Grid.Row="2" Grid.Column="1" FontSize="20" Text="{Binding Path=U2Acc,Mode=OneWay,StringFormat=F4}" />
-			<TextBlock Grid.Row="3" Grid.Column="0" FontSize="20" Text="I_lamp"/>
-			<TextBlock Grid.Row="3" Grid.Column="1" FontSize="20" Text="{Binding Path=ILamp,Mode=OneWay,StringFormat=F4}" />
-			<TextBlock Grid.Row="4" Grid.Column="0" FontSize="20" Text="U1_lamp"/>
-			<TextBlock Grid.Row="4" Grid.Column="1" FontSize="20" Text="{Binding Path=U1Lamp,Mode=OneWay,StringFormat=F4}" />
-			<TextBlock Grid.Row="5" Grid.Column="0" FontSize="20" Text="U2_lamp"/>
-			<TextBlock Grid.Row="5" Grid.Column="1" FontSize="20" Text="{Binding Path=U2Lamp,Mode=OneWay,StringFormat=F4}" />
-			<TextBlock Grid.Row="6" Grid.Column="0" FontSize="20" Text="CHARGE"/>
-			<Ellipse Grid.Row="6" Grid.Column="1" Width="20" Height="20" Fill="{Binding Path=ChargeStatus,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" />
-			<TextBlock Grid.Row="7" Grid.Column="0" FontSize="20" Text="LAMP"/>
-			<Ellipse Grid.Row="7" Grid.Column="1" Width="20" Height="20" Fill="{Binding Path=LampStatus,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" />
+			<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}" />
 		</Grid>
 		<StackPanel Grid.Row="1" Grid.Column="1">
+			<TextBlock FontSize="24" Text="MANUAL"/>
 			<Button Content="Flip Lamp" Height="40" Click="LampButton_Click"/>
 			<Button Content="Flip Charge" Height="40" Click="FlipChargeButton_Click"/>
 		</StackPanel>
 		<StackPanel Grid.Row="1" Grid.Column="2">
+			<TextBlock FontSize="24" Text="AUTO"/>
 			<Button Content="Discharge" Height="40" Click="DischargeButton_Click"/>
 			<Button Content="Сharge" Height="40" Click="ChargeButton_Click"/>
 		</StackPanel>
+		<StackPanel Grid.Row="1" Grid.Column="3">
+			<TextBlock FontSize="24" Text="TRAIN"/>
+			<StackPanel Orientation="Horizontal">
+				<TextBlock FontSize="20" Text="Duration (s)" Height="40"/>
+				<TextBox Text="{Binding Path=TrainDuration}" FontSize="20" MinWidth="60"/>
+			</StackPanel>
+			<Button Content="GO" Height="40" Click="TrainButton_Click"/>
+		</StackPanel>
 		<TextBlock Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="4" Text="{Binding Path=OperationStatus,Mode=OneWay}" />
 	</Grid>
 </Window>
diff --git a/charger-gui/MainWindow.xaml.cs b/charger-gui/MainWindow.xaml.cs
index 9f8e026..3da0169 100644
--- a/charger-gui/MainWindow.xaml.cs
+++ b/charger-gui/MainWindow.xaml.cs
@@ -79,5 +79,20 @@ namespace charger_gui
 			model.CurrentOperation = new ChargeOperation(log, model);
 			model.CurrentOperation.Start();
 		}
+		private void TrainButton_Click(object sender, RoutedEventArgs e)
+		{
+			if (model.CurrentOperation != null)
+			{
+				model.CurrentOperation.Cancel();
+			}
+			model.CurrentOperation = new TrainOperation(log, model, model.TrainDuration);
+			model.CurrentOperation.Start();
+		}
+
+		protected override void OnClosed(EventArgs e)
+		{
+			base.OnClosed(e);
+			Application.Current.Shutdown();
+		}
 	}
 }
diff --git a/charger-gui/MainWindowViewModel.cs b/charger-gui/MainWindowViewModel.cs
index 73ae1ff..5cf1d3a 100644
--- a/charger-gui/MainWindowViewModel.cs
+++ b/charger-gui/MainWindowViewModel.cs
@@ -1,10 +1,7 @@
 using charger_gui.operations;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO.Ports;
-using System.Linq;
-using System.Text;
 using System.Windows.Media;
 
 namespace charger_gui
@@ -38,73 +35,59 @@ namespace charger_gui
 			}
 		}
 
-		private float u1Acc;
-		public float U1Acc
+		private float u2;
+		public float U2
 		{
 			get
 			{
-				return u1Acc;
+				return u2;
 			}
 			set
 			{
-				u1Acc = value;
-				OnPropertyChanged("U1Acc");
+				u2 = value;
+				OnPropertyChanged("U2");
  			}
 		}
 
-		private float u2Acc;
-		public float U2Acc
+		private float u3;
+		public float U3
 		{
 			get
 			{
-				return u2Acc;
+				return u3;
 			}
 			set
 			{
-				u2Acc = value;
-				OnPropertyChanged("U2Acc");
+				u3 = value;
+				OnPropertyChanged("U3");
 			}
 		}
 
-		private float iLamp;
-		public float ILamp
+		private float u4;
+		public float U4
 		{
 			get
 			{
-				return iLamp;
+				return u4;
 			}
 			set
 			{
-				iLamp = value;
-				OnPropertyChanged("ILamp");
+				u4 = value;
+				OnPropertyChanged("U4");
 			}
 		}
 
-		private float u1Lamp;
-		public float U1Lamp
+		private float u5;
+		public float U5
 		{
 			get
 			{
-				return u1Lamp;
+				return u5;
 			}
 			set
 			{
-				u1Lamp = value;
-				OnPropertyChanged("U1Lamp");
-			}
-		}
-
-		private float u2Lamp;
-		public float U2Lamp
-		{
-			get
-			{
-				return u2Lamp;
-			}
-			set
-			{
-				u2Lamp = value;
-				OnPropertyChanged("U2Lamp");
+				u5 = value;
+				OnPropertyChanged("U5");
 			}
 		}
 
@@ -190,7 +173,10 @@ namespace charger_gui
 					currentOperation.StatusChanged -= OnCurrentOperationStatusChanged;
 				}
 				currentOperation = value;
-				currentOperation.StatusChanged += OnCurrentOperationStatusChanged;
+				if (currentOperation != null)
+				{
+					currentOperation.StatusChanged += OnCurrentOperationStatusChanged;
+				}
 				OnPropertyChanged("OperationStatus");
 			}
 		}
@@ -209,6 +195,8 @@ namespace charger_gui
 			}
 		}
 
+		public int TrainDuration { get; set; }
+
 		private void FillPorts()
 		{
 			ports = new List<string>(SerialPort.GetPortNames());
diff --git a/charger-gui/UpdateWorker.cs b/charger-gui/UpdateWorker.cs
index 14aed1f..a815e28 100644
--- a/charger-gui/UpdateWorker.cs
+++ b/charger-gui/UpdateWorker.cs
@@ -67,14 +67,13 @@ namespace charger_gui
 						IModbusSerialMaster master = ModbusSerialMaster.CreateRtu(serialPort);
 						while (!shouldRestart)
 						{
-							var r1 = master.ReadHoldingRegisters(SLAVE_ADDRESS, 0, 4);
+							var r1 = master.ReadHoldingRegisters(SLAVE_ADDRESS, 0, 2);
 							model.IAcc = ToFloat(r1[0], r1[1]);
-							model.ILamp = ToFloat(r1[2], r1[3]);
 							var r2 = master.ReadHoldingRegisters(SLAVE_ADDRESS, 6, 8);
-							model.U1Acc = ToFloat(r2[0], r2[1]);
-							model.U2Acc = ToFloat(r2[2], r2[3]);
-							model.U1Lamp = ToFloat(r2[4], r2[5]);
-							model.U2Lamp = ToFloat(r2[6], r2[7]);
+							model.U2 = ToFloat(r2[0], r2[1]);
+							model.U3 = ToFloat(r2[2], r2[3]);
+							model.U4 = ToFloat(r2[4], r2[5]);
+							model.U5 = ToFloat(r2[6], r2[7]);
 							master.WriteSingleRegister(SLAVE_ADDRESS, CHARGE_REGISTER, (ushort)(model.IsCharging ? 1 : 0));
 							master.WriteSingleRegister(SLAVE_ADDRESS, LAMP_REGISTER, (ushort)(model.IsLampOn ? 1 : 0));
 							// ничего не упало, коннект есть значит
diff --git a/charger-gui/charger-gui.csproj b/charger-gui/charger-gui.csproj
index e9b4428..9a3deb7 100644
--- a/charger-gui/charger-gui.csproj
+++ b/charger-gui/charger-gui.csproj
@@ -13,6 +13,22 @@
     <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>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,6 +49,18 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>BEEA544097F13D7DCC301EAB82DAD11595FA2626</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>charger-gui_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="NModbus4, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\NModbus4.2.1.0\lib\net40\NModbus4.dll</HintPath>
@@ -58,6 +86,7 @@
     </ApplicationDefinition>
     <Compile Include="Logger.cs" />
     <Compile Include="operations\AutomaticOperation.cs" />
+    <Compile Include="operations\TrainOperation.cs" />
     <Compile Include="operations\ChargeOperation.cs" />
     <Compile Include="operations\DischargeOperation.cs" />
     <Compile Include="UpdateWorker.cs" />
@@ -93,11 +122,19 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="charger-gui_TemporaryKey.pfx" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/charger-gui/charger-gui.csproj.user b/charger-gui/charger-gui.csproj.user
new file mode 100644
index 0000000..9d9e44c
--- /dev/null
+++ b/charger-gui/charger-gui.csproj.user
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishUrlHistory />
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>ru-RU</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/charger-gui/charger-gui_TemporaryKey.pfx b/charger-gui/charger-gui_TemporaryKey.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..f8c9c9603e869fdd1037ab89ee914cced2b8ceac
GIT binary patch
literal 1668
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
I|MP(T1wNmyVgLXD

literal 0
HcmV?d00001

diff --git a/charger-gui/operations/ChargeOperation.cs b/charger-gui/operations/ChargeOperation.cs
index 91b6734..64efe09 100644
--- a/charger-gui/operations/ChargeOperation.cs
+++ b/charger-gui/operations/ChargeOperation.cs
@@ -32,18 +32,19 @@ namespace charger_gui.operations
 			model.IsCharging = true;
 			model.IsLampOn = false;
 			Thread.Sleep(500);
-			while (model.U2Acc < MAX_VOLTAGE)
+			while (model.U3 < MAX_VOLTAGE)
 			{
 				Thread.Sleep(1000);
 				passed = (int)((DateTime.Now - start).TotalSeconds);
 				OnStatusChanged();
-				log.Log("Charging " + passed + "s " + model.U2Acc.ToString("F4"));
-				if (model.U1Acc < 10f)
+				log.Log("Charging " + passed + "s " + model.U3.ToString("F4"));
+				if (model.U2 < 10f)
 				{
-					log.Log("Charging error: NO POWER. " + model.U1Acc.ToString("F4"));
+					log.Log("Charging error: NO POWER. " + model.U2.ToString("F4"));
 				}
 			}
 			log.Log("Charging complete in " + passed + " seconds");
+			model.IsCharging = false;
 			isComplete = true;
 			OnStatusChanged();
 		}
diff --git a/charger-gui/operations/DischargeOperation.cs b/charger-gui/operations/DischargeOperation.cs
index 26a8b56..bffd6d5 100644
--- a/charger-gui/operations/DischargeOperation.cs
+++ b/charger-gui/operations/DischargeOperation.cs
@@ -32,14 +32,15 @@ namespace charger_gui.operations
 			model.IsCharging = false;
 			model.IsLampOn = true;
 			Thread.Sleep(500);
-			while (model.U2Acc > MIN_VOLTAGE)
+			while (model.U3 > MIN_VOLTAGE)
 			{
 				Thread.Sleep(1000);
 				passed = (int)((DateTime.Now - start).TotalSeconds);
 				OnStatusChanged();
-				log.Log("Discharging " + passed + "s " + model.U2Acc.ToString("F4"));
+				log.Log("Discharging " + passed + "s " + model.U3.ToString("F4"));
 			}
 			log.Log("Discharging complete in " + passed + " seconds");
+			model.IsLampOn = false;
 			isComplete = true;
 			OnStatusChanged();
 		}
diff --git a/charger-gui/operations/TrainOperation.cs b/charger-gui/operations/TrainOperation.cs
new file mode 100644
index 0000000..861d229
--- /dev/null
+++ b/charger-gui/operations/TrainOperation.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+
+namespace charger_gui.operations
+{
+	class TrainOperation : AutomaticOperation
+	{
+		const float MAX_VOLTAGE = 14.5f;
+
+		private int passed;
+		private bool isComplete = false;
+		private int duration;
+		public override string Status
+		{
+			get
+			{
+				if (isComplete) return "Training complete in " + passed + " seconds";
+				else return "Training, passed " + passed + " seconds (of " + duration + ")";
+			}
+		}
+
+		public TrainOperation(Logger log, MainWindowViewModel model, int duration) : base(log, model)
+		{
+			this.duration = duration;
+		}
+
+		protected override void Work()
+		{
+			log.Log("Training started");
+			var start = DateTime.Now;
+			while (passed < duration)
+			{
+				model.IsCharging = true;
+				model.IsLampOn = false;
+				Thread.Sleep(1000);
+				model.IsCharging = false;
+				model.IsLampOn = false;
+				Thread.Sleep(50);
+				model.IsCharging = false;
+				model.IsLampOn = true;
+				Thread.Sleep(1000);
+				model.IsCharging = false;
+				model.IsLampOn = false;
+				Thread.Sleep(50);
+				passed = (int)((DateTime.Now - start).TotalSeconds);
+				OnStatusChanged();
+				log.Log("Training" + passed + "s " + model.U3.ToString("F4"));
+				if (model.U2 < 10f)
+				{
+					log.Log("Training error: NO POWER. " + model.U2.ToString("F4"));
+				}
+			}
+			log.Log("Training complete in " + passed + " seconds");
+			model.IsCharging = false;
+			model.IsLampOn = false;
+			isComplete = true;
+			OnStatusChanged();
+		}
+	}
+}