Zendion/OrionTardPro
Zendion
/
OrionTardPro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tratamentos de erro e robustez da classe serial service

This commit is contained in:
Diego Freitas 2026-07-03 15:03:33 -03:00
parent ccdb92ddeb
commit 1ae1be349b
17 changed files with 1428 additions and 626 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Instalador/Instalador.iss
View File

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "OrionTard Pro"
#define MyAppVersion "1.0.1.5"
#define MyAppVersion "1.0.1.8"
#define MyAppPublisher "Zendion, Inc."
#define MyAppURL "https://zendioninc.com.br"
#define MyAppExeName "OrionTardPro.exe"

10
OrionTardPro/OrionTardPro/Enuns.cs
View File

@ -81,6 +81,7 @@ namespace OrionTardPro
Tmp, // Temperatura
Ods, // Odometro
Pns, // Ping
Mod, // Dados Modulo
}
public enum TipoEmbreagem
@ -138,6 +139,15 @@ namespace OrionTardPro
Perfil = 0,
}
public enum ModeloEquipamento
{
Indefinido = 0,
Tardigrado = 1,
Factor2 = 2,
Factor3 = 3,
Factor4 = 4,
}
}
}

15
OrionTardPro/OrionTardPro/Forms/frmConexao.Designer.cs generated
View File

@ -50,6 +50,7 @@
this.lblEnvios = new System.Windows.Forms.Label();
this.txtEnvios = new System.Windows.Forms.NumericUpDown();
this.btnConectar = new System.Windows.Forms.Button();
this.chbPingCamera = new System.Windows.Forms.CheckBox();
this.tabControl1.SuspendLayout();
this.tabConexao.SuspendLayout();
this.tabReceptor.SuspendLayout();
@ -233,6 +234,7 @@
//
// tabTransmissor
//
this.tabTransmissor.Controls.Add(this.chbPingCamera);
this.tabTransmissor.Controls.Add(this.chbCamera);
this.tabTransmissor.Controls.Add(this.lblSegundos);
this.tabTransmissor.Controls.Add(this.lblTempoPings);
@ -250,7 +252,7 @@
// chbCamera
//
this.chbCamera.AutoSize = true;
this.chbCamera.Location = new System.Drawing.Point(17, 77);
this.chbCamera.Location = new System.Drawing.Point(11, 69);
this.chbCamera.Name = "chbCamera";
this.chbCamera.Size = new System.Drawing.Size(204, 20);
this.chbCamera.TabIndex = 5;
@ -343,6 +345,16 @@
this.btnConectar.UseVisualStyleBackColor = true;
this.btnConectar.Click += new System.EventHandler(this.btnConectar_Click);
//
// chbPingCamera
//
this.chbPingCamera.AutoSize = true;
this.chbPingCamera.Location = new System.Drawing.Point(11, 89);
this.chbPingCamera.Name = "chbPingCamera";
this.chbPingCamera.Size = new System.Drawing.Size(184, 20);
this.chbPingCamera.TabIndex = 6;
this.chbPingCamera.Text = "Enviar ping para a câmera";
this.chbPingCamera.UseVisualStyleBackColor = true;
//
// frmConexao
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
@ -399,5 +411,6 @@
public System.Windows.Forms.ComboBox cmbBaud;
public System.Windows.Forms.ComboBox cmbPorta;
public System.Windows.Forms.CheckBox chbRequisitarDados;
public System.Windows.Forms.CheckBox chbPingCamera;
}
}

2
OrionTardPro/OrionTardPro/Forms/frmConexao.cs
View File

@ -55,7 +55,7 @@ namespace OrionTardPro
SerialService.SensoresTimer.Interval = Convert.ToInt32(txtDelay.Value);
SerialService.SensoresTimer.Start();
SerialService.EnvioTimer.Start();
Variaveis.frmPrincipal.lblCarroconexao.Text = "Carro: Conectado";
Variaveis.frmPrincipal.lblCarroconexao.Text = $"Carro: Conectado ({Variaveis._Model.ToString()} | NS {Variaveis._RobotNS} | FV {Variaveis._FirmwareVersion})";
}
else
MessageBox.Show("Houve um erro ao tentar conectar-se à prota " + SerialService.PortaCom + ".", "Erro", MessageBoxButtons.OK, MessageBoxIcon.Error);

9
OrionTardPro/OrionTardPro/Forms/frmControlecarro.cs
View File

@ -69,6 +69,15 @@ namespace OrionTardPro
case Comando.ReleGeral:
GeneralJoystick.AlternarStatusReleGeral();
break;
case Comando.MedidorEspessura:
bool carimbar = e.KeyCode == Keys.Q;
if (!carimbar)
{
Variaveis.frmPrincipal.trkMedidorEspessura.Value = Variaveis.Angulo_MedidorEspessuraVertical == 0 ? Variaveis.PerfilVigente.AnguloMedicaoIdeal : 0;
GeneralJoystick.AtualizaAnguloMedidorEspessura(Variaveis.frmPrincipal.trkMedidorEspessura.Value);
}
GeneralJoystick.AlternarAnguloMedidorEspessura(carimbar);
break;
}
}

164
OrionTardPro/OrionTardPro/Forms/frmParametros.Designer.cs generated
View File

@ -125,6 +125,7 @@
this.chbCam = new System.Windows.Forms.CheckBox();
this.gpbAtuadores = new System.Windows.Forms.GroupBox();
this.pnlAtuadores = new System.Windows.Forms.Panel();
this.chbMep = new System.Windows.Forms.CheckBox();
this.chbBrc = new System.Windows.Forms.CheckBox();
this.chbTransmissor = new System.Windows.Forms.CheckBox();
this.chbRaque = new System.Windows.Forms.CheckBox();
@ -176,7 +177,14 @@
this.gpbTipoPerfil = new System.Windows.Forms.GroupBox();
this.rdbF4 = new System.Windows.Forms.RadioButton();
this.rdbF3 = new System.Windows.Forms.RadioButton();
this.chbMep = new System.Windows.Forms.CheckBox();
this.nudAnguloCarimboHorizontal = new System.Windows.Forms.NumericUpDown();
this.lblAnguloCarimboHorizontal = new System.Windows.Forms.Label();
this.nudAnguloMedicaoIdeal = new System.Windows.Forms.NumericUpDown();
this.lblAnguloMedicaoIdeal = new System.Windows.Forms.Label();
this.nudAnguloCarimboVertical = new System.Windows.Forms.NumericUpDown();
this.lblAnguloCarimboVertical = new System.Windows.Forms.Label();
this.nudAnguloMedicaoMargemLimite = new System.Windows.Forms.NumericUpDown();
this.lblAnguloMedicaoMargemLimite = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.txtPings)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtResolucao)).BeginInit();
this.gpbParametros.SuspendLayout();
@ -215,6 +223,10 @@
((System.ComponentModel.ISupportInitialize)(this.nudOffsetDesenrolar)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudOffsetEnrolar)).BeginInit();
this.gpbTipoPerfil.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nudAnguloCarimboHorizontal)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudAnguloMedicaoIdeal)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudAnguloCarimboVertical)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudAnguloMedicaoMargemLimite)).BeginInit();
this.SuspendLayout();
//
// lblDescricao
@ -384,6 +396,14 @@
// pnlParametros
//
this.pnlParametros.AutoScroll = true;
this.pnlParametros.Controls.Add(this.nudAnguloMedicaoMargemLimite);
this.pnlParametros.Controls.Add(this.lblAnguloMedicaoMargemLimite);
this.pnlParametros.Controls.Add(this.nudAnguloCarimboVertical);
this.pnlParametros.Controls.Add(this.lblAnguloCarimboVertical);
this.pnlParametros.Controls.Add(this.nudAnguloMedicaoIdeal);
this.pnlParametros.Controls.Add(this.lblAnguloMedicaoIdeal);
this.pnlParametros.Controls.Add(this.nudAnguloCarimboHorizontal);
this.pnlParametros.Controls.Add(this.lblAnguloCarimboHorizontal);
this.pnlParametros.Controls.Add(this.nudCanalReleGeral);
this.pnlParametros.Controls.Add(this.lblCanalReleGeral);
this.pnlParametros.Controls.Add(this.nudEnderecoReleGeral);
@ -520,7 +540,7 @@
this.nudOdometroInspecao.Location = new System.Drawing.Point(235, 417);
this.nudOdometroInspecao.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.nudOdometroInspecao.Maximum = new decimal(new int[] {
99,
99999,
0,
0,
0});
@ -1391,6 +1411,16 @@
this.pnlAtuadores.Size = new System.Drawing.Size(155, 165);
this.pnlAtuadores.TabIndex = 12;
//
// chbMep
//
this.chbMep.AutoSize = true;
this.chbMep.Location = new System.Drawing.Point(8, 170);
this.chbMep.Name = "chbMep";
this.chbMep.Size = new System.Drawing.Size(119, 20);
this.chbMep.TabIndex = 7;
this.chbMep.Text = "Medidor Espess.";
this.chbMep.UseVisualStyleBackColor = true;
//
// chbBrc
//
this.chbBrc.AutoSize = true;
@ -1938,15 +1968,117 @@
this.rdbF3.Text = "<= F3";
this.rdbF3.UseVisualStyleBackColor = true;
//
// chbMep
// nudAnguloCarimboHorizontal
//
this.chbMep.AutoSize = true;
this.chbMep.Location = new System.Drawing.Point(8, 170);
this.chbMep.Name = "chbMep";
this.chbMep.Size = new System.Drawing.Size(119, 20);
this.chbMep.TabIndex = 7;
this.chbMep.Text = "Medidor Espess.";
this.chbMep.UseVisualStyleBackColor = true;
this.nudAnguloCarimboHorizontal.Location = new System.Drawing.Point(235, 510);
this.nudAnguloCarimboHorizontal.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.nudAnguloCarimboHorizontal.Maximum = new decimal(new int[] {
180,
0,
0,
0});
this.nudAnguloCarimboHorizontal.Name = "nudAnguloCarimboHorizontal";
this.nudAnguloCarimboHorizontal.Size = new System.Drawing.Size(60, 23);
this.nudAnguloCarimboHorizontal.TabIndex = 58;
this.nudAnguloCarimboHorizontal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudAnguloCarimboHorizontal.Value = new decimal(new int[] {
67,
0,
0,
0});
//
// lblAnguloCarimboHorizontal
//
this.lblAnguloCarimboHorizontal.AutoSize = true;
this.lblAnguloCarimboHorizontal.Location = new System.Drawing.Point(20, 512);
this.lblAnguloCarimboHorizontal.Name = "lblAnguloCarimboHorizontal";
this.lblAnguloCarimboHorizontal.Size = new System.Drawing.Size(162, 16);
this.lblAnguloCarimboHorizontal.TabIndex = 57;
this.lblAnguloCarimboHorizontal.Text = "Angulo Carimbo Horizontal";
//
// nudAnguloMedicaoIdeal
//
this.nudAnguloMedicaoIdeal.Location = new System.Drawing.Point(235, 572);
this.nudAnguloMedicaoIdeal.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.nudAnguloMedicaoIdeal.Maximum = new decimal(new int[] {
180,
0,
0,
0});
this.nudAnguloMedicaoIdeal.Name = "nudAnguloMedicaoIdeal";
this.nudAnguloMedicaoIdeal.Size = new System.Drawing.Size(60, 23);
this.nudAnguloMedicaoIdeal.TabIndex = 60;
this.nudAnguloMedicaoIdeal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudAnguloMedicaoIdeal.Value = new decimal(new int[] {
132,
0,
0,
0});
//
// lblAnguloMedicaoIdeal
//
this.lblAnguloMedicaoIdeal.AutoSize = true;
this.lblAnguloMedicaoIdeal.Location = new System.Drawing.Point(20, 574);
this.lblAnguloMedicaoIdeal.Name = "lblAnguloMedicaoIdeal";
this.lblAnguloMedicaoIdeal.Size = new System.Drawing.Size(133, 16);
this.lblAnguloMedicaoIdeal.TabIndex = 59;
this.lblAnguloMedicaoIdeal.Text = "Angulo Medição Ideal";
//
// nudAnguloCarimboVertical
//
this.nudAnguloCarimboVertical.Location = new System.Drawing.Point(235, 541);
this.nudAnguloCarimboVertical.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.nudAnguloCarimboVertical.Maximum = new decimal(new int[] {
180,
0,
0,
0});
this.nudAnguloCarimboVertical.Name = "nudAnguloCarimboVertical";
this.nudAnguloCarimboVertical.Size = new System.Drawing.Size(60, 23);
this.nudAnguloCarimboVertical.TabIndex = 62;
this.nudAnguloCarimboVertical.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudAnguloCarimboVertical.Value = new decimal(new int[] {
63,
0,
0,
0});
//
// lblAnguloCarimboVertical
//
this.lblAnguloCarimboVertical.AutoSize = true;
this.lblAnguloCarimboVertical.Location = new System.Drawing.Point(20, 543);
this.lblAnguloCarimboVertical.Name = "lblAnguloCarimboVertical";
this.lblAnguloCarimboVertical.Size = new System.Drawing.Size(145, 16);
this.lblAnguloCarimboVertical.TabIndex = 61;
this.lblAnguloCarimboVertical.Text = "Angulo Carimbo Vertical";
//
// nudAnguloMedicaoMargemLimite
//
this.nudAnguloMedicaoMargemLimite.Location = new System.Drawing.Point(235, 603);
this.nudAnguloMedicaoMargemLimite.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.nudAnguloMedicaoMargemLimite.Maximum = new decimal(new int[] {
180,
0,
0,
0});
this.nudAnguloMedicaoMargemLimite.Name = "nudAnguloMedicaoMargemLimite";
this.nudAnguloMedicaoMargemLimite.Size = new System.Drawing.Size(60, 23);
this.nudAnguloMedicaoMargemLimite.TabIndex = 64;
this.nudAnguloMedicaoMargemLimite.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudAnguloMedicaoMargemLimite.Value = new decimal(new int[] {
20,
0,
0,
0});
//
// lblAnguloMedicaoMargemLimite
//
this.lblAnguloMedicaoMargemLimite.AutoSize = true;
this.lblAnguloMedicaoMargemLimite.Location = new System.Drawing.Point(20, 605);
this.lblAnguloMedicaoMargemLimite.Name = "lblAnguloMedicaoMargemLimite";
this.lblAnguloMedicaoMargemLimite.Size = new System.Drawing.Size(199, 16);
this.lblAnguloMedicaoMargemLimite.TabIndex = 63;
this.lblAnguloMedicaoMargemLimite.Text = "Margem Medição Margem Limite";
//
// frmParametros
//
@ -2023,6 +2155,10 @@
((System.ComponentModel.ISupportInitialize)(this.nudOffsetEnrolar)).EndInit();
this.gpbTipoPerfil.ResumeLayout(false);
this.gpbTipoPerfil.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nudAnguloCarimboHorizontal)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudAnguloMedicaoIdeal)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudAnguloCarimboVertical)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudAnguloMedicaoMargemLimite)).EndInit();
this.ResumeLayout(false);
}
@ -2176,5 +2312,13 @@
public System.Windows.Forms.CheckBox chbBrc;
public System.Windows.Forms.Button btnVerOdometro;
public System.Windows.Forms.CheckBox chbMep;
public System.Windows.Forms.NumericUpDown nudAnguloMedicaoMargemLimite;
private System.Windows.Forms.Label lblAnguloMedicaoMargemLimite;
public System.Windows.Forms.NumericUpDown nudAnguloCarimboVertical;
private System.Windows.Forms.Label lblAnguloCarimboVertical;
public System.Windows.Forms.NumericUpDown nudAnguloMedicaoIdeal;
private System.Windows.Forms.Label lblAnguloMedicaoIdeal;
public System.Windows.Forms.NumericUpDown nudAnguloCarimboHorizontal;
private System.Windows.Forms.Label lblAnguloCarimboHorizontal;
}
}

9
OrionTardPro/OrionTardPro/Forms/frmParametros.cs
View File

@ -44,6 +44,10 @@ namespace OrionTardPro
rdbF4.Checked = Variaveis.PerfilVigente.FirmwareF4;
nudEnderecoReleGeral.Value = Variaveis.PerfilVigente.EnderecoReleGeral;
nudCanalReleGeral.Value = Variaveis.PerfilVigente.CanalReleGeral;
nudAnguloCarimboHorizontal.Value = Variaveis.PerfilVigente.AnguloCarimboHorizontal;
nudAnguloCarimboVertical.Value = Variaveis.PerfilVigente.AnguloCarimboVertical;
nudAnguloMedicaoIdeal.Value = Variaveis.PerfilVigente.AnguloMedicaoIdeal;
nudAnguloMedicaoMargemLimite.Value = Variaveis.PerfilVigente.AnguloMedicaoMargemLimite;
chbGas.Checked = Variaveis.PerfilVigente.Sensor_Ativado_GAS == Estado.Ligado;
chbTmp.Checked = Variaveis.PerfilVigente.Sensor_Ativado_TMP == Estado.Ligado;
@ -163,6 +167,11 @@ namespace OrionTardPro
Variaveis.PerfilVigente.EnderecoReleGeral = Convert.ToByte(nudEnderecoReleGeral.Value);
Variaveis.PerfilVigente.CanalReleGeral = Convert.ToInt32(nudCanalReleGeral.Value);
Variaveis.PerfilVigente.AnguloCarimboHorizontal = Convert.ToInt32(nudAnguloCarimboHorizontal.Value);
Variaveis.PerfilVigente.AnguloCarimboVertical = Convert.ToInt32(nudAnguloCarimboVertical.Value);
Variaveis.PerfilVigente.AnguloMedicaoIdeal = Convert.ToInt32(nudAnguloMedicaoIdeal.Value);
Variaveis.PerfilVigente.AnguloMedicaoMargemLimite = Convert.ToInt32(nudAnguloMedicaoMargemLimite.Value);
Variaveis.SetVariaveisGerais(false);
Variaveis.frmPrincipal.AtualizaDadosIniciais(false);
}

143
OrionTardPro/OrionTardPro/Forms/frmPrincipal.Designer.cs generated
View File

@ -151,7 +151,10 @@
this.gpbMarcadores = new System.Windows.Forms.GroupBox();
this.imgInicio = new System.Windows.Forms.PictureBox();
this.imgAddmarcacao = new System.Windows.Forms.PictureBox();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.tmrTempoAtivo = new System.Windows.Forms.Timer(this.components);
this.tmrVelocidade = new System.Windows.Forms.Timer(this.components);
this.btnMedir = new System.Windows.Forms.Button();
this.lblCarroconexao = new System.Windows.Forms.ToolStripStatusLabel();
this.lblJoystickconexao = new System.Windows.Forms.ToolStripStatusLabel();
this.lblCameraconexao = new System.Windows.Forms.ToolStripStatusLabel();
@ -165,9 +168,7 @@
this.lblPerfil = new System.Windows.Forms.ToolStripStatusLabel();
this.lblDivisor4 = new System.Windows.Forms.ToolStripStatusLabel();
this.lblTempo = new System.Windows.Forms.ToolStripStatusLabel();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.tmrTempoAtivo = new System.Windows.Forms.Timer(this.components);
this.tmrVelocidade = new System.Windows.Forms.Timer(this.components);
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.menuStrip1.SuspendLayout();
this.pnlEsquerdo.SuspendLayout();
this.tabControl1.SuspendLayout();
@ -864,6 +865,7 @@
//
// gpbMedidorEspessura
//
this.gpbMedidorEspessura.Controls.Add(this.btnMedir);
this.gpbMedidorEspessura.Controls.Add(this.lblMepStatus);
this.gpbMedidorEspessura.Controls.Add(this.imgMepContato);
this.gpbMedidorEspessura.Controls.Add(this.btnCarimbar);
@ -872,7 +874,7 @@
this.gpbMedidorEspessura.Controls.Add(this.lblAnguloMedidorEspessura);
this.gpbMedidorEspessura.Location = new System.Drawing.Point(4, 519);
this.gpbMedidorEspessura.Name = "gpbMedidorEspessura";
this.gpbMedidorEspessura.Size = new System.Drawing.Size(178, 146);
this.gpbMedidorEspessura.Size = new System.Drawing.Size(178, 162);
this.gpbMedidorEspessura.TabIndex = 33;
this.gpbMedidorEspessura.TabStop = false;
this.gpbMedidorEspessura.Text = "Medidor de Espessura";
@ -881,7 +883,7 @@
//
this.lblMepStatus.AutoSize = true;
this.lblMepStatus.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblMepStatus.Location = new System.Drawing.Point(92, 88);
this.lblMepStatus.Location = new System.Drawing.Point(7, 104);
this.lblMepStatus.Name = "lblMepStatus";
this.lblMepStatus.Size = new System.Drawing.Size(41, 13);
this.lblMepStatus.TabIndex = 32;
@ -890,7 +892,7 @@
// imgMepContato
//
this.imgMepContato.Image = global::OrionTardPro.Properties.Resources.led_vermelho_off;
this.imgMepContato.Location = new System.Drawing.Point(135, 105);
this.imgMepContato.Location = new System.Drawing.Point(8, 122);
this.imgMepContato.Name = "imgMepContato";
this.imgMepContato.Size = new System.Drawing.Size(34, 34);
this.imgMepContato.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@ -899,9 +901,9 @@
//
// btnCarimbar
//
this.btnCarimbar.Location = new System.Drawing.Point(6, 83);
this.btnCarimbar.Location = new System.Drawing.Point(6, 20);
this.btnCarimbar.Name = "btnCarimbar";
this.btnCarimbar.Size = new System.Drawing.Size(75, 23);
this.btnCarimbar.Size = new System.Drawing.Size(69, 23);
this.btnCarimbar.TabIndex = 4;
this.btnCarimbar.Text = "Carimbar";
this.btnCarimbar.UseVisualStyleBackColor = true;
@ -909,9 +911,9 @@
//
// btnRetornar
//
this.btnRetornar.Location = new System.Drawing.Point(6, 112);
this.btnRetornar.Location = new System.Drawing.Point(6, 78);
this.btnRetornar.Name = "btnRetornar";
this.btnRetornar.Size = new System.Drawing.Size(75, 23);
this.btnRetornar.Size = new System.Drawing.Size(69, 23);
this.btnRetornar.TabIndex = 30;
this.btnRetornar.Text = "Retornar";
this.btnRetornar.UseVisualStyleBackColor = true;
@ -920,12 +922,14 @@
// trkMedidorEspessura
//
this.trkMedidorEspessura.BackColor = System.Drawing.Color.White;
this.trkMedidorEspessura.Location = new System.Drawing.Point(6, 32);
this.trkMedidorEspessura.Location = new System.Drawing.Point(127, 7);
this.trkMedidorEspessura.Maximum = 180;
this.trkMedidorEspessura.Name = "trkMedidorEspessura";
this.trkMedidorEspessura.Size = new System.Drawing.Size(166, 45);
this.trkMedidorEspessura.Orientation = System.Windows.Forms.Orientation.Vertical;
this.trkMedidorEspessura.Size = new System.Drawing.Size(45, 152);
this.trkMedidorEspessura.TabIndex = 29;
this.trkMedidorEspessura.TickFrequency = 10;
this.trkMedidorEspessura.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
this.trkMedidorEspessura.Scroll += new System.EventHandler(this.trkMedidorEspessura_Scroll);
this.trkMedidorEspessura.KeyUp += new System.Windows.Forms.KeyEventHandler(this.trkMedidorEspessura_KeyUp);
this.trkMedidorEspessura.MouseUp += new System.Windows.Forms.MouseEventHandler(this.trkMedidorEspessura_MouseUp);
@ -934,7 +938,7 @@
//
this.lblAnguloMedidorEspessura.AutoSize = true;
this.lblAnguloMedidorEspessura.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblAnguloMedidorEspessura.Location = new System.Drawing.Point(140, 16);
this.lblAnguloMedidorEspessura.Location = new System.Drawing.Point(93, 138);
this.lblAnguloMedidorEspessura.Name = "lblAnguloMedidorEspessura";
this.lblAnguloMedidorEspessura.Size = new System.Drawing.Size(29, 13);
this.lblAnguloMedidorEspessura.TabIndex = 28;
@ -1573,28 +1577,32 @@
this.imgAddmarcacao.TabStop = false;
this.imgAddmarcacao.Click += new System.EventHandler(this.imgAddmarcacao_Click);
//
// statusStrip1
// contextMenuStrip1
//
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.lblCarroconexao,
this.lblJoystickconexao,
this.lblCameraconexao,
this.lblCameraselecionada,
this.lblStatusCamera,
this.lblPipeline1,
this.lblEnvio,
this.pgbEnvio,
this.lblDebugcontrole,
this.lblDivisor3,
this.lblPerfil,
this.lblDivisor4,
this.lblTempo});
this.statusStrip1.Location = new System.Drawing.Point(0, 645);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(1294, 22);
this.statusStrip1.TabIndex = 1;
this.statusStrip1.Text = "statusStrip1";
this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
//
// tmrTempoAtivo
//
this.tmrTempoAtivo.Enabled = true;
this.tmrTempoAtivo.Interval = 1000;
this.tmrTempoAtivo.Tick += new System.EventHandler(this.tmrTempoAtivo_Tick);
//
// tmrVelocidade
//
this.tmrVelocidade.Interval = 10;
this.tmrVelocidade.Tick += new System.EventHandler(this.tmrVelocidade_Tick);
//
// btnMedir
//
this.btnMedir.Location = new System.Drawing.Point(6, 49);
this.btnMedir.Name = "btnMedir";
this.btnMedir.Size = new System.Drawing.Size(69, 23);
this.btnMedir.TabIndex = 33;
this.btnMedir.Text = "Medir";
this.btnMedir.UseVisualStyleBackColor = true;
this.btnMedir.Click += new System.EventHandler(this.btnMedir_Click);
//
// lblCarroconexao
//
@ -1676,22 +1684,28 @@
this.lblTempo.Size = new System.Drawing.Size(280, 17);
this.lblTempo.Text = "Tempo Ativo: 00:00:00 - Tempo Conectado: 00:00:00";
//
// contextMenuStrip1
// statusStrip1
//
this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
//
// tmrTempoAtivo
//
this.tmrTempoAtivo.Enabled = true;
this.tmrTempoAtivo.Interval = 1000;
this.tmrTempoAtivo.Tick += new System.EventHandler(this.tmrTempoAtivo_Tick);
//
// tmrVelocidade
//
this.tmrVelocidade.Interval = 10;
this.tmrVelocidade.Tick += new System.EventHandler(this.tmrVelocidade_Tick);
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.lblCarroconexao,
this.lblJoystickconexao,
this.lblCameraconexao,
this.lblCameraselecionada,
this.lblStatusCamera,
this.lblPipeline1,
this.lblEnvio,
this.pgbEnvio,
this.lblDebugcontrole,
this.lblDivisor3,
this.lblPerfil,
this.lblDivisor4,
this.lblTempo});
this.statusStrip1.Location = new System.Drawing.Point(0, 645);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(1294, 22);
this.statusStrip1.TabIndex = 1;
this.statusStrip1.Text = "statusStrip1";
//
// frmPrincipal
//
@ -1809,10 +1823,6 @@
private System.Windows.Forms.Panel pnlCameraBottom;
private System.Windows.Forms.ToolStripMenuItem serviçoToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem controleToolStripMenuItem;
private System.Windows.Forms.StatusStrip statusStrip1;
public System.Windows.Forms.ToolStripStatusLabel lblCarroconexao;
public System.Windows.Forms.ToolStripStatusLabel lblJoystickconexao;
public System.Windows.Forms.ToolStripStatusLabel lblCameraconexao;
private System.Windows.Forms.PictureBox imgSalvar;
public System.Windows.Forms.PictureBox imgCamera;
public System.Windows.Forms.Label lblLegendaexemplo;
@ -1830,7 +1840,6 @@
private System.Windows.Forms.ToolStripMenuItem verToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem btnGaleria;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
private System.Windows.Forms.ToolStripStatusLabel lblPipeline1;
public System.Windows.Forms.PictureBox imgAnalogico;
private System.Windows.Forms.ToolStripMenuItem btnEmpresa;
private System.Windows.Forms.ToolStripMenuItem btnSobre;
@ -1855,17 +1864,11 @@
public System.Windows.Forms.PictureBox imgBrilhomenos;
public System.Windows.Forms.PictureBox imgBrilhomais;
public System.Windows.Forms.PictureBox imgLigalaser;
private System.Windows.Forms.ToolStripStatusLabel lblEnvio;
public System.Windows.Forms.ToolStripStatusLabel lblDebugcontrole;
public System.Windows.Forms.GroupBox gpbImagem;
private System.Windows.Forms.ToolStripStatusLabel lblDivisor3;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
private System.Windows.Forms.ToolStripMenuItem perfilToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem btnSalvarperfil;
private System.Windows.Forms.ToolStripMenuItem btnCarregarperfil;
public System.Windows.Forms.ToolStripStatusLabel lblPerfil;
private System.Windows.Forms.ToolStripStatusLabel lblDivisor4;
private System.Windows.Forms.ToolStripStatusLabel lblTempo;
private System.Windows.Forms.Timer tmrTempoAtivo;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabSensores;
@ -1876,7 +1879,6 @@
private System.Windows.Forms.PictureBox imgIniciarGravacao;
private System.Windows.Forms.PictureBox imgPararGravacao;
public System.Windows.Forms.GroupBox gpbGravacao;
private System.Windows.Forms.ToolStripStatusLabel lblStatusCamera;
public System.Windows.Forms.Label lblInclinacaoy;
public System.Windows.Forms.Label lblInclinacaox;
public System.Windows.Forms.Label lblTemperaturavalor;
@ -1891,7 +1893,6 @@
public System.Windows.Forms.Label lblOdometroTempo;
private System.Windows.Forms.ToolStripMenuItem teclasDeAtalhoToolStripMenuItem;
private System.Windows.Forms.PictureBox picRoboSuperior;
public System.Windows.Forms.ToolStripProgressBar pgbEnvio;
public System.Windows.Forms.GroupBox gpbControlemotores;
public System.Windows.Forms.PictureBox imgLaser;
public System.Windows.Forms.Timer tmrVelocidade;
@ -1904,7 +1905,6 @@
public System.Windows.Forms.PictureBox imgInicio;
public System.Windows.Forms.Label lblOdometroparcial;
public System.Windows.Forms.Label lblDeslocamentovalor;
public System.Windows.Forms.ToolStripStatusLabel lblCameraselecionada;
public System.Windows.Forms.Label lblCameraAtual;
public CircularProgressBar.CircularProgressBar pgbUmidade;
public System.Windows.Forms.PictureBox imgTermometro;
@ -1936,6 +1936,21 @@
private System.Windows.Forms.Button btnRetornar;
public System.Windows.Forms.Label lblMepStatus;
public System.Windows.Forms.PictureBox imgMepContato;
private System.Windows.Forms.Button btnMedir;
public System.Windows.Forms.ToolStripStatusLabel lblCarroconexao;
public System.Windows.Forms.ToolStripStatusLabel lblJoystickconexao;
public System.Windows.Forms.ToolStripStatusLabel lblCameraconexao;
public System.Windows.Forms.ToolStripStatusLabel lblCameraselecionada;
private System.Windows.Forms.ToolStripStatusLabel lblStatusCamera;
private System.Windows.Forms.ToolStripStatusLabel lblPipeline1;
private System.Windows.Forms.ToolStripStatusLabel lblEnvio;
public System.Windows.Forms.ToolStripProgressBar pgbEnvio;
public System.Windows.Forms.ToolStripStatusLabel lblDebugcontrole;
private System.Windows.Forms.ToolStripStatusLabel lblDivisor3;
public System.Windows.Forms.ToolStripStatusLabel lblPerfil;
private System.Windows.Forms.ToolStripStatusLabel lblDivisor4;
private System.Windows.Forms.ToolStripStatusLabel lblTempo;
private System.Windows.Forms.StatusStrip statusStrip1;
}
}

37
OrionTardPro/OrionTardPro/Forms/frmPrincipal.cs
View File

@ -22,6 +22,7 @@ namespace OrionTardPro
public bool FechandoControle = false;
public System.Drawing.Point P1Odometro;
public System.Drawing.Point P2Odometro;
Timer tmrAtualizacao;
#endregion
@ -69,6 +70,19 @@ namespace OrionTardPro
GeneralJoystick.InstanciaJoystick();
Variaveis.frmCamera.AtualizaListaCameras();
tmrAtualizacao = new Timer();
tmrAtualizacao.Interval = 500;
tmrAtualizacao.Tick += tmrAtualizacao_Tick;
tmrAtualizacao.Start();
}
private void tmrAtualizacao_Tick(object sender, EventArgs e)
{
lblMepStatus.Text =
Variaveis.Carimbando ? "Carimbando" :
Variaveis.Angulo_MedidorEspessuraVertical > 0 ? "Atuado" :
"Parado";
}
private void frmPrincipal_FormClosed(object sender, FormClosedEventArgs e)
@ -81,13 +95,13 @@ namespace OrionTardPro
{
LogsFuncoes.RegistrarLog();
if (MessageBox.Show("Tem certeza que deseja sair?", "Sair", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
if (MessageBox.Show("Tem certeza que deseja sair?", "Sair", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
Environment.Exit(0);
e.Cancel = true;
}
else
{
e.Cancel = true;
try { Environment.Exit(0); } catch { }
}
}
@ -390,6 +404,7 @@ namespace OrionTardPro
{
trkVelocidade.Maximum = Variaveis.PerfilVigente.PotenciaMaxima;
trkVelocidade.Minimum = Variaveis.PerfilVigente.PotenciaMinima;
trkMedidorEspessura.Maximum = Variaveis.PerfilVigente.AnguloMedicaoIdeal + Variaveis.PerfilVigente.AnguloMedicaoMargemLimite;
Variaveis.frmControle.trkRampaaceleracao.Maximum = Variaveis.PerfilVigente.RampaMaxima;
Variaveis.frmControle.trkRampaaceleracao.Minimum = Variaveis.PerfilVigente.RampaMinima;
Variaveis.frmControle.trkPrecisaorampa.Maximum = Variaveis.PerfilVigente.PrecisaoMaxima;
@ -452,9 +467,10 @@ namespace OrionTardPro
pgbUmidade.Value = 0;
AlturaCano = pnlDireito.Height - 50;
this.Text = VariaveisGerais.NomeProjeto + " v" + VariaveisGerais.Versao;
if (Variaveis.Cliente != null)
{
this.Text = VariaveisGerais.NomeProjeto + " v" + VariaveisGerais.Versao + " - " + Variaveis.Cliente.Servico + " (" + Variaveis.Cliente.Nome + ")";
this.Text += " - " + Variaveis.Cliente.Servico + " (" + Variaveis.Cliente.Nome + ")";
DirectoryInfo Path = new DirectoryInfo(Variaveis.Cliente.Path);
Variaveis.IndexFotosIndentificacao = Path.GetFiles().Count(x => x.Extension == Variaveis.ExtIdentificacao);
@ -690,7 +706,10 @@ namespace OrionTardPro
System.Environment.NewLine +
"Capturar Imagem: C" + System.Environment.NewLine +
"Adicionar Marcador: M" + System.Environment.NewLine +
"Iniciar/Parar Odômetro Parcial: O" + System.Environment.NewLine +
"Iniciar/Parar Odômetro Parcial: O" + System.Environment.NewLine +
System.Environment.NewLine +
"Carimbar Medidor de Espessura: Q" + System.Environment.NewLine +
"Avançar/Recuar Medidor de Espessura: E" + System.Environment.NewLine +
"";
MessageBox.Show(Mensagem, "Teclas de Atalho", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
@ -731,9 +750,13 @@ namespace OrionTardPro
GeneralJoystick.AlternarAnguloMedidorEspessura(false);
}
private void btnMedir_Click(object sender, EventArgs e)
{
trkMedidorEspessura.Value = Variaveis.PerfilVigente.AnguloMedicaoIdeal;
GeneralJoystick.AtualizaAnguloMedidorEspessura(Variaveis.PerfilVigente.AnguloMedicaoIdeal);
GeneralJoystick.AlternarAnguloMedidorEspessura(false);
}
}
}

6
OrionTardPro/OrionTardPro/Forms/frmPrincipal.resx
View File

@ -368,9 +368,6 @@
TkSuQmCC
</value>
</data>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>522, 16</value>
</metadata>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>645, 16</value>
</metadata>
@ -380,6 +377,9 @@
<metadata name="tmrVelocidade.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1263, 23</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>522, 16</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>63</value>
</metadata>

77
OrionTardPro/OrionTardPro/FuncoesGlobais.cs
View File

@ -112,55 +112,62 @@ namespace OrionTardPro
public static Image RotacionarImagem(Image img, double rotationAngle, bool redimensionarParaCaber = true)
{
// Calcula as novas dimensões do bitmap com base na rotação
double angleRad = rotationAngle / 180.0 * Math.PI;
double sin = Math.Abs(Math.Sin(angleRad));
double cos = Math.Abs(Math.Cos(angleRad));
int newWidth = (int)(img.Width * cos + img.Height * sin);
int newHeight = (int)(img.Width * sin + img.Height * cos);
Bitmap bmp;
if (redimensionarParaCaber)
try
{
// Cria um novo bitmap com as dimensões calculadas
bmp = new Bitmap(newWidth, newHeight);
}
else
{
// Cria um novo bitmap com as dimensões originais
bmp = new Bitmap(img.Width, img.Height);
}
// Calcula as novas dimensões do bitmap com base na rotação
double angleRad = rotationAngle / 180.0 * Math.PI;
double sin = Math.Abs(Math.Sin(angleRad));
double cos = Math.Abs(Math.Cos(angleRad));
int newWidth = (int)(img.Width * cos + img.Height * sin);
int newHeight = (int)(img.Width * sin + img.Height * cos);
using (Graphics gfx = Graphics.FromImage(bmp))
{
gfx.Clear(Color.Transparent); // Define a cor de fundo como transparente
Bitmap bmp;
if (redimensionarParaCaber)
{
gfx.TranslateTransform(newWidth / 2f, newHeight / 2f); // Move o ponto de rotação para o centro do novo bitmap
// Cria um novo bitmap com as dimensões calculadas
bmp = new Bitmap(newWidth, newHeight);
}
else
{
gfx.TranslateTransform(img.Width / 2f, img.Height / 2f); // Move o ponto de rotação para o centro do bitmap original
// Cria um novo bitmap com as dimensões originais
bmp = new Bitmap(img.Width, img.Height);
}
gfx.RotateTransform((float)rotationAngle); // Aplica a rotação
if (redimensionarParaCaber)
using (Graphics gfx = Graphics.FromImage(bmp))
{
gfx.TranslateTransform(-img.Width / 2f, -img.Height / 2f); // Move a imagem de volta para o centro
}
else
{
gfx.TranslateTransform(-img.Width / 2f, -img.Height / 2f); // Move a imagem de volta para o centro
gfx.Clear(Color.Transparent); // Define a cor de fundo como transparente
if (redimensionarParaCaber)
{
gfx.TranslateTransform(newWidth / 2f, newHeight / 2f); // Move o ponto de rotação para o centro do novo bitmap
}
else
{
gfx.TranslateTransform(img.Width / 2f, img.Height / 2f); // Move o ponto de rotação para o centro do bitmap original
}
gfx.RotateTransform((float)rotationAngle); // Aplica a rotação
if (redimensionarParaCaber)
{
gfx.TranslateTransform(-img.Width / 2f, -img.Height / 2f); // Move a imagem de volta para o centro
}
else
{
gfx.TranslateTransform(-img.Width / 2f, -img.Height / 2f); // Move a imagem de volta para o centro
}
gfx.InterpolationMode = InterpolationMode.HighQualityBicubic;
gfx.DrawImage(img, 0, 0, img.Width, img.Height); // Desenha a imagem original no bitmap
}
gfx.InterpolationMode = InterpolationMode.HighQualityBicubic;
gfx.DrawImage(img, 0, 0, img.Width, img.Height); // Desenha a imagem original no bitmap
return bmp;
}
catch (Exception ex)
{
return null;
}
return bmp;
}
public static double NormalizarAngulo(double angulo)

35
OrionTardPro/OrionTardPro/GeneralJoystick.cs
View File

@ -30,6 +30,8 @@ namespace OrionTardPro
static bool UltimoDireita = false;
static bool UltimoCima = false;
static int PulsosCameraLedMais = 0;
public static void Inicializar()
{
joystickTimer = new System.Windows.Forms.Timer()
@ -427,8 +429,8 @@ namespace OrionTardPro
public static void AtualizaAnguloMedidorEspessura(int Angulo)
{
Variaveis.Angulo_MedidorEspessura = Angulo;
Variaveis.frmPrincipal.lblAnguloMedidorEspessura.Text = Variaveis.Angulo_MedidorEspessura.ToString("000") + "°";
Variaveis.Angulo_MedidorEspessuraVertical = Angulo;
Variaveis.frmPrincipal.lblAnguloMedidorEspessura.Text = Variaveis.Angulo_MedidorEspessuraVertical.ToString("000") + "°";
}
@ -647,6 +649,17 @@ namespace OrionTardPro
}
public static void EnviarPingCamera()
{
if (Variaveis.frmConexao.chbPingCamera.Checked && PulsosCameraLedMais > 0)
{
for (int i = 0; i < PulsosCameraLedMais; i++)
{
AumentarIntensidadeBrilhoLED();
}
}
}
public static void ReduzirIntensidadeBrilhoLED()
{
if (SerialService.Conectado)
@ -654,6 +667,7 @@ namespace OrionTardPro
Variaveis.frmPrincipal.lblDebugcontrole.Text = "Câmera LED -";
if (Variaveis.frmConexao.chbCamera.Checked)
{
PulsosCameraLedMais = 0;
SerialService.ControleCamera(0xbb);
SerialService.ControleCamera(0x66);
}
@ -666,13 +680,15 @@ namespace OrionTardPro
AvisoFuncaoDesconectado();
}
public static void AumentarIntensidadeBrilhoLED()
public static void AumentarIntensidadeBrilhoLED(bool ping = false)
{
if (SerialService.Conectado)
{
Variaveis.frmPrincipal.lblDebugcontrole.Text = "Câmera LED +";
if (Variaveis.frmConexao.chbCamera.Checked)
{
if (!ping)
PulsosCameraLedMais = Math.Min(PulsosCameraLedMais + 1, 5);
SerialService.ControleCamera(0xbb);
SerialService.ControleCamera(0x55);
}
@ -737,6 +753,13 @@ namespace OrionTardPro
public static void AlternarAnguloMedidorEspessura(bool carimbar)
{
if (Variaveis.Carimbando)
{
MessageBox.Show("Processo de carimbo em andamento!", "Aviso", MessageBoxButtons.OK, MessageBoxIcon.Warning);
Variaveis.frmPrincipal.trkMedidorEspessura.Value = 0;
AtualizaAnguloMedidorEspessura(0);
return;
}
if (!SerialService.Conectado)
AvisoFuncaoDesconectado();
else if (Variaveis.PerfilVigente.Atuador_Ativado_MEP == Estado.Desligado)
@ -750,7 +773,7 @@ namespace OrionTardPro
private static void AtualizaProtocoloMedidorEspessura(bool carimbar)
{
Variaveis.Carimbar = carimbar;
Variaveis.frmPrincipal.lblDebugcontrole.Text = "Angulo do Medidor: " + Variaveis.Angulo_MedidorEspessura.ToString("000") + "°";
Variaveis.frmPrincipal.lblDebugcontrole.Text = "Angulo do Medidor: " + Variaveis.Angulo_MedidorEspessuraVertical.ToString("000") + "°";
SerialService.EnviaProtocolo(TipoProtocolo.Carro, TipoAtuador.Mep);
}
@ -805,6 +828,10 @@ namespace OrionTardPro
case Keys.G:
TipoControle = Comando.ReleGeral;
break;
case Keys.Q:
case Keys.E:
TipoControle = Comando.MedidorEspessura;
break;
}
return TipoControle;

11
OrionTardPro/OrionTardPro/Models/LogsModel.cs
View File

@ -6,11 +6,6 @@ using System.Collections.Specialized;
using System.Device.Location;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.Web.UI.WebControls;
using static OrionTardPro.Enuns;
namespace OrionTardPro.Models
@ -27,6 +22,9 @@ namespace OrionTardPro.Models
public class LogModel
{
public DateTime data { get; set; }
public int firmwareVersao { get; set; }
public int robotNs { get; set; }
public string modelo { get; set; }
public string versao { get; set; }
public string cpf { get; set; }
public string usuario { get; set; }
@ -81,6 +79,9 @@ namespace OrionTardPro.Models
LogModel Log = new LogModel()
{
data = DateTime.Now,
firmwareVersao = Variaveis._FirmwareVersion,
robotNs = Variaveis._RobotNS,
modelo = Variaveis._Model.ToString(),
versao = VariaveisGerais.Versao,
servico = Variaveis.Cliente,
camera = Variaveis.frmPrincipal.lblCameraconexao.Text,

7
OrionTardPro/OrionTardPro/Models/PerfilModel.cs
View File

@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static OrionTardPro.Enuns;
namespace OrionTardPro.Models
@ -84,6 +81,10 @@ namespace OrionTardPro.Models
public bool FirmwareF4 { get; set; } = false;
public byte EnderecoReleGeral { get; set; } = 0x00;
public int CanalReleGeral { get; set; } = 1;
public int AnguloCarimboHorizontal { get; set; } = 67;
public int AnguloCarimboVertical { get; set; } = 63;
public int AnguloMedicaoIdeal { get; set; } = 132;
public int AnguloMedicaoMargemLimite { get; set; } = 20;
public List<Alertas> ListaAlertas { get; set; } = new List<Alertas>();

4
OrionTardPro/OrionTardPro/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// É possível especificar todos os valores ou usar como padrão os Números de Build e da Revisão
// utilizando o "*" como mostrado abaixo:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.1.5")]
[assembly: AssemblyFileVersion("1.0.1.5")]
[assembly: AssemblyVersion("1.0.1.8")]
[assembly: AssemblyFileVersion("1.0.1.8")]

1501
OrionTardPro/OrionTardPro/Services/SerialService.cs
View File

File diff suppressed because it is too large Load Diff

22
OrionTardPro/OrionTardPro/Variaveis.cs
View File

@ -106,6 +106,11 @@ namespace OrionTardPro
public static FilterInfoCollection videoDevices;
public static bool EditandoFoto { get; set; } = false;
// Equipamento conectado
public static ModeloEquipamento _Model { get; set; } = ModeloEquipamento.Indefinido;
public static int _FirmwareVersion { get; set; } = 0;
public static int _RobotNS { get; set; } = 0;
// Protocolo do carro
public static string ProtocoloCarro { get; set; }
public static Estado Com_Iluminacao { get; set; } = Estado.Desligado;
@ -119,7 +124,16 @@ namespace OrionTardPro
public static Estado EstadoReleGeral { get; set; } = Estado.Desligado;
public static int Angulo_Braco { get; set; } = 0;
public static bool Carimbar { get; set; } = false;
public static int Angulo_MedidorEspessura { get; set; } = 0;
public static DateTime InicioCarimbo { get; set; }
public static bool Carimbando
{
get
{
return InicioCarimbo.AddMilliseconds(7000) > DateTime.Now;
}
}
public static int Angulo_MedidorEspessuraVertical { get; set; } = 0;
public static int PosicaoCarimbo { get; set; } = 1;
// Protocolo do raque
public static string ProtocoloRaque { get; set; }
@ -288,7 +302,11 @@ namespace OrionTardPro
FirmwareF4 = frmParametros.rdbF4.Checked,
RequisitarDados = frmConexao.chbRequisitarDados.Checked,
EnderecoReleGeral = Convert.ToByte(frmParametros.nudEnderecoReleGeral.Value),
CanalReleGeral = Convert.ToInt32(frmParametros.nudCanalReleGeral.Value)
CanalReleGeral = Convert.ToInt32(frmParametros.nudCanalReleGeral.Value),
AnguloCarimboHorizontal = Convert.ToInt32(frmParametros.nudAnguloCarimboHorizontal.Value),
AnguloCarimboVertical = Convert.ToInt32(frmParametros.nudAnguloCarimboVertical.Value),
AnguloMedicaoIdeal = Convert.ToInt32(frmParametros.nudAnguloMedicaoIdeal.Value),
AnguloMedicaoMargemLimite = Convert.ToInt32(frmParametros.nudAnguloMedicaoMargemLimite.Value),
};
string PerfilJson = JsonConvert.SerializeObject(PerfilVigente);
File.WriteAllText(Diretorio, PerfilJson);