diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/051ba282-a103-4b42-81c9-94ec3de319f7.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/051ba282-a103-4b42-81c9-94ec3de319f7.vsidx
new file mode 100644
index 000000000..1404a0ca5
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/051ba282-a103-4b42-81c9-94ec3de319f7.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/243eb830-f2e4-4f08-b4a9-da2c39df310b.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/243eb830-f2e4-4f08-b4a9-da2c39df310b.vsidx
deleted file mode 100644
index 7bcbaddde..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/243eb830-f2e4-4f08-b4a9-da2c39df310b.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/38e0c70f-909b-46f3-abac-7274e1a6adbf.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/38e0c70f-909b-46f3-abac-7274e1a6adbf.vsidx
deleted file mode 100644
index d7947615d..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/38e0c70f-909b-46f3-abac-7274e1a6adbf.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/5610f1e6-ac6a-4455-9161-068629b129dc.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/5610f1e6-ac6a-4455-9161-068629b129dc.vsidx
new file mode 100644
index 000000000..70aef67a0
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/5610f1e6-ac6a-4455-9161-068629b129dc.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/94cb9f3f-9208-4251-9e8c-344f8152b70c.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/94cb9f3f-9208-4251-9e8c-344f8152b70c.vsidx
deleted file mode 100644
index 750052f07..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/94cb9f3f-9208-4251-9e8c-344f8152b70c.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/9e974e75-c675-4429-94d2-f89dd5146591.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/9e974e75-c675-4429-94d2-f89dd5146591.vsidx
deleted file mode 100644
index e1db9f7d1..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/9e974e75-c675-4429-94d2-f89dd5146591.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/b316ccb8-fa32-4063-8707-44fe4880396c.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/b316ccb8-fa32-4063-8707-44fe4880396c.vsidx
deleted file mode 100644
index 98ea109c9..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/b316ccb8-fa32-4063-8707-44fe4880396c.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/c7c53831-d00a-4f34-862c-b6357d8c9d0e.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/c7c53831-d00a-4f34-862c-b6357d8c9d0e.vsidx
new file mode 100644
index 000000000..8cb382cd3
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/c7c53831-d00a-4f34-862c-b6357d8c9d0e.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/v17/.suo b/AgroBase/.vs/AgroBase/v17/.suo
index 38e6db3f9..d12623410 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 621070f46..8174b5f23 100644
--- a/AgroBase/.vs/AgroBase/v17/DocumentLayout.json
+++ b/AgroBase/.vs/AgroBase/v17/DocumentLayout.json
@@ -3,8 +3,36 @@
"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\\models\\enuns.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\models\\enuns.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\\frmoperacaomanual.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\forms\\operacoes\\frmoperacaomanual.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\\frmacompanhamento.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\forms\\frmacompanhamento.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\\models\\modules\\movimentacaounificadomodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\models\\modules\\movimentacaounificadomodel.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\\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\\forms\\frmprincipal.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\forms\\frmprincipal.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\\dispositivosservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\services\\dispositivosservice.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}"
}
],
"DocumentGroupContainers": [
@@ -14,19 +42,110 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 0,
+ "SelectedChildIndex": 4,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 0,
- "Title": "Enuns.cs",
- "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Models\\Enuns.cs",
- "RelativeDocumentMoniker": "AgroBase\\Models\\Enuns.cs",
- "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Models\\Enuns.cs",
- "RelativeToolTip": "AgroBase\\Models\\Enuns.cs",
- "ViewState": "AQIAAAgAAAAAAAAAAAAxwDUAAAAMAAAA",
+ "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": "AQIAACkCAAAAAAAAAAAAAEgCAAAXAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2024-06-06T10:38:10.351Z",
+ "WhenOpened": "2024-06-08T00:52:51.592Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
+ "Title": "frmAcompanhamento.cs",
+ "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Forms\\frmAcompanhamento.cs",
+ "RelativeDocumentMoniker": "AgroBase\\Forms\\frmAcompanhamento.cs",
+ "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Forms\\frmAcompanhamento.cs",
+ "RelativeToolTip": "AgroBase\\Forms\\frmAcompanhamento.cs",
+ "ViewState": "AQIAAAAAAAAAAAAAAAAAAHEBAABMAAAA",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2024-06-08T00:34:52.765Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 5,
+ "Title": "frmPrincipal.cs",
+ "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Forms\\frmPrincipal.cs",
+ "RelativeDocumentMoniker": "AgroBase\\Forms\\frmPrincipal.cs",
+ "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Forms\\frmPrincipal.cs",
+ "RelativeToolTip": "AgroBase\\Forms\\frmPrincipal.cs",
+ "ViewState": "AQIAABoAAAAAAAAAAAAkwFkAAAApAAAA",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2024-06-07T19:57:07.232Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
+ "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": "AQIAAAEAAAAAAAAAAAAiwDkAAAAAAAAA",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2024-06-07T18:00:32.305Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 0,
+ "Title": "frmOperacaoManual.cs",
+ "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Forms\\Operacoes\\frmOperacaoManual.cs",
+ "RelativeDocumentMoniker": "AgroBase\\Forms\\Operacoes\\frmOperacaoManual.cs",
+ "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Forms\\Operacoes\\frmOperacaoManual.cs",
+ "RelativeToolTip": "AgroBase\\Forms\\Operacoes\\frmOperacaoManual.cs",
+ "ViewState": "AQIAAA0AAAAAAAAAAAAkwMcBAAAIAAAA",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2024-06-07T16:53:23.408Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 7,
+ "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": "AQIAAOUAAAAAAAAAAAAqwCEAAAAfAAAA",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2024-06-07T11:12:40.207Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 3,
+ "Title": "MovimentacaoUnificadoModel.cs",
+ "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Models\\Modules\\MovimentacaoUnificadoModel.cs",
+ "RelativeDocumentMoniker": "AgroBase\\Models\\Modules\\MovimentacaoUnificadoModel.cs",
+ "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Models\\Modules\\MovimentacaoUnificadoModel.cs",
+ "RelativeToolTip": "AgroBase\\Models\\Modules\\MovimentacaoUnificadoModel.cs",
+ "ViewState": "AQIAAAkAAAAAAAAAAAAqwB8AAABLAAAA",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2024-06-06T18:02:19.931Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 6,
+ "Title": "DispositivosService.cs",
+ "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Services\\DispositivosService.cs",
+ "RelativeDocumentMoniker": "AgroBase\\Services\\DispositivosService.cs",
+ "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Services\\DispositivosService.cs",
+ "RelativeToolTip": "AgroBase\\Services\\DispositivosService.cs",
+ "ViewState": "AQIAADQAAAAAAAAAAAA7wNwAAAAhAAAA",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2024-06-06T17:38:48.095Z",
"EditorCaption": ""
}
]
diff --git a/AgroBase/AgroBase/AgroBase.csproj b/AgroBase/AgroBase/AgroBase.csproj
index 8091f3c90..97454e131 100644
--- a/AgroBase/AgroBase/AgroBase.csproj
+++ b/AgroBase/AgroBase/AgroBase.csproj
@@ -359,6 +359,7 @@
+
diff --git a/AgroBase/AgroBase/Forms/Atuador/frmAtuCalibragem.cs b/AgroBase/AgroBase/Forms/Atuador/frmAtuCalibragem.cs
index 6c0b8415d..74f4247b6 100644
--- a/AgroBase/AgroBase/Forms/Atuador/frmAtuCalibragem.cs
+++ b/AgroBase/AgroBase/Forms/Atuador/frmAtuCalibragem.cs
@@ -155,7 +155,7 @@ namespace AgroBase.Forms.Atuador
private void EnviarProtocoloComandoBomba()
{
string Protocolo = DispAtu.Dados.BombaPressurizadora.ProtocoloComando();
- DispAtu.AdicionarMensagemFila(Protocolo);
+ DispAtu.AdicionarMensagemFila(DispAtu.Dados.Modulo_ID, Protocolo);
}
private void nudPressaoSP_ValueChanged(object sender, EventArgs e)
@@ -202,7 +202,7 @@ namespace AgroBase.Forms.Atuador
{
Bico.Atuado = !DispAtu.Dados.AtuacaoNivelAlto;
string Protocolo = Bico.ProtocoloComando();
- DispAtu.AdicionarMensagemFila(Protocolo);
+ DispAtu.AdicionarMensagemFila(DispAtu.Dados.Modulo_ID, Protocolo);
pnlBicos.Controls.OfType().First(x => x.Name == "pnlB_" + ID).Invalidate();
pnlBicos.Controls.OfType().First(x => x.Name == "pnlB_" + ID).Controls.OfType