diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/32888aa0-4530-44d8-a801-1292a74fa100.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/32888aa0-4530-44d8-a801-1292a74fa100.vsidx new file mode 100644 index 000000000..1e19fc539 Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/32888aa0-4530-44d8-a801-1292a74fa100.vsidx differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/6a0eb3b0-2c43-48bc-b268-2dcf797d2753.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/6a0eb3b0-2c43-48bc-b268-2dcf797d2753.vsidx deleted file mode 100644 index 1f8f2bca4..000000000 Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/6a0eb3b0-2c43-48bc-b268-2dcf797d2753.vsidx and /dev/null differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/865dfb13-2bb1-47c1-b7e6-2b37b8d2e79f.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/865dfb13-2bb1-47c1-b7e6-2b37b8d2e79f.vsidx deleted file mode 100644 index 70aef67a0..000000000 Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/865dfb13-2bb1-47c1-b7e6-2b37b8d2e79f.vsidx and /dev/null differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/aa176177-0584-43cb-bc0c-3d8cd1ff3d57.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/aa176177-0584-43cb-bc0c-3d8cd1ff3d57.vsidx new file mode 100644 index 000000000..e86f2850c Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/aa176177-0584-43cb-bc0c-3d8cd1ff3d57.vsidx differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/f1993de7-1b04-4302-92aa-1048abd2e361.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/f1993de7-1b04-4302-92aa-1048abd2e361.vsidx deleted file mode 100644 index 29a246561..000000000 Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/f1993de7-1b04-4302-92aa-1048abd2e361.vsidx and /dev/null differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/f223c8d3-25ec-4343-9160-e5cd7a4902fe.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/f223c8d3-25ec-4343-9160-e5cd7a4902fe.vsidx new file mode 100644 index 000000000..428b1416f Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/f223c8d3-25ec-4343-9160-e5cd7a4902fe.vsidx differ diff --git a/AgroBase/.vs/AgroBase/v17/.suo b/AgroBase/.vs/AgroBase/v17/.suo index 1b6031dcb..b1d0b910d 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 4590d0da7..f156249ff 100644 --- a/AgroBase/AgroBase/AgroBase.csproj +++ b/AgroBase/AgroBase/AgroBase.csproj @@ -387,7 +387,7 @@ - + diff --git a/AgroBase/AgroBase/Forms/Atuador/frmAtuCalibragem.cs b/AgroBase/AgroBase/Forms/Atuador/frmAtuCalibragem.cs index 8473d4ce6..24f4090fa 100644 --- a/AgroBase/AgroBase/Forms/Atuador/frmAtuCalibragem.cs +++ b/AgroBase/AgroBase/Forms/Atuador/frmAtuCalibragem.cs @@ -11,7 +11,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; using System.Windows.Forms.DataVisualization.Charting; -using static AgroBase.Models.Enuns; +using static AgroBase.Models.Enums; namespace AgroBase.Forms.Atuador { @@ -152,28 +152,20 @@ namespace AgroBase.Forms.Atuador grdSensoriamento.Rows[9].Cells[1].Value = DispAtu.Dados.PercentualReservatorio.ToString("0.00"); } - private void EnviarProtocoloComandoBomba() - { - string Protocolo = DispAtu.Dados.BombaPressurizadora.ProtocoloComando(); - DispAtu.AdicionarMensagemFila(DispAtu.Dados.Modulo_ID, Protocolo, true, true); - } - private void nudPressaoSP_ValueChanged(object sender, EventArgs e) { Variaveis.OperacaoEmAndamento.Controle.PressaoLinha = Convert.ToInt32(((NumericUpDown)sender).Value); - EnviarProtocoloComandoBomba(); + GeneralJoystick.EnviarComandoAtuador(S_Code.sBMB, Variaveis.OperacaoEmAndamento.DispAtu.Dados.BombaPressurizadora.BombaAtuada); } private void btnLigarBomba_Click(object sender, EventArgs e) { - DispAtu.Dados.BombaPressurizadora.BombaAtuada = true; - EnviarProtocoloComandoBomba(); + GeneralJoystick.EnviarComandoAtuador(S_Code.sBMB, true); } private void btnDesligarBomba_Click(object sender, EventArgs e) { - DispAtu.Dados.BombaPressurizadora.BombaAtuada = false; - EnviarProtocoloComandoBomba(); + GeneralJoystick.EnviarComandoAtuador(S_Code.sBMB, false); } private void pnlBico_Paint(object sender, PaintEventArgs e) @@ -197,32 +189,18 @@ namespace AgroBase.Forms.Atuador { Button btn = (Button)sender; string ID = btn.Name.Replace("btn0_", ""); - var Bico = DispAtu.Dados.BicosPulverizadores.FirstOrDefault(x => x.ID == ID); - if (Bico != null) - { - Bico.Atuado = !DispAtu.Dados.AtuacaoNivelAlto; - string Protocolo = Bico.ProtocoloComando(); - DispAtu.AdicionarMensagemFila(DispAtu.Dados.Modulo_ID, Protocolo, true, false); - - pnlBicos.Controls.OfType().First(x => x.Name == "pnlB_" + ID).Invalidate(); - pnlBicos.Controls.OfType().First(x => x.Name == "pnlB_" + ID).Controls.OfType