diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/02866a7f-0f8d-45c4-a3bd-e5358daad410.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/02866a7f-0f8d-45c4-a3bd-e5358daad410.vsidx
new file mode 100644
index 000000000..9452bc1e8
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/02866a7f-0f8d-45c4-a3bd-e5358daad410.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/08905a89-5e56-4f25-a840-87cfe063b59a.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/08905a89-5e56-4f25-a840-87cfe063b59a.vsidx
deleted file mode 100644
index 68536dad9..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/08905a89-5e56-4f25-a840-87cfe063b59a.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/3ad0f675-a8cb-442a-9c49-70cd60f24dfb.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/3ad0f675-a8cb-442a-9c49-70cd60f24dfb.vsidx
new file mode 100644
index 000000000..20d2b77d9
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/3ad0f675-a8cb-442a-9c49-70cd60f24dfb.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/77c7b59e-dfe7-453d-b33c-a1f7657147ac.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/77c7b59e-dfe7-453d-b33c-a1f7657147ac.vsidx
new file mode 100644
index 000000000..99f36ace8
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/77c7b59e-dfe7-453d-b33c-a1f7657147ac.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/a3f8caff-7c7c-4823-8caa-6b0d98db0eb1.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/a3f8caff-7c7c-4823-8caa-6b0d98db0eb1.vsidx
new file mode 100644
index 000000000..191bd252c
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/a3f8caff-7c7c-4823-8caa-6b0d98db0eb1.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/a895a1d8-0d2c-4009-9489-911aea212f0f.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/a895a1d8-0d2c-4009-9489-911aea212f0f.vsidx
new file mode 100644
index 000000000..d422e03dd
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/a895a1d8-0d2c-4009-9489-911aea212f0f.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/v17/.suo b/AgroBase/.vs/AgroBase/v17/.suo
index 5f89f3d1a..0b28ca189 100644
Binary files a/AgroBase/.vs/AgroBase/v17/.suo and b/AgroBase/.vs/AgroBase/v17/.suo differ
diff --git a/AgroBase/AgroBase/AgroBase.csproj b/AgroBase/AgroBase/AgroBase.csproj
index d3aa12634..ab353a8a4 100644
--- a/AgroBase/AgroBase/AgroBase.csproj
+++ b/AgroBase/AgroBase/AgroBase.csproj
@@ -289,6 +289,12 @@
frmMvdConfig.cs
+
+ Form
+
+
+ frmOID.cs
+
Form
@@ -439,6 +445,7 @@
+
@@ -477,6 +484,7 @@
+
@@ -693,6 +701,9 @@
frmMvdConfig.cs
+
+ frmOID.cs
+
frmPinout.cs
diff --git a/AgroBase/AgroBase/Forms/Direcional/frmDirConfig.cs b/AgroBase/AgroBase/Forms/Direcional/frmDirConfig.cs
index 1219fc612..141b91207 100644
--- a/AgroBase/AgroBase/Forms/Direcional/frmDirConfig.cs
+++ b/AgroBase/AgroBase/Forms/Direcional/frmDirConfig.cs
@@ -78,7 +78,7 @@ namespace AgroBase.Forms.Direcional
}
}
- txtIP.Text = Disp.Dados.IP_Mks;
+ txtIP.Text = Disp.Dados.IP_Dir;
}
private void frmDirConfig_FormClosing(object sender, FormClosingEventArgs e)
@@ -121,7 +121,7 @@ namespace AgroBase.Forms.Direcional
}
}
- Disp.Dados.IP_Mks = txtIP.Text;
+ Disp.Dados.IP_Dir = txtIP.Text;
Disp.SalvarParametros(Disp.Dados);
}
diff --git a/AgroBase/AgroBase/Forms/IHM/frmDiagnosticos.cs b/AgroBase/AgroBase/Forms/IHM/frmDiagnosticos.cs
index 57faee810..deccf5260 100644
--- a/AgroBase/AgroBase/Forms/IHM/frmDiagnosticos.cs
+++ b/AgroBase/AgroBase/Forms/IHM/frmDiagnosticos.cs
@@ -630,7 +630,7 @@ namespace AgroBase.Forms.IHM
bool Conectado = SerialService.DispositivosMapeados.Any(x => x.Dispositivo == Enums.T_Code.Bld && x.Mod_ID == Modulo.Modulo_ID);
idx = PreencheDadosLinha(grid, Testes, idx, Conectado ? 1 : 0);
- bool Inicializado = Modulo.MovMotor.BLD_Inicializado;
+ bool Inicializado = Modulo.MovMotor.Inicializado;
idx = PreencheDadosLinha(grid, Testes, idx, Inicializado ? 1 : 0);
var SensorTmp = Modulo_Sen.Sensores.FirstOrDefault(x => x.Componente == S_Code.sTMP && x.ID.Contains(Modulo.Modulo_ID));
@@ -825,7 +825,7 @@ namespace AgroBase.Forms.IHM
bool Conectado = SerialService.DispositivosMapeados.Any(x => x.Dispositivo == Enums.T_Code.Mks && x.Mod_ID == Modulo.Modulo_ID);
idx = PreencheDadosLinha(grid, Testes, idx, Conectado ? 1 : 0);
- bool Inicializado = Modulo.DirMotor.MKS_Inicializado;
+ bool Inicializado = Modulo.DirMotor.Inicializado;
idx = PreencheDadosLinha(grid, Testes, idx, Inicializado ? 1 : 0);
int.TryParse(Leitura?.Mensagem ?? "", out int CodigoErro);
diff --git a/AgroBase/AgroBase/Forms/IHM/frmIHM.Designer.cs b/AgroBase/AgroBase/Forms/IHM/frmIHM.Designer.cs
index 6e5b8445e..0f91e09d0 100644
--- a/AgroBase/AgroBase/Forms/IHM/frmIHM.Designer.cs
+++ b/AgroBase/AgroBase/Forms/IHM/frmIHM.Designer.cs
@@ -28,7 +28,7 @@
///
private void InitializeComponent()
{
- this.lblD_Bld_DF = new System.Windows.Forms.Label();
+ this.lblD_Mov_DF = new System.Windows.Forms.Label();
this.lblD_Atu = new System.Windows.Forms.Label();
this.lblD_Sen = new System.Windows.Forms.Label();
this.lblD_Gps = new System.Windows.Forms.Label();
@@ -36,13 +36,13 @@
this.lblD_Pzm = new System.Windows.Forms.Label();
this.lblD_Lra = new System.Windows.Forms.Label();
this.lblD_Wit = new System.Windows.Forms.Label();
- this.lblD_Bld_DT = new System.Windows.Forms.Label();
- this.lblD_Mks_DF = new System.Windows.Forms.Label();
- this.lblD_Mks_EF = new System.Windows.Forms.Label();
- this.lblD_Bld_EF = new System.Windows.Forms.Label();
- this.lblD_Mks_DT = new System.Windows.Forms.Label();
- this.lblD_Mks_ET = new System.Windows.Forms.Label();
- this.lblD_Bld_ET = new System.Windows.Forms.Label();
+ this.lblD_Mov_DT = new System.Windows.Forms.Label();
+ this.lblD_Dir_DF = new System.Windows.Forms.Label();
+ this.lblD_Dir_EF = new System.Windows.Forms.Label();
+ this.lblD_Mov_EF = new System.Windows.Forms.Label();
+ this.lblD_Dir_DT = new System.Windows.Forms.Label();
+ this.lblD_Dir_ET = new System.Windows.Forms.Label();
+ this.lblD_Mov_ET = new System.Windows.Forms.Label();
this.lblD_Cam_S0 = new System.Windows.Forms.Label();
this.lblD_Cam_S1 = new System.Windows.Forms.Label();
this.lblD_Knt = new System.Windows.Forms.Label();
@@ -75,17 +75,17 @@
((System.ComponentModel.ISupportInitialize)(this.picWifi)).BeginInit();
this.SuspendLayout();
//
- // lblD_Bld_DF
+ // lblD_Mov_DF
//
- this.lblD_Bld_DF.AutoSize = true;
- this.lblD_Bld_DF.BackColor = System.Drawing.Color.Transparent;
- this.lblD_Bld_DF.Cursor = System.Windows.Forms.Cursors.Hand;
- this.lblD_Bld_DF.Location = new System.Drawing.Point(305, 33);
- this.lblD_Bld_DF.Name = "lblD_Bld_DF";
- this.lblD_Bld_DF.Size = new System.Drawing.Size(45, 24);
- this.lblD_Bld_DF.TabIndex = 2;
- this.lblD_Bld_DF.Text = "BLD";
- this.lblD_Bld_DF.Click += new System.EventHandler(this.lblModulo_Click);
+ this.lblD_Mov_DF.AutoSize = true;
+ this.lblD_Mov_DF.BackColor = System.Drawing.Color.Transparent;
+ this.lblD_Mov_DF.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.lblD_Mov_DF.Location = new System.Drawing.Point(305, 33);
+ this.lblD_Mov_DF.Name = "lblD_Mov_DF";
+ this.lblD_Mov_DF.Size = new System.Drawing.Size(54, 24);
+ this.lblD_Mov_DF.TabIndex = 2;
+ this.lblD_Mov_DF.Text = "MOV";
+ this.lblD_Mov_DF.Click += new System.EventHandler(this.lblModulo_Click);
//
// lblD_Atu
//
@@ -169,89 +169,89 @@
this.lblD_Wit.Text = "WIT";
this.lblD_Wit.Click += new System.EventHandler(this.lblModulo_Click);
//
- // lblD_Bld_DT
+ // lblD_Mov_DT
//
- this.lblD_Bld_DT.AutoSize = true;
- this.lblD_Bld_DT.BackColor = System.Drawing.Color.Lavender;
- this.lblD_Bld_DT.Cursor = System.Windows.Forms.Cursors.Hand;
- this.lblD_Bld_DT.Location = new System.Drawing.Point(305, 423);
- this.lblD_Bld_DT.Name = "lblD_Bld_DT";
- this.lblD_Bld_DT.Size = new System.Drawing.Size(45, 24);
- this.lblD_Bld_DT.TabIndex = 18;
- this.lblD_Bld_DT.Text = "BLD";
- this.lblD_Bld_DT.Click += new System.EventHandler(this.lblModulo_Click);
+ this.lblD_Mov_DT.AutoSize = true;
+ this.lblD_Mov_DT.BackColor = System.Drawing.Color.Lavender;
+ this.lblD_Mov_DT.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.lblD_Mov_DT.Location = new System.Drawing.Point(305, 423);
+ this.lblD_Mov_DT.Name = "lblD_Mov_DT";
+ this.lblD_Mov_DT.Size = new System.Drawing.Size(54, 24);
+ this.lblD_Mov_DT.TabIndex = 18;
+ this.lblD_Mov_DT.Text = "MOV";
+ this.lblD_Mov_DT.Click += new System.EventHandler(this.lblModulo_Click);
//
- // lblD_Mks_DF
+ // lblD_Dir_DF
//
- this.lblD_Mks_DF.AutoSize = true;
- this.lblD_Mks_DF.BackColor = System.Drawing.Color.Transparent;
- this.lblD_Mks_DF.Cursor = System.Windows.Forms.Cursors.Hand;
- this.lblD_Mks_DF.Location = new System.Drawing.Point(346, 101);
- this.lblD_Mks_DF.Name = "lblD_Mks_DF";
- this.lblD_Mks_DF.Size = new System.Drawing.Size(50, 24);
- this.lblD_Mks_DF.TabIndex = 19;
- this.lblD_Mks_DF.Text = "MKS";
- this.lblD_Mks_DF.Click += new System.EventHandler(this.lblModulo_Click);
+ this.lblD_Dir_DF.AutoSize = true;
+ this.lblD_Dir_DF.BackColor = System.Drawing.Color.Transparent;
+ this.lblD_Dir_DF.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.lblD_Dir_DF.Location = new System.Drawing.Point(346, 101);
+ this.lblD_Dir_DF.Name = "lblD_Dir_DF";
+ this.lblD_Dir_DF.Size = new System.Drawing.Size(40, 24);
+ this.lblD_Dir_DF.TabIndex = 19;
+ this.lblD_Dir_DF.Text = "DIR";
+ this.lblD_Dir_DF.Click += new System.EventHandler(this.lblModulo_Click);
//
- // lblD_Mks_EF
+ // lblD_Dir_EF
//
- this.lblD_Mks_EF.AutoSize = true;
- this.lblD_Mks_EF.BackColor = System.Drawing.Color.Transparent;
- this.lblD_Mks_EF.Cursor = System.Windows.Forms.Cursors.Hand;
- this.lblD_Mks_EF.Location = new System.Drawing.Point(72, 101);
- this.lblD_Mks_EF.Name = "lblD_Mks_EF";
- this.lblD_Mks_EF.Size = new System.Drawing.Size(50, 24);
- this.lblD_Mks_EF.TabIndex = 21;
- this.lblD_Mks_EF.Text = "MKS";
- this.lblD_Mks_EF.Click += new System.EventHandler(this.lblModulo_Click);
+ this.lblD_Dir_EF.AutoSize = true;
+ this.lblD_Dir_EF.BackColor = System.Drawing.Color.Transparent;
+ this.lblD_Dir_EF.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.lblD_Dir_EF.Location = new System.Drawing.Point(72, 101);
+ this.lblD_Dir_EF.Name = "lblD_Dir_EF";
+ this.lblD_Dir_EF.Size = new System.Drawing.Size(40, 24);
+ this.lblD_Dir_EF.TabIndex = 21;
+ this.lblD_Dir_EF.Text = "DIR";
+ this.lblD_Dir_EF.Click += new System.EventHandler(this.lblModulo_Click);
//
- // lblD_Bld_EF
+ // lblD_Mov_EF
//
- this.lblD_Bld_EF.AutoSize = true;
- this.lblD_Bld_EF.BackColor = System.Drawing.Color.Transparent;
- this.lblD_Bld_EF.Cursor = System.Windows.Forms.Cursors.Hand;
- this.lblD_Bld_EF.Location = new System.Drawing.Point(120, 33);
- this.lblD_Bld_EF.Name = "lblD_Bld_EF";
- this.lblD_Bld_EF.Size = new System.Drawing.Size(45, 24);
- this.lblD_Bld_EF.TabIndex = 20;
- this.lblD_Bld_EF.Text = "BLD";
- this.lblD_Bld_EF.Click += new System.EventHandler(this.lblModulo_Click);
+ this.lblD_Mov_EF.AutoSize = true;
+ this.lblD_Mov_EF.BackColor = System.Drawing.Color.Transparent;
+ this.lblD_Mov_EF.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.lblD_Mov_EF.Location = new System.Drawing.Point(120, 33);
+ this.lblD_Mov_EF.Name = "lblD_Mov_EF";
+ this.lblD_Mov_EF.Size = new System.Drawing.Size(54, 24);
+ this.lblD_Mov_EF.TabIndex = 20;
+ this.lblD_Mov_EF.Text = "MOV";
+ this.lblD_Mov_EF.Click += new System.EventHandler(this.lblModulo_Click);
//
- // lblD_Mks_DT
+ // lblD_Dir_DT
//
- this.lblD_Mks_DT.AutoSize = true;
- this.lblD_Mks_DT.BackColor = System.Drawing.Color.Lavender;
- this.lblD_Mks_DT.Cursor = System.Windows.Forms.Cursors.Hand;
- this.lblD_Mks_DT.Location = new System.Drawing.Point(346, 355);
- this.lblD_Mks_DT.Name = "lblD_Mks_DT";
- this.lblD_Mks_DT.Size = new System.Drawing.Size(50, 24);
- this.lblD_Mks_DT.TabIndex = 22;
- this.lblD_Mks_DT.Text = "MKS";
- this.lblD_Mks_DT.Click += new System.EventHandler(this.lblModulo_Click);
+ this.lblD_Dir_DT.AutoSize = true;
+ this.lblD_Dir_DT.BackColor = System.Drawing.Color.Lavender;
+ this.lblD_Dir_DT.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.lblD_Dir_DT.Location = new System.Drawing.Point(346, 355);
+ this.lblD_Dir_DT.Name = "lblD_Dir_DT";
+ this.lblD_Dir_DT.Size = new System.Drawing.Size(40, 24);
+ this.lblD_Dir_DT.TabIndex = 22;
+ this.lblD_Dir_DT.Text = "DIR";
+ this.lblD_Dir_DT.Click += new System.EventHandler(this.lblModulo_Click);
//
- // lblD_Mks_ET
+ // lblD_Dir_ET
//
- this.lblD_Mks_ET.AutoSize = true;
- this.lblD_Mks_ET.BackColor = System.Drawing.Color.Lavender;
- this.lblD_Mks_ET.Cursor = System.Windows.Forms.Cursors.Hand;
- this.lblD_Mks_ET.Location = new System.Drawing.Point(72, 355);
- this.lblD_Mks_ET.Name = "lblD_Mks_ET";
- this.lblD_Mks_ET.Size = new System.Drawing.Size(50, 24);
- this.lblD_Mks_ET.TabIndex = 24;
- this.lblD_Mks_ET.Text = "MKS";
- this.lblD_Mks_ET.Click += new System.EventHandler(this.lblModulo_Click);
+ this.lblD_Dir_ET.AutoSize = true;
+ this.lblD_Dir_ET.BackColor = System.Drawing.Color.Lavender;
+ this.lblD_Dir_ET.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.lblD_Dir_ET.Location = new System.Drawing.Point(72, 355);
+ this.lblD_Dir_ET.Name = "lblD_Dir_ET";
+ this.lblD_Dir_ET.Size = new System.Drawing.Size(40, 24);
+ this.lblD_Dir_ET.TabIndex = 24;
+ this.lblD_Dir_ET.Text = "DIR";
+ this.lblD_Dir_ET.Click += new System.EventHandler(this.lblModulo_Click);
//
- // lblD_Bld_ET
+ // lblD_Mov_ET
//
- this.lblD_Bld_ET.AutoSize = true;
- this.lblD_Bld_ET.BackColor = System.Drawing.Color.Lavender;
- this.lblD_Bld_ET.Cursor = System.Windows.Forms.Cursors.Hand;
- this.lblD_Bld_ET.Location = new System.Drawing.Point(120, 423);
- this.lblD_Bld_ET.Name = "lblD_Bld_ET";
- this.lblD_Bld_ET.Size = new System.Drawing.Size(45, 24);
- this.lblD_Bld_ET.TabIndex = 23;
- this.lblD_Bld_ET.Text = "BLD";
- this.lblD_Bld_ET.Click += new System.EventHandler(this.lblModulo_Click);
+ this.lblD_Mov_ET.AutoSize = true;
+ this.lblD_Mov_ET.BackColor = System.Drawing.Color.Lavender;
+ this.lblD_Mov_ET.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.lblD_Mov_ET.Location = new System.Drawing.Point(120, 423);
+ this.lblD_Mov_ET.Name = "lblD_Mov_ET";
+ this.lblD_Mov_ET.Size = new System.Drawing.Size(54, 24);
+ this.lblD_Mov_ET.TabIndex = 23;
+ this.lblD_Mov_ET.Text = "MOV";
+ this.lblD_Mov_ET.Click += new System.EventHandler(this.lblModulo_Click);
//
// lblD_Cam_S0
//
@@ -532,13 +532,13 @@
this.Controls.Add(this.lblD_Cam_S1);
this.Controls.Add(this.lblD_Cam_S0);
this.Controls.Add(this.picDesligar);
- this.Controls.Add(this.lblD_Mks_ET);
- this.Controls.Add(this.lblD_Bld_ET);
- this.Controls.Add(this.lblD_Mks_DT);
- this.Controls.Add(this.lblD_Mks_EF);
- this.Controls.Add(this.lblD_Bld_EF);
- this.Controls.Add(this.lblD_Mks_DF);
- this.Controls.Add(this.lblD_Bld_DT);
+ this.Controls.Add(this.lblD_Dir_ET);
+ this.Controls.Add(this.lblD_Mov_ET);
+ this.Controls.Add(this.lblD_Dir_DT);
+ this.Controls.Add(this.lblD_Dir_EF);
+ this.Controls.Add(this.lblD_Mov_EF);
+ this.Controls.Add(this.lblD_Dir_DF);
+ this.Controls.Add(this.lblD_Mov_DT);
this.Controls.Add(this.lblD_Wit);
this.Controls.Add(this.lblD_Lra);
this.Controls.Add(this.lblD_Pzm);
@@ -546,7 +546,7 @@
this.Controls.Add(this.lblD_Gps);
this.Controls.Add(this.lblD_Sen);
this.Controls.Add(this.lblD_Atu);
- this.Controls.Add(this.lblD_Bld_DF);
+ this.Controls.Add(this.lblD_Mov_DF);
this.Controls.Add(this.picRobo);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
@@ -570,7 +570,7 @@
#endregion
private System.Windows.Forms.PictureBox picRobo;
- private System.Windows.Forms.Label lblD_Bld_DF;
+ private System.Windows.Forms.Label lblD_Mov_DF;
private System.Windows.Forms.Label lblD_Atu;
private System.Windows.Forms.Label lblD_Sen;
private System.Windows.Forms.Label lblD_Gps;
@@ -578,13 +578,13 @@
private System.Windows.Forms.Label lblD_Pzm;
private System.Windows.Forms.Label lblD_Lra;
private System.Windows.Forms.Label lblD_Wit;
- private System.Windows.Forms.Label lblD_Bld_DT;
- private System.Windows.Forms.Label lblD_Mks_DF;
- private System.Windows.Forms.Label lblD_Mks_EF;
- private System.Windows.Forms.Label lblD_Bld_EF;
- private System.Windows.Forms.Label lblD_Mks_DT;
- private System.Windows.Forms.Label lblD_Mks_ET;
- private System.Windows.Forms.Label lblD_Bld_ET;
+ private System.Windows.Forms.Label lblD_Mov_DT;
+ private System.Windows.Forms.Label lblD_Dir_DF;
+ private System.Windows.Forms.Label lblD_Dir_EF;
+ private System.Windows.Forms.Label lblD_Mov_EF;
+ private System.Windows.Forms.Label lblD_Dir_DT;
+ private System.Windows.Forms.Label lblD_Dir_ET;
+ private System.Windows.Forms.Label lblD_Mov_ET;
private System.Windows.Forms.PictureBox picDiagnosticos;
private System.Windows.Forms.PictureBox picOperacao;
private System.Windows.Forms.PictureBox picDesligar;
diff --git a/AgroBase/AgroBase/Forms/Movimentacao/frmMovConfig.cs b/AgroBase/AgroBase/Forms/Movimentacao/frmMovConfig.cs
index 25af16d44..3c2c7be96 100644
--- a/AgroBase/AgroBase/Forms/Movimentacao/frmMovConfig.cs
+++ b/AgroBase/AgroBase/Forms/Movimentacao/frmMovConfig.cs
@@ -89,7 +89,7 @@ namespace AgroBase.Forms.Movimentacao
nudRPMMax.Value = (int)Disp.Dados.RPM_Max_MotorBLDC;
nudReducao.Value = (int)Disp.Dados.ReducaoMotorBLDC;
nudDiametroRoda.Value = (int)(Disp.Dados.DiametroRoda * 1000);
- txtIP.Text = Disp.Dados.IP_Bld;
+ txtIP.Text = Disp.Dados.IP_Mov;
}
private void frmMovConfig_FormClosing(object sender, FormClosingEventArgs e)
@@ -147,7 +147,7 @@ namespace AgroBase.Forms.Movimentacao
Disp.Dados.RPM_Max_MotorBLDC = Convert.ToInt32(nudRPMMax.Value);
Disp.Dados.ReducaoMotorBLDC = Convert.ToInt32(nudReducao.Value);
Disp.Dados.DiametroRoda = Convert.ToDouble(nudDiametroRoda.Value / 1000);
- Disp.Dados.IP_Bld = txtIP.Text;
+ Disp.Dados.IP_Mov = txtIP.Text;
Disp.SalvarParametros(Disp.Dados);
}
diff --git a/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoManual.cs b/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoManual.cs
index 64d064a4d..b775a40c3 100644
--- a/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoManual.cs
+++ b/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoManual.cs
@@ -156,8 +156,8 @@ namespace AgroBase.Forms.Operacoes
lblTensao.Text = PZEMService.UltimaLeitura.Tensao.ToString("0.00") + " v";
lblCorrente.Text = PZEMService.UltimaLeitura.Corrente.ToString("0.00") + " A";
- lblRPM.Text = Variaveis.OperacaoEmAndamento.DispMvd.Dados.Modulos.Average(x => x.MovMotor.RPM_Roda).ToString("0") + " rpm";
- lblVelocidade.Text = Variaveis.OperacaoEmAndamento.DispMvd.Dados.Modulos.Average(x => x.MovMotor.VelocidadeInstantanea).ToString("0.00");
+ lblRPM.Text = Variaveis.OperacaoEmAndamento.DispMvd.Dados.Modulos.Where(x => x.MovMotor.Inicializado).Average(x => x.MovMotor.RPM_Roda).ToString("0") + " rpm";
+ lblVelocidade.Text = Variaveis.OperacaoEmAndamento.DispMvd.Dados.Modulos.Where(x => x.MovMotor.Inicializado).Average(x => x.MovMotor.VelocidadeInstantanea).ToString("0.00");
var Sonar = Variaveis.OperacaoEmAndamento.Sensoriamento.SonarFrontal_Kinect;
bool sonarAtivado = (Sonar?.Iniciado ?? false) && Variaveis.OperacaoEmAndamento.Controle.SonarAtivado;
@@ -207,11 +207,11 @@ namespace AgroBase.Forms.Operacoes
Label lblAngulo = pnl.Controls.OfType