1、合并master与2021.1
This commit is contained in:
xiejunjie
@@ -63,6 +63,9 @@
|
||||
#define IDD_SO7_UTIL_CAMERA 194
|
||||
#define IDD_SO7_TEMPERATURE_SENSOR 195
|
||||
#define IDD_SO7_UTIL_TEMPERATURE_DISPLAY 198
|
||||
#define IDD_SO7_UTIL_Robot_Control 200
|
||||
#define IDD_So7_Util_Keyence9011 201
|
||||
#define IDD_DIALOG_OPERATE_EXTRA_IO 204
|
||||
#define IDC_BUTTON_START_MACHINE 1000
|
||||
#define IDC_BUTTON_START_MACHINE3 1001
|
||||
#define IDC_BUTTON_START_POLL_58 1002
|
||||
@@ -204,6 +207,7 @@
|
||||
#define IDC_RADIO_HEX_ASCII2BIN 1149
|
||||
#define IDC_RADIO_2BIN 1149
|
||||
#define IDC_EDIT_MV_CONFIG_FILE 1150
|
||||
#define IDC_RADIO_BIN2HEX 1150
|
||||
#define IDC_RADIO_DUMP_BINARY 1153
|
||||
#define IDC_BUTTON_GET_MV_CONFIG 1154
|
||||
#define IDC_RADIO_DUMP_PRS 1154
|
||||
@@ -355,6 +359,7 @@
|
||||
#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_C1 1274
|
||||
#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C1 1274
|
||||
#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C0 1274
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_Z0 1274
|
||||
#define IDC_EDIT_FRESHSPEED_X2 1275
|
||||
#define IDC_EDIT_IMAGEDLL_2LASER_TOPZ2 1275
|
||||
#define IDC_EDIT_MANUAL_MACHINE_MSG 1275
|
||||
@@ -394,6 +399,7 @@
|
||||
#define IDC_BUTTON_SAVE_REPETEST 1291
|
||||
#define IDC_EDIT_FRESHSPEED_Z5 1291
|
||||
#define IDC_CHECK_REPETESTY 1292
|
||||
#define IDC_BUTTON_SAVE2 1292
|
||||
#define IDC_CHECK_REPETESTZ 1293
|
||||
#define IDC_CHECK_REPETEST_ABSOLUTE 1294
|
||||
#define IDC_EDIT_MAXSPEED_X1 1298
|
||||
@@ -502,11 +508,13 @@
|
||||
#define IDC_CHECK_LKG5000_CONTINUE_READ2 1394
|
||||
#define IDC_CHECK_SO7_CONTROL_MODE_X 1394
|
||||
#define IDC_CHECK_PLC_TCPIP_SERVER_E__STOP 1394
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_CYCLE 1394
|
||||
#define IDC_BUTTON_MANUAL_HOME 1395
|
||||
#define IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM2 1395
|
||||
#define IDC_CHECK_ 1396
|
||||
#define IDC_CHECK_REPETEST_VOLCOMP 1396
|
||||
#define IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM3 1396
|
||||
#define IDC_CHECK_MSG_LOG_ENABLE 1396
|
||||
#define IDC_BUTTON_CALIBRATE_ENCODER 1397
|
||||
#define IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM4 1397
|
||||
#define IDC_COMBOREPETEST_FROM 1398
|
||||
@@ -639,6 +647,8 @@
|
||||
#define IDC_BUTTON_START_SAMPLE_SCURVE 1519
|
||||
#define IDC_BUTTON_SAVE_PICTURE 1520
|
||||
#define IDC_BUTTON_SV2000E_SAVEFILE 1521
|
||||
#define IDC_BUTTON_SAVE_PICTURE2 1521
|
||||
#define IDC_BUTTON_SET_PARA 1521
|
||||
#define IDC_BTN_CONFIGURE_CALIBRATEV 1522
|
||||
#define IDC_BUTTON_SETUP_SO7CONFIG 1523
|
||||
#define IDC_BUTTON_SCAN_KEYENCE_LK_GLASER 1524
|
||||
@@ -670,6 +680,11 @@
|
||||
#define IDC_BUTTON_SO7_MOTION_SET_CNTS 1542
|
||||
#define IDC_BUTTON_SO7_TEMPERATURE_SENSOR_UPDATE 1542
|
||||
#define IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_CLOSE 1542
|
||||
#define IDC_BUTTON_So7_UTIL_REBOT_CONTROL_DISCONNECT 1542
|
||||
#define IDC_BUTTON_SO7_UTIL_Keyence9011_CLOSE 1542
|
||||
#define IDC_BUTTON_PLC_TCPIP_SERVER_EXPORT 1542
|
||||
#define IDC_BUTTON_PROGRAM_EXPORT 1542
|
||||
#define IDC_BUTTON_SET_IO_0 1542
|
||||
#define IDC_BUTTON_STOP_SAMPLE_SCURVE 1543
|
||||
#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_READOUT2 1543
|
||||
#define IDC_BUTTON_SO7_MOTION_CONFIG_OK2 1543
|
||||
@@ -700,6 +715,7 @@
|
||||
#define IDC_STATIC_SDK3000_PICTURE 1562
|
||||
#define IDC_RADIO_GRAY 1563
|
||||
#define IDC_RADIO_SV2000E_GRAY 1564
|
||||
#define IDC_RADIO_BINARZATION 1564
|
||||
#define IDC_BTN_CONFIGURE_MOVEVIN 1565
|
||||
#define IDC_EDIT_CONFIGURE_MSGOUT 1566
|
||||
#define IDC_EDIT_SO7CONFIG_ZOOMID 1567
|
||||
@@ -886,6 +902,7 @@
|
||||
#define IDD_SO7_VIDEOCARD_MV900 1723
|
||||
#define IDD_SO7_UTIL_PLC_TCPIP 1724
|
||||
#define IDD_SO7_UTIL_PLC_TCPIP_SERVER 1725
|
||||
#define IDD_SO7_VIDEOCARD_MINDVISION 1726
|
||||
#define IDC_RADIO_SPEED_SLOW 1770
|
||||
#define IDC_RADIO_SCALE 1772
|
||||
#define IDC_EDIT_SPEED_X 1773
|
||||
@@ -921,16 +938,27 @@
|
||||
#define IDC_BUTTON_IMAGEDLL_CCSPRIMA_START 1794
|
||||
#define IDC_BUTTON_SO7_TEMPERATURE_SENSOR_EXIT 1794
|
||||
#define IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_OPEN 1794
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_CONNECT 1794
|
||||
#define IDC_BUTTON_SO7_UTIL_Keyence9011_OPEN 1794
|
||||
#define IDC_BUTTON_PLC_TCPIP_SERVER_AUTOTEST 1794
|
||||
#define IDC_BUTTON_PROGRAM_CLEAR_LOG 1794
|
||||
#define IDC_BUTTON_SET_IO_1 1794
|
||||
#define IDC_COMBO_RWDATA_ADDR 1795
|
||||
#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_CONNECT2 1795
|
||||
#define IDC_BUTTON_STIL_LASER_SET_MODE 1795
|
||||
#define IDC_BUTTON_PLC_TCPIP_SERVER_AUTOTEST2 1795
|
||||
#define IDC_EDIT_MOTION_SPEEDY 1796
|
||||
#define IDC_COMBO_OUTPORT_NUMBER 1796
|
||||
#define IDC_BUTTON_PLC_TCPIP_SERVER_AUTOTEST3 1796
|
||||
#define IDC_EDIT4 1797
|
||||
#define IDC_EDIT_MOTION_SPEEDZ 1797
|
||||
#define IDC_EDIT_SO7_EXTRIG_RESULT 1797
|
||||
#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_A2 1797
|
||||
#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A2 1797
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_A0 1797
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_SPEED 1797
|
||||
#define IDC_BUTTON_PLC_TCPIP_SERVER_AUTOTEST4 1797
|
||||
#define IDC_BUTTON_PLC_TCPIP_SERVER_GAUSS_TEST 1797
|
||||
#define IDC_EDIT_MOTION_SPEEDX 1798
|
||||
#define IDC_BUTTON_SCAN_KEYENCE_LK_H_LASER 1799
|
||||
#define IDC_BUTTON_STOP_SCAN_KEYENCE_LK_H_LASER 1800
|
||||
@@ -939,6 +967,7 @@
|
||||
#define IDC_COMBO_SO7_HOMEMODE 1802
|
||||
#define IDC_COMBO_SO7_TEMOERATURE_SENSOR_PORT 1802
|
||||
#define IDC_COMBO_SO7_UTIL_TEMPERATURE_DISPLAY_PORT 1802
|
||||
#define IDC_COMBO_SO7_PROGRAM_CNCLIST 1802
|
||||
#define IDC_EDIT_ZOOM_TIME 1803
|
||||
#define IDC_RADIO_READ_INPUT_PORT 1804
|
||||
#define IDC_RADIO_READ_OUTPUT_PORT 1805
|
||||
@@ -1040,11 +1069,15 @@
|
||||
#define IDC_BUTTON_SO7_TRIGPULSE_READ_PARA 1855
|
||||
#define IDC_BUTTON_SO7_MOTION_GET_SEGMENT_DIS 1855
|
||||
#define IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_END 1855
|
||||
#define IDC_BUTTON_SO7_UTIL_Keyence9011_SAVE 1855
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_SERVON 1855
|
||||
#define IDC_BUTTON4 1856
|
||||
#define IDC_BUTTON_SET_SCALE_COEFFICIENT 1856
|
||||
#define IDC_BUTTON_SO7_MOTION_SET_SEGMENT_DIS 1856
|
||||
#define IDC_BUTTON_SO7_TEMPERATURE_SENSOR_END 1856
|
||||
#define IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_EXIT 1856
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_END 1856
|
||||
#define IDC_BUTTON_SO7_UTIL_Keyence9011_STOP 1856
|
||||
#define IDC_BUTTON_STIL_GET_DATA 1857
|
||||
#define IDC_EDIT_STIL_INTERVAL 1858
|
||||
#define IDC_CHECK_STIL_CONTINUE_GET_DATA 1859
|
||||
@@ -1135,6 +1168,7 @@
|
||||
#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature3 1949
|
||||
#define IDC_EDIT16 1950
|
||||
#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature4 1950
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_N1 1950
|
||||
#define IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_UPDATE 1951
|
||||
#define IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_SAVE 1952
|
||||
#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_A1 1953
|
||||
@@ -1143,10 +1177,66 @@
|
||||
#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B4 1955
|
||||
#define IDC_EDIT5 1956
|
||||
#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C4 1956
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_B0 1956
|
||||
#define IDC_CHECK_PLC_TCPIP_SERVER_MEASURE_TRIG 1957
|
||||
#define IDC_CHECK4 1958
|
||||
#define IDC_CHECK_PLC_TCPIP_SERVER_FIX2 1958
|
||||
#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A4 1959
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_Y0 1960
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_C0 1961
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_M0 1962
|
||||
#define IDC_EDIT8 1963
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_N0 1963
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_X1 1964
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_Y1 1965
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_Z1 1966
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_A1 1967
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_B1 1968
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_C1 1969
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_M1 1970
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_RUN 1971
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_EXIT 1972
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_X0 1973
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_X2 1973
|
||||
#define IDC_COMBO2 1974
|
||||
#define IDC_COMBO_SO7_UTIL_Keyence9011_BAUD 1974
|
||||
#define IDC_BUTTON_SO7_UTIL_Keyence9011_RECV 1975
|
||||
#define IDC_BUTTON_SO7_UTIL_Keyence9011_EXIT 1976
|
||||
#define IDC_CHECK_SO7_UTIL_Keyence9011_CYCLE 1977
|
||||
#define IDC_EDIT_SO7_UTIL_Keyence9011_TIMER 1978
|
||||
#define IDC_COMBO_SO7_UTIL_Keyence9011_PORT 1979
|
||||
#define IDC_EDIT_SO7_UTIL_Keyence9011_RECVDATA 1980
|
||||
#define IDC_RADIO_SO7_keyence9011 1981
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_PRO_SELECT 1983
|
||||
#define IDC_EDIT_SO7_REBOT_CONTROL_POSITION_PROGRAM 1984
|
||||
#define IDC_RADIO_SO7_ROBOT 1988
|
||||
#define IDC_BUTTON3 1989
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_SAVEPROG 1989
|
||||
#define IDC_BUTTON_PLC_TCPIP_SERVER_IMPORT 1989
|
||||
#define IDC_BUTTON_SO7_PROGRAM_MOVETO_POINT 1989
|
||||
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_SERVOFF 1990
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_SETSPEED 1991
|
||||
#define IDC_EDIT2 1992
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_WRITEPROGVALUE 1992
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_WRITEPROG 1994
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_WRITEPROGNAME 1994
|
||||
#define IDC_BUTTON_ReadPosition 1995
|
||||
#define IDC_BUTTON_So7_UTIL_ROBOT_CONTORL_WRITEPROGNUMBER 1996
|
||||
#define IDC_EDIT_SO7_PROGRAM_DEADBAND 1997
|
||||
#define IDC_RADIO_PROJECT_58354 1999
|
||||
#define IDC_RADIO_PROJECT_583584 1999
|
||||
#define IDC_RADIO_PROJECT_598603 2000
|
||||
#define IDC_RADIO_CONTROL_EF1A 2001
|
||||
#define IDC_STATIC_SELECT_IO 2003
|
||||
#define IDC_STATIC_IO_OPRATION 2004
|
||||
#define IDC_BUTTON_READ_IO 2006
|
||||
#define IDC_STATIC_IO_STAURT 2007
|
||||
#define IDC_EDIT_IO_NUMBER 2008
|
||||
#define IDC_MFCBUTTON1 2009
|
||||
#define IDC_MFCBUTTON_IO_STAURT 2020
|
||||
#define IDC_BUTTON_IO_TEST 2030
|
||||
#define IDC_BUTTON_SET_MOTION_TYPE 2031
|
||||
#define IDC_BUTTON_DIY_EXIT_BUTTON 32740
|
||||
#define ID_EDIT_SO7_CONFIG_MOTION 32741
|
||||
|
||||
@@ -1154,9 +1244,9 @@
|
||||
//
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
#ifndef APSTUDIO_READONLY_SYMBOLS
|
||||
#define _APS_NEXT_RESOURCE_VALUE 200
|
||||
#define _APS_NEXT_RESOURCE_VALUE 206
|
||||
#define _APS_NEXT_COMMAND_VALUE 32771
|
||||
#define _APS_NEXT_CONTROL_VALUE 1960
|
||||
#define _APS_NEXT_CONTROL_VALUE 2010
|
||||
#define _APS_NEXT_SYMED_VALUE 104
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user