完善设置值的同步。

2014-05-28 15:44:42 +08:00
parent 92299ad02a
commit ec719c48bb
7 changed files with 69 additions and 41 deletions
@@ -4578,3 +4578,10 @@ Usb Port Initialized.

 _start_machine
 Construct Cso7_Proto.
+
+Init:Open device succeed .
+
+_start_machine
+Construct Cso7_Proto.
+
+Init:Open device succeed .
@@ -25,21 +25,21 @@ SPEED_SLOW_X2=2.000
 ;
 SPEED_BASE_X3=2
 SPEED_MAX_X3=0
-SPEED_START_X3=0
-SPEED_FRESH_X3=100
-SPEED_SLOW_X3=0.001
+SPEED_START_X3=8
+SPEED_FRESH_X3=10
+SPEED_SLOW_X3=0.050
 ;
 SPEED_BASE_X4=2
 SPEED_MAX_X4=0
 SPEED_START_X4=5
-SPEED_FRESH_X4=100
-SPEED_SLOW_X4=0.001
+SPEED_FRESH_X4=10
+SPEED_SLOW_X4=0.010
 ;
 SPEED_BASE_X5=2
 SPEED_MAX_X5=0
 SPEED_START_X5=50
-SPEED_FRESH_X5=100
-SPEED_SLOW_X5=0.000
+SPEED_FRESH_X5=10
+SPEED_SLOW_X5=0.100
 ;
 SPEED_BASE_Y1=20
 SPEED_MAX_Y1=10
@@ -55,21 +55,21 @@ SPEED_SLOW_Y2=1.000
 ;
 SPEED_BASE_Y3=2
 SPEED_MAX_Y3=0
-SPEED_START_Y3=0
-SPEED_FRESH_Y3=100
-SPEED_SLOW_Y3=0.001
+SPEED_START_Y3=8
+SPEED_FRESH_Y3=10
+SPEED_SLOW_Y3=0.050
 ;
-SPEED_BASE_Y4=2
+SPEED_BASE_Y4=0
 SPEED_MAX_Y4=0
 SPEED_START_Y4=10
-SPEED_FRESH_Y4=100
-SPEED_SLOW_Y4=0.001
+SPEED_FRESH_Y4=10
+SPEED_SLOW_Y4=0.010
 ;
-SPEED_BASE_Y5=2
+SPEED_BASE_Y5=1
 SPEED_MAX_Y5=0
 SPEED_START_Y5=50
-SPEED_FRESH_Y5=100
-SPEED_SLOW_Y5=0.000
+SPEED_FRESH_Y5=10
+SPEED_SLOW_Y5=0.100
 ;
 SPEED_BASE_Z1=20
 SPEED_MAX_Z1=100
@@ -86,28 +86,28 @@ SPEED_SLOW_Z2=1.500
 SPEED_BASE_Z3=3
 SPEED_MAX_Z3=5
 SPEED_START_Z3=5
-SPEED_FRESH_Z3=100
-SPEED_SLOW_Z3=0.001
+SPEED_FRESH_Z3=10
+SPEED_SLOW_Z3=0.100
 ;
-SPEED_BASE_Z4=2
+SPEED_BASE_Z4=0
 SPEED_MAX_Z4=0
 SPEED_START_Z4=18
-SPEED_FRESH_Z4=100
-SPEED_SLOW_Z4=0.001
+SPEED_FRESH_Z4=10
+SPEED_SLOW_Z4=0.010
 ;
-SPEED_BASE_Z5=2
+SPEED_BASE_Z5=5
 SPEED_MAX_Z5=6
 SPEED_START_Z5=133
-SPEED_FRESH_Z5=100
-SPEED_SLOW_Z5=0.000
+SPEED_FRESH_Z5=10
+SPEED_SLOW_Z5=0.100
 ;
-X_MOTOR_PRECISION=0.008
-Y_MOTOR_PRECISION=0.004
+X_MOTOR_PRECISION=0.004
+Y_MOTOR_PRECISION=0.009
 Z_MOTOR_PRECISION=0.004
 ;
-X_MOTOR_WHEELBASE=0.000
-Y_MOTOR_WHEELBASE=0.000
-Z_MOTOR_WHEELBASE=0.000
+X_MOTOR_WHEELBASE=1.500
+Y_MOTOR_WHEELBASE=1.500
+Z_MOTOR_WHEELBASE=1.500
 ;
 MOTOR_PULSE_NUM=10000
 ;
@@ -116,12 +116,12 @@ X_SCALE_RESOLUTION=0.500
 Y_SCALE_RESOLUTION=0.500
 Z_SCALE_RESOLUTION=0.500
 ;
-X_NEG_WORKING_LIMIT=-16.000
-Y_NEG_WORKING_LIMIT=-40.000
+X_NEG_WORKING_LIMIT=0.000
+Y_NEG_WORKING_LIMIT=0.000
 Z_NEG_WORKING_LIMIT=0.000
 ;
-X_POS_WORKING_LIMIT=100.000
-Y_POS_WORKING_LIMIT=8.000
+X_POS_WORKING_LIMIT=200.000
+Y_POS_WORKING_LIMIT=100.000
 Z_POS_WORKING_LIMIT=200.000
 ROTARY_CIR_DIS=100.000
 ;
@@ -46,12 +46,12 @@ MACHINE_VIDEOCARD_TYPE=0
 X_SCALE_RESOLUTION=0.500000
 Y_SCALE_RESOLUTION=0.500000
 Z_SCALE_RESOLUTION=0.500000
-X_NEG_WORKING_LIMIT=-16.000000
-X_POS_WORKING_LIMIT=100.000000
-Y_NEG_WORKING_LIMIT=-40.000000
-Y_POS_WORKING_LIMIT=8.000000
+X_NEG_WORKING_LIMIT=0.000000
+X_POS_WORKING_LIMIT=200.000000
+Y_NEG_WORKING_LIMIT=0.000000
+Y_POS_WORKING_LIMIT=100.000000
 Z_NEG_WORKING_LIMIT=0.000000
 Z_POS_WORKING_LIMIT=200.000000
 ROTARY_AXIS_NUMBER=0
-ROTARY_CIR_DIS=0.000000
+ROTARY_CIR_DIS=7.200000
 ;
@@ -350,7 +350,9 @@ void CSO7_UtilDlg::UpdateCtrlsStatus(bool _bEnable)
  GetDlgItem(IDC_CHECK_SO7_SPARE_LIGHT_ON)->EnableWindow(_bEnable);
  
  GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_STOP)->EnableWindow(_bEnable);
-  GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_START)->EnableWindow(_bEnable);  
+  GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_START)->EnableWindow(_bEnable); 
+  GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_WRITE_PARA)->EnableWindow(_bEnable); 
+  GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_READ_PARA)->EnableWindow(_bEnable);  
  GetDlgItem(IDC_EDIT_SET_SEQ_NO)->EnableWindow(_bEnable);
  GetDlgItem(IDC_BUTTON_SO7_GET_SEQ_NUMBER)->EnableWindow(_bEnable);
  GetDlgItem(IDC_BUTTON_SO7_SET_SEQ_NUMBER)->EnableWindow(_bEnable);
@@ -435,6 +437,12 @@ void CSO7_UtilDlg::OnBnClickedButtonStartSo7machine()
  SetTimer(1, m_ReadAxisIntervalTime, 0);
  m_OutMessage.Format(_T("%d"),m_ReadAxisIntervalTime);
  GetDlgItem(IDC_EDIT_UPDATE_FREQ)->SetWindowText(m_OutMessage);
+
+  m_cs_XScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution));
+  m_cs_YScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution));
+  m_cs_ZScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution));
+
+  UpdateData(FALSE);
 }

 //=====================================================================
@@ -969,6 +977,11 @@ void CSO7_UtilDlg::OnBnClickedButtonSetupSo7config()
    delete m_pSO7_AutoZoom;
    m_pSO7_AutoZoom=NULL;
  } 
+
+  m_cs_XScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution));
+  m_cs_YScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution));
+  m_cs_ZScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution));
+  UpdateData(FALSE);
  SetTimer(1,m_ReadAxisIntervalTime,NULL);
 }

@@ -50,8 +50,8 @@ BOOL CSetSo7MotionConfig::OnInitDialog()

  m_ConfigList.InsertColumn(0,_T("±àºÅ"),LVCFMT_LEFT, m_rect.right*2/40);  
  m_ConfigList.InsertColumn(1,_T("²ÎÊýÃû"),LVCFMT_LEFT, m_rect.right*12/40);  
-  m_ConfigList.InsertColumn(2,_T("Öµ"),LVCFMT_LEFT, m_rect.right*3/40);  
-  m_ConfigList.InsertColumn(3,_T("ÃèÊö"),LVCFMT_LEFT, m_rect.right*22/40);  
+  m_ConfigList.InsertColumn(2,_T("Öµ"),LVCFMT_LEFT, m_rect.right*4/40);  
+  m_ConfigList.InsertColumn(3,_T("ÃèÊö"),LVCFMT_LEFT, m_rect.right*21/40);  

  for (int i = 1; i < 100; i++)
  {
@@ -485,6 +485,14 @@ void CSetSo7MotionConfig::SaveDataValue()
  cTemp=T2A(cStr);
  m_pSO7_Proto->g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[3]=atoi(cTemp);
  iRow++;
+  cStr=m_ConfigList.GetItemText(iRow,iCol);
+  cTemp=T2A(cStr);
+  m_pSO7_Proto->g_machine.s_machine_config.motion.m_MachineType=atoi(cTemp);
+  iRow++;
+  cStr=m_ConfigList.GetItemText(iRow,iCol);
+  cTemp=T2A(cStr);
+  m_pSO7_Proto->g_machine.s_machine_config.motion.m_VideoCardType=atoi(cTemp);
+  iRow++;


  cStr=m_ConfigList.GetItemText(iRow,iCol);