1、合并master与2021.1
This commit is contained in:
xiejunjie
File diff suppressed because it is too large
Load Diff
@@ -1,127 +0,0 @@
|
||||
[HARDWARE]
|
||||
MOVETOSPEED_FAST_X=0.00000000
|
||||
MOVETOSPEED_SLOW_X=0.00000000
|
||||
MOVETOSPEED_SCALE_X=1.00000000
|
||||
;
|
||||
MOVETOSPEED_FAST_Y=0.00000000
|
||||
MOVETOSPEED_SLOW_Y=0.00000000
|
||||
MOVETOSPEED_SCALE_Y=1.00000000
|
||||
;
|
||||
MOVETOSPEED_FAST_Z=0.00000000
|
||||
MOVETOSPEED_SLOW_Z=0.00000000
|
||||
MOVETOSPEED_SCALE_Z=1.00000000
|
||||
;
|
||||
SPEED_BASE_X1=28
|
||||
SPEED_MAX_X1=30
|
||||
SPEED_START_X1=20
|
||||
SPEED_FRESH_X1=8
|
||||
SPEED_SLOW_X1=3.000
|
||||
;
|
||||
SPEED_BASE_X2=16
|
||||
SPEED_MAX_X2=10
|
||||
SPEED_START_X2=12
|
||||
SPEED_FRESH_X2=10
|
||||
SPEED_SLOW_X2=2.000
|
||||
;
|
||||
SPEED_BASE_X3=2
|
||||
SPEED_MAX_X3=0
|
||||
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=10
|
||||
SPEED_SLOW_X4=0.009
|
||||
;
|
||||
SPEED_BASE_X5=2
|
||||
SPEED_MAX_X5=0
|
||||
SPEED_START_X5=50
|
||||
SPEED_FRESH_X5=10
|
||||
SPEED_SLOW_X5=0.100
|
||||
;
|
||||
SPEED_BASE_Y1=20
|
||||
SPEED_MAX_Y1=10
|
||||
SPEED_START_Y1=20
|
||||
SPEED_FRESH_Y1=8
|
||||
SPEED_SLOW_Y1=2.000
|
||||
;
|
||||
SPEED_BASE_Y2=16
|
||||
SPEED_MAX_Y2=10
|
||||
SPEED_START_Y2=12
|
||||
SPEED_FRESH_Y2=10
|
||||
SPEED_SLOW_Y2=1.000
|
||||
;
|
||||
SPEED_BASE_Y3=2
|
||||
SPEED_MAX_Y3=0
|
||||
SPEED_START_Y3=8
|
||||
SPEED_FRESH_Y3=10
|
||||
SPEED_SLOW_Y3=0.050
|
||||
;
|
||||
SPEED_BASE_Y4=0
|
||||
SPEED_MAX_Y4=0
|
||||
SPEED_START_Y4=10
|
||||
SPEED_FRESH_Y4=10
|
||||
SPEED_SLOW_Y4=0.009
|
||||
;
|
||||
SPEED_BASE_Y5=1
|
||||
SPEED_MAX_Y5=0
|
||||
SPEED_START_Y5=50
|
||||
SPEED_FRESH_Y5=10
|
||||
SPEED_SLOW_Y5=0.100
|
||||
;
|
||||
SPEED_BASE_Z1=20
|
||||
SPEED_MAX_Z1=100
|
||||
SPEED_START_Z1=150
|
||||
SPEED_FRESH_Z1=8
|
||||
SPEED_SLOW_Z1=2.500
|
||||
;
|
||||
SPEED_BASE_Z2=16
|
||||
SPEED_MAX_Z2=10
|
||||
SPEED_START_Z2=100
|
||||
SPEED_FRESH_Z2=10
|
||||
SPEED_SLOW_Z2=1.500
|
||||
;
|
||||
SPEED_BASE_Z3=3
|
||||
SPEED_MAX_Z3=5
|
||||
SPEED_START_Z3=5
|
||||
SPEED_FRESH_Z3=10
|
||||
SPEED_SLOW_Z3=0.100
|
||||
;
|
||||
SPEED_BASE_Z4=0
|
||||
SPEED_MAX_Z4=0
|
||||
SPEED_START_Z4=18
|
||||
SPEED_FRESH_Z4=10
|
||||
SPEED_SLOW_Z4=0.009
|
||||
;
|
||||
SPEED_BASE_Z5=5
|
||||
SPEED_MAX_Z5=6
|
||||
SPEED_START_Z5=133
|
||||
SPEED_FRESH_Z5=10
|
||||
SPEED_SLOW_Z5=0.100
|
||||
;
|
||||
X_MOTOR_PRECISION=0.004
|
||||
Y_MOTOR_PRECISION=0.008
|
||||
Z_MOTOR_PRECISION=0.004
|
||||
;
|
||||
X_MOTOR_WHEELBASE=1.500
|
||||
Y_MOTOR_WHEELBASE=1.500
|
||||
Z_MOTOR_WHEELBASE=1.500
|
||||
;
|
||||
MOTOR_PULSE_NUM=10000
|
||||
;
|
||||
[WORKTABLE]
|
||||
X_SCALE_RESOLUTION=0.500
|
||||
Y_SCALE_RESOLUTION=0.500
|
||||
Z_SCALE_RESOLUTION=0.500
|
||||
;
|
||||
X_NEG_WORKING_LIMIT=0.000
|
||||
Y_NEG_WORKING_LIMIT=0.000
|
||||
Z_NEG_WORKING_LIMIT=0.000
|
||||
;
|
||||
X_POS_WORKING_LIMIT=200.000
|
||||
Y_POS_WORKING_LIMIT=100.000
|
||||
Z_POS_WORKING_LIMIT=200.000
|
||||
ROTARY_CIR_DIS=100.000
|
||||
;
|
||||
@@ -1,74 +0,0 @@
|
||||
[HARDWARE]
|
||||
SPEED_X1=10000
|
||||
ACCELERATION_X1=50
|
||||
DECELERATION_X1=50
|
||||
;
|
||||
SPEED_X2=100000
|
||||
ACCELERATION_X2=100
|
||||
DECELERATION_X2=100
|
||||
;
|
||||
SPEED_X3=500000
|
||||
ACCELERATION_X3=200
|
||||
DECELERATION_X3=200
|
||||
;
|
||||
SPEED_X4=1000000
|
||||
ACCELERATION_X4=300
|
||||
DECELERATION_X4=300
|
||||
;
|
||||
SPEED_X5=0
|
||||
ACCELERATION_X5=0
|
||||
DECELERATION_X5=0
|
||||
;
|
||||
SPEED_Y1=10000
|
||||
ACCELERATION_Y1=50
|
||||
DECELERATION_Y1=50
|
||||
;
|
||||
SPEED_Y2=100000
|
||||
ACCELERATION_Y2=100
|
||||
DECELERATION_Y2=100
|
||||
;
|
||||
SPEED_Y3=500000
|
||||
ACCELERATION_Y3=200
|
||||
DECELERATION_Y3=200
|
||||
;
|
||||
SPEED_Y4=1000000
|
||||
ACCELERATION_Y4=300
|
||||
DECELERATION_Y4=300
|
||||
;
|
||||
SPEED_Y5=0
|
||||
ACCELERATION_Y5=0
|
||||
DECELERATION_Y5=0
|
||||
;
|
||||
SPEED_Z1=10000
|
||||
ACCELERATION_Z1=50
|
||||
DECELERATION_Z1=50
|
||||
;
|
||||
SPEED_Z2=100000
|
||||
ACCELERATION_Z2=100
|
||||
DECELERATION_Z2=100
|
||||
;
|
||||
SPEED_Z3=500000
|
||||
ACCELERATION_Z3=200
|
||||
DECELERATION_Z3=200
|
||||
;
|
||||
SPEED_Z4=1000000
|
||||
ACCELERATION_Z4=300
|
||||
DECELERATION_Z4=300
|
||||
;
|
||||
SPEED_Z5=0
|
||||
ACCELERATION_Z5=0
|
||||
DECELERATION_Z5=0
|
||||
;
|
||||
[WORKTABLE]
|
||||
X_SCALE_RESOLUTION=0.400
|
||||
Y_SCALE_RESOLUTION=0.400
|
||||
Z_SCALE_RESOLUTION=0.400
|
||||
;
|
||||
X_NEG_WORKING_LIMIT=0.000
|
||||
Y_NEG_WORKING_LIMIT=0.000
|
||||
Z_NEG_WORKING_LIMIT=0.000
|
||||
;
|
||||
X_POS_WORKING_LIMIT=200.000
|
||||
Y_POS_WORKING_LIMIT=200.000
|
||||
Z_POS_WORKING_LIMIT=200.000
|
||||
;
|
||||
@@ -1,45 +0,0 @@
|
||||
[7OCEANAUTOZOOM]
|
||||
ZOOM_PRODUCT_ID=So7123456
|
||||
ZOOM_COM_PORT=1
|
||||
ZOOM_START_DEG=89.9955
|
||||
ZOOM_END_DEG=89.9955
|
||||
ZOOM_ORG_DEG=360
|
||||
ZOOM_DEADBAND_DEG=0.100000
|
||||
ZOOM_PULSE_PER_DEG=25.134736064968621
|
||||
ZOOM_READING_INTERVAL_TIME=60
|
||||
ZOOM_MOTOR_SPEED_FAST=2000
|
||||
ZOOM_MOTOR_SPEED_SLOW=800
|
||||
;
|
||||
[CONTROLLER]
|
||||
CLOSE_LOOP_ENABLED=0
|
||||
MOTION_RETRY_TIMES=5
|
||||
SHIFT_POSITION_X=0.000000
|
||||
SHIFT_POSITION_Y=0.000000
|
||||
SHIFT_POSITION_Z=0.000000
|
||||
GET_USB_MESSAGE_METHOD=1
|
||||
WRITE_DATA_SLEEP_TIME=5
|
||||
ACCURA_ERROR_PULSE_X=1
|
||||
ACCURA_ERROR_PULSE_Y=1
|
||||
ACCURA_ERROR_PULSE_Z=1
|
||||
EQUIDISTANCE_PULSE_X=0
|
||||
EQUIDISTANCE_PULSE_Y=0
|
||||
EQUIDISTANCE_PULSE_Z=0
|
||||
CNC_DEADLOCK_SOLUTION=1
|
||||
CNC_DEADLOCK_MAX_CNTS=6
|
||||
TOUCH_PROBE_ENABLE=0
|
||||
FOOT_SWITCH_ENABLE=0
|
||||
JOYSTICK_ENABLE=0
|
||||
CCS_PRIMA_ENABLE=0
|
||||
DEBUG_LOG_ENABLE=0
|
||||
;
|
||||
[VIDEOCARD]
|
||||
SDK3000_SLEEP_COUNT=555555
|
||||
SV4000E_DENOISE_PARA_CHANNEL1=70
|
||||
SV4000E_DENOISE_PARA_CHANNEL2=70
|
||||
SV4000E_DENOISE_PARA_CHANNEL3=70
|
||||
SV4000E_DENOISE_PARA_CHANNEL4=70
|
||||
;
|
||||
[HSI]
|
||||
MACHINE_CONTROLLER_TYPE=0
|
||||
MACHINE_VIDEOCARD_TYPE=0
|
||||
;
|
||||
Reference in New Issue
Block a user