diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/3f5fb589-f57f-4bc8-8c79-db0a77e32d0a.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/3f5fb589-f57f-4bc8-8c79-db0a77e32d0a.vsidx new file mode 100644 index 000000000..6c7f426c7 Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/3f5fb589-f57f-4bc8-8c79-db0a77e32d0a.vsidx differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/5d2b4002-1d71-42ec-8f30-d432b88a2fb2.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/5d2b4002-1d71-42ec-8f30-d432b88a2fb2.vsidx deleted file mode 100644 index 2765d1bff..000000000 Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/5d2b4002-1d71-42ec-8f30-d432b88a2fb2.vsidx and /dev/null differ diff --git a/AgroBase/.vs/AgroBase/v17/.suo b/AgroBase/.vs/AgroBase/v17/.suo index 0a61ee3d2..47668081d 100644 Binary files a/AgroBase/.vs/AgroBase/v17/.suo and b/AgroBase/.vs/AgroBase/v17/.suo differ diff --git a/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoManual.cs b/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoManual.cs index 744e16635..9f5f71308 100644 --- a/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoManual.cs +++ b/AgroBase/AgroBase/Forms/Operacoes/frmOperacaoManual.cs @@ -430,6 +430,13 @@ namespace AgroBase.Forms.Operacoes gridDados.Rows.Add("Vazão Instantanea", "", "mL/s"); gridDados.Rows.Add("Vazão Media", "", "mL/s"); gridDados.Rows.Add("Volume Vazado", "", "mL"); + gridDados.Rows.Add("", "", ""); + gridDados.Rows.Add("Roll", "", ""); + gridDados.Rows.Add("Pitch", "", ""); + gridDados.Rows.Add("Yaw", "", ""); + gridDados.Rows.Add("Temperatura", "", ""); + gridDados.Rows.Add("Pressao", "", ""); + gridDados.Rows.Add("Altitude", "", ""); AtualizarInformacoesGerais(); } @@ -442,6 +449,7 @@ namespace AgroBase.Forms.Operacoes var AB7V2 = _SensoresCorrente.FirstOrDefault(x => x.ID == "AB7V2"); var AB12V = _SensoresCorrente.FirstOrDefault(x => x.ID == "AB12V"); var _Sensoriamento = Variaveis.OperacaoEmAndamento.Sensoriamento; + var _SensorIMU = Variaveis.OperacaoEmAndamento.DispSen.Dados.DadosLeitura.SensoresIMU.FirstOrDefault(); gridDados.Rows[0].Cells[1].Value = _Sensoriamento.TempoDecorrido.ToString("HH:mm:ss"); gridDados.Rows[1].Cells[1].Value = _Sensoriamento.Movimentacao.TempoMovimento.ToString("HH:mm:ss"); @@ -465,6 +473,13 @@ namespace AgroBase.Forms.Operacoes gridDados.Rows[19].Cells[1].Value = _Sensoriamento.Atuador.VazaoInstantanea.ToString("0.00"); gridDados.Rows[20].Cells[1].Value = _Sensoriamento.Atuador.VazaoMedia.ToString("0.00"); gridDados.Rows[21].Cells[1].Value = _Sensoriamento.Atuador.VolumeVazaoMl.ToString("0.00"); + gridDados.Rows[22].Cells[1].Value = ""; + gridDados.Rows[23].Cells[1].Value = _SensorIMU.Roll.ToString("0.00"); + gridDados.Rows[24].Cells[1].Value = _SensorIMU.Pitch.ToString("0.00"); + gridDados.Rows[25].Cells[1].Value = _SensorIMU.Yaw.ToString("0.00"); + gridDados.Rows[26].Cells[1].Value = _SensorIMU.Temperatura.ToString("0.00"); + gridDados.Rows[27].Cells[1].Value = _SensorIMU.Pressao.ToString("0.00"); + gridDados.Rows[28].Cells[1].Value = _SensorIMU.Altitude.ToString("0.00"); } #endregion diff --git a/AgroBase/AgroBase/Forms/Operacoes/frmResultadosOperacao.cs b/AgroBase/AgroBase/Forms/Operacoes/frmResultadosOperacao.cs index ea5a0916c..f4271244c 100644 --- a/AgroBase/AgroBase/Forms/Operacoes/frmResultadosOperacao.cs +++ b/AgroBase/AgroBase/Forms/Operacoes/frmResultadosOperacao.cs @@ -1224,7 +1224,6 @@ namespace AgroBase.Forms.Operacoes { var Log = LogsDirecional.Where(x => x.Modulo_ID == ID).FirstOrDefault(x => x.Momento == MomentoAtual); var LogSen = LogsSensoriamento.FirstOrDefault(x => x.Momento == MomentoAtual); - var SensorPot = LogSen?.SensoresPotenciometro?.FirstOrDefault(x => x.ID.Contains(ID)); double Angulo = Log?.Angulo ?? 0; double Multiplicador = -1; @@ -1259,11 +1258,6 @@ namespace AgroBase.Forms.Operacoes TextBox txtControlar = FuncoesGlobais.FindControlRecursive(tabDirecional, "txtDIR_Controlar_" + ID); txtControlar.Text = (Log?.Controlar ?? false) ? "Sim" : "Não"; TextBox txtStatus = FuncoesGlobais.FindControlRecursive(tabDirecional, "txtDIR_Status_" + ID); - txtStatus.Text = (SensorPot?.Status ?? Enums.StatusSensorPotenciometro.Indefinido).ToString(); - TextBox txtAgPot = FuncoesGlobais.FindControlRecursive(tabDirecional, "txtDIR_AgPot_" + ID); - txtAgPot.Text = (SensorPot?.Angulo ?? -1).ToString("0.00"); - Label lblAgPot = FuncoesGlobais.FindControlRecursive