diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/17c09abd-2cf5-47d2-9448-ce03b9998ff9.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/17c09abd-2cf5-47d2-9448-ce03b9998ff9.vsidx deleted file mode 100644 index 3eceffe8d..000000000 Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/17c09abd-2cf5-47d2-9448-ce03b9998ff9.vsidx and /dev/null differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/6bcb2b8d-c2b7-4492-9ca4-19d5fd0cc4e7.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/6bcb2b8d-c2b7-4492-9ca4-19d5fd0cc4e7.vsidx new file mode 100644 index 000000000..cf90df8dc Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/6bcb2b8d-c2b7-4492-9ca4-19d5fd0cc4e7.vsidx differ diff --git a/AgroBase/.vs/AgroBase/v17/.suo b/AgroBase/.vs/AgroBase/v17/.suo index 47986e2bf..bbd47d688 100644 Binary files a/AgroBase/.vs/AgroBase/v17/.suo and b/AgroBase/.vs/AgroBase/v17/.suo differ diff --git a/AgroBase/.vs/AgroBase/v17/DocumentLayout.json b/AgroBase/.vs/AgroBase/v17/DocumentLayout.json index a0415a1ab..fbfc48346 100644 --- a/AgroBase/.vs/AgroBase/v17/DocumentLayout.json +++ b/AgroBase/.vs/AgroBase/v17/DocumentLayout.json @@ -2,13 +2,29 @@ "Version": 1, "WorkspaceRootPath": "C:\\ZendionINC\\agrobot_base\\AgroBase\\", "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|c:\\zendioninc\\agrobot_base\\agrobase\\agrobase\\services\\serialservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\services\\serialservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|c:\\zendioninc\\agrobot_base\\agrobase\\agrobase\\models\\operacoes\\operacaomodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\models\\operacoes\\operacaomodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|C:\\ZendionINC\\agrobot_base\\AgroBase\\agrobase\\models\\generaljoystick.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\models\\generaljoystick.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|C:\\ZendionINC\\agrobot_base\\AgroBase\\agrobase\\forms\\operacoes\\frmresultadosoperacao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\forms\\operacoes\\frmresultadosoperacao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|c:\\zendioninc\\agrobot_base\\agrobase\\agrobase\\forms\\operacoes\\frmresultadosoperacao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\forms\\operacoes\\frmresultadosoperacao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" + }, + { + "AbsoluteMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|c:\\zendioninc\\agrobot_base\\agrobase\\agrobase\\services\\bld300rservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\services\\bld300rservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|c:\\zendioninc\\agrobot_base\\agrobase\\agrobase\\services\\mks057dservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\services\\mks057dservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -23,27 +39,78 @@ { "$type": "Document", "DocumentIndex": 0, - "Title": "OperacaoModel.cs", - "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Models\\Operacoes\\OperacaoModel.cs", - "RelativeDocumentMoniker": "AgroBase\\Models\\Operacoes\\OperacaoModel.cs", - "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Models\\Operacoes\\OperacaoModel.cs", - "RelativeToolTip": "AgroBase\\Models\\Operacoes\\OperacaoModel.cs", - "ViewState": "AQIAAF0GAAAAAAAAAAApwBQHAABTAAAA", + "Title": "SerialService.cs", + "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Services\\SerialService.cs", + "RelativeDocumentMoniker": "AgroBase\\Services\\SerialService.cs", + "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Services\\SerialService.cs", + "RelativeToolTip": "AgroBase\\Services\\SerialService.cs", + "ViewState": "AQIAAB8AAAAAAAAAAAAswDICAABAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-17T20:14:20.606Z", + "WhenOpened": "2024-12-19T18:48:58.803Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "MKS057DService.cs", + "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Services\\MKS057DService.cs", + "RelativeDocumentMoniker": "AgroBase\\Services\\MKS057DService.cs", + "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Services\\MKS057DService.cs", + "RelativeToolTip": "AgroBase\\Services\\MKS057DService.cs", + "ViewState": "AQIAACICAAAAAAAAAAAcwDYAAABDAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-19T18:34:37.033Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "BLD300RService.cs", + "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Services\\BLD300RService.cs", + "RelativeDocumentMoniker": "AgroBase\\Services\\BLD300RService.cs", + "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Services\\BLD300RService.cs", + "RelativeToolTip": "AgroBase\\Services\\BLD300RService.cs", + "ViewState": "AQIAAAoAAAAAAAAAAAAiwM0AAAAxAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-19T18:32:13.222Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "frmResultadosOperacao.cs [Design]", + "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Forms\\Operacoes\\frmResultadosOperacao.cs", + "RelativeDocumentMoniker": "AgroBase\\Forms\\Operacoes\\frmResultadosOperacao.cs", + "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Forms\\Operacoes\\frmResultadosOperacao.cs [Design]", + "RelativeToolTip": "AgroBase\\Forms\\Operacoes\\frmResultadosOperacao.cs [Design]", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-19T12:57:34.196Z", + "EditorCaption": " [Design]" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "frmResultadosOperacao.cs", + "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Forms\\Operacoes\\frmResultadosOperacao.cs", + "RelativeDocumentMoniker": "AgroBase\\Forms\\Operacoes\\frmResultadosOperacao.cs", + "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Forms\\Operacoes\\frmResultadosOperacao.cs", + "RelativeToolTip": "AgroBase\\Forms\\Operacoes\\frmResultadosOperacao.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAoDAAAzAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-18T19:37:53.993Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 1, - "Title": "GeneralJoystick.cs", - "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Models\\GeneralJoystick.cs", - "RelativeDocumentMoniker": "AgroBase\\Models\\GeneralJoystick.cs", - "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Models\\GeneralJoystick.cs", - "RelativeToolTip": "AgroBase\\Models\\GeneralJoystick.cs", - "ViewState": "AQIAAHsCAAAAAAAAAAAnwOkCAABUAAAA", + "Title": "OperacaoModel.cs", + "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Models\\Operacoes\\OperacaoModel.cs", + "RelativeDocumentMoniker": "AgroBase\\Models\\Operacoes\\OperacaoModel.cs", + "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Models\\Operacoes\\OperacaoModel.cs", + "RelativeToolTip": "AgroBase\\Models\\Operacoes\\OperacaoModel.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAHEJAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-12-18T13:02:20.66Z", + "WhenOpened": "2024-12-17T20:14:20.606Z", "EditorCaption": "" } ] diff --git a/AgroBase/AgroBase/Forms/Atuador/frmAtuCalibragem.cs b/AgroBase/AgroBase/Forms/Atuador/frmAtuCalibragem.cs index 126c2d9ca..1e6cec9b7 100644 --- a/AgroBase/AgroBase/Forms/Atuador/frmAtuCalibragem.cs +++ b/AgroBase/AgroBase/Forms/Atuador/frmAtuCalibragem.cs @@ -164,13 +164,13 @@ namespace AgroBase.Forms.Atuador private void btnLigarBomba_Click(object sender, EventArgs e) { var Bomba = Variaveis.OperacaoEmAndamento.DispAtu.Dados.BombaPressurizadora; - GeneralJoystick.EnviarComandoAtuador(S_Code.sBMB, true, Bomba.ID); + GeneralJoystick.EnviarComandoAtuador(S_Code.sBMB, true, Bomba.ID, true); } private void btnDesligarBomba_Click(object sender, EventArgs e) { var Bomba = Variaveis.OperacaoEmAndamento.DispAtu.Dados.BombaPressurizadora; - GeneralJoystick.EnviarComandoAtuador(S_Code.sBMB, false, Bomba.ID); + GeneralJoystick.EnviarComandoAtuador(S_Code.sBMB, false, Bomba.ID, true); } private void pnlBico_Paint(object sender, PaintEventArgs e) @@ -194,7 +194,7 @@ namespace AgroBase.Forms.Atuador { Button btn = (Button)sender; string ID = btn.Name.Replace("btn0_", ""); - GeneralJoystick.EnviarComandoAtuador(S_Code.sBIC, false, ID); + GeneralJoystick.EnviarComandoAtuador(S_Code.sBIC, false, ID, true); pnlBicos.Controls.OfType().First(x => x.Name == "pnlB_" + ID).Invalidate(); pnlBicos.Controls.OfType().First(x => x.Name == "pnlB_" + ID).Controls.OfType