diff --git a/Doc/사양서/PLC/(배포용)Counter Spec for LGES_OC 1공장_OC2_원형_6Line_Assy-Washing_01_ACW_PRI_Ver3.1.7_20260402_문기동 (1).xlsx b/Doc/사양서/PLC/(배포용)Counter Spec for LGES_OC 1공장_OC2_원형_6Line_Assy-Washing_01_ACW_PRI_Ver3.1.7_20260402_문기동 (1).xlsx new file mode 100644 index 0000000..50abbfd Binary files /dev/null and b/Doc/사양서/PLC/(배포용)Counter Spec for LGES_OC 1공장_OC2_원형_6Line_Assy-Washing_01_ACW_PRI_Ver3.1.7_20260402_문기동 (1).xlsx differ diff --git a/Doc/사양서/PLC/(배포용)Counter Spec for LGES_OC 1공장_OC2_원형_6Line_Assy-Washing_02_CCW_PRI_Ver3.1.7_20260402_문기동 (1).xlsx b/Doc/사양서/PLC/(배포용)Counter Spec for LGES_OC 1공장_OC2_원형_6Line_Assy-Washing_02_CCW_PRI_Ver3.1.7_20260402_문기동 (1).xlsx new file mode 100644 index 0000000..95539a4 Binary files /dev/null and b/Doc/사양서/PLC/(배포용)Counter Spec for LGES_OC 1공장_OC2_원형_6Line_Assy-Washing_02_CCW_PRI_Ver3.1.7_20260402_문기동 (1).xlsx differ diff --git a/Machines/ILSOS_CCW_H52A/Device/PLC/PLCController.Address.cs b/Machines/ILSOS_CCW_H52A/Device/PLC/PLCController.Address.cs index b25e684..29fae70 100644 --- a/Machines/ILSOS_CCW_H52A/Device/PLC/PLCController.Address.cs +++ b/Machines/ILSOS_CCW_H52A/Device/PLC/PLCController.Address.cs @@ -176,8 +176,6 @@ namespace ILSOS_CCW_H52A.Device PC_WELD_COMPLETE_14, //지그 14번 용접완료 여부 PC_WELD_COMPLETE_15, //지그 15번 용접완료 여부 PC_WELD_COMPLETE_16 //지그 16번 용접완료 여부 - - } public enum eWordInput : int @@ -189,95 +187,154 @@ namespace ILSOS_CCW_H52A.Device PLC_CURRENT_POS_1, // 현재 Rotary 절대엔코더값 1 PLC_CURRENT_POS_2, // 현재 Rotary 절대엔코더값 2 PLC_NUM_OF_REVOLUTIONS, // 현재 Rotary 회전수 - //PLC_SCANNER_Z_AXIS_1 = 0x08, // 현재 Scanner Z축 위치 1 - //PLC_SCANNER_Z_AXIS_2, // 현재 Scanner Z축 위치 2 - - //// WON : 2170 RMS 대비 enum 추가 추후 해당 주소 영역 확인 후 주소 매핑 필요 - //PLC_WELDING_RECIPE_NO = 48, // 설정할 PLC Recipe 번호 - //PLC_WELDING_LASER_POWER = 50, - //PLC_WELDING_DRAW_SPEED = 52, - //PLC_WELDING_JUMP_SPEED = 54, - //PLC_SCANNER_X_AXIS = 56, // 현재 Scanner X축 위치 - //PLC_WELDING_FOCAL_LENGTH = 58, // 현재 Scanner Z축 위치 - //PLC_WELDING_LASER_ON_DELAY = 60, - //PLC_WELDING_LASER_OFF_DELAY = 62, - //PLC_WELDING_JUMP_DELAY = 64, - //PLC_WELDING_MARK_DELAY = 66, - //PLC_WELDING_POLYGON_DELAY = 68, - //PLC_WELDING_RAMPING_START_A_POWER_1 = 70, - //PLC_WELDING_RAMPING_START_A_POWER_2 = 72, - //PLC_WELDING_RAMPING_START_A_DISTANCE = 74, - //PLC_WELDING_RAMPING_START_B_POWER_1 = 76, - //PLC_WELDING_RAMPING_START_B_POWER_2 = 78, - //PLC_WELDING_RAMPING_START_B_DISTANCE = 80, - //PLC_WELDING_RAMPING_END_POWER_1 = 82, - //PLC_WELDING_RAMPING_END_POWER_2 = 84, - //PLC_WELDING_RAMPING_END_DISTANCE = 86, - //PLC_EQUIPMENT_SPEED = 88, - - - - //// WON : 2170 RMS 대비 enum 추가 추후 해당 주소 영역 확인 후 주소 매핑 필요, 하기 영역은 2word 로 구성되어야 할 것으로 보이므로 매핑 간격을 2word로 - // List에 제외 되어 있음 - 확인 필요 (CMY - 26.01.09) - //PLC_WELDING_LASER_OFF_DELAY = 62, - //PLC_WELDING_MARK_DELAY = 66, - //PLC_WELDING_POLYGON_DELAY = 66, - // RMS 최종 버전 - PLC_WELDING_RECIPE_NO = 48, // 설정할 PLC Recipe 번호 - PLC_SCANNER_X_AXIS = 50, // 현재 Scanner X축 위치 - PLC_WELDING_FOCAL_LENGTH = 52, // 현재 Scanner Z축 위치 - PLC_EQUIPMENT_SPEED = 54, + PLC_WELDING_RECIPE_NO = 48, + PLC_WELDING_RECIPE_NO_2WORD, - PLC_PARAM_1_WELDING_LASER_POWER = 56, - PLC_PARAM_1_WELDING_DRAW_SPEED = 58, - PLC_PARAM_1_WELDING_JUMP_SPEED = 60, - PLC_PARAM_1_WELDING_LASER_ON_DELAY = 62, - PLC_PARAM_1_WELDING_JUMP_DELAY = 64, - PLC_PARAM_1_WELDING_RAMPING_START_A_POWER_1 = 66, - PLC_PARAM_1_WELDING_RAMPING_START_A_POWER_2 = 68, - PLC_PARAM_1_WELDING_RAMPING_START_A_DISTANCE = 70, - PLC_PARAM_1_WELDING_RAMPING_START_B_POWER_1 = 72, - PLC_PARAM_1_WELDING_RAMPING_START_B_POWER_2 = 74, - PLC_PARAM_1_WELDING_RAMPING_START_B_DISTANCE = 76, - PLC_PARAM_1_WELDING_RAMPING_END_POWER_1 = 78, - PLC_PARAM_1_WELDING_RAMPING_END_POWER_2 = 80, - PLC_PARAM_1_WELDING_RAMPING_END_DISTANCE = 82, + PLC_SCANNER_X_AXIS, + PLC_SCANNER_X_AXIS_2WORD, - PLC_PARAM_2_WELDING_LASER_POWER = 84, - PLC_PARAM_2_WELDING_DRAW_SPEED = 86, - PLC_PARAM_2_WELDING_JUMP_SPEED = 88, - PLC_PARAM_2_WELDING_LASER_ON_DELAY = 90, - PLC_PARAM_2_WELDING_JUMP_DELAY = 92, - PLC_PARAM_2_WELDING_RAMPING_START_A_POWER_1 = 94, - PLC_PARAM_2_WELDING_RAMPING_START_A_POWER_2 = 96, - PLC_PARAM_2_WELDING_RAMPING_START_A_DISTANCE = 98, - PLC_PARAM_2_WELDING_RAMPING_START_B_POWER_1 = 100, - PLC_PARAM_2_WELDING_RAMPING_START_B_POWER_2 = 102, - PLC_PARAM_2_WELDING_RAMPING_START_B_DISTANCE = 104, - PLC_PARAM_2_WELDING_RAMPING_END_POWER_1 = 106, - PLC_PARAM_2_WELDING_RAMPING_END_POWER_2 = 108, - PLC_PARAM_2_WELDING_RAMPING_END_DISTANCE = 110, + PLC_WELDING_FOCAL_LENGTH, + PLC_WELDING_FOCAL_LENGTH_2WORD, - PLC_PARAM_3_WELDING_LASER_POWER = 112, - PLC_PARAM_3_WELDING_DRAW_SPEED = 114, - PLC_PARAM_3_WELDING_JUMP_SPEED = 116, - PLC_PARAM_3_WELDING_LASER_ON_DELAY = 118, - PLC_PARAM_3_WELDING_JUMP_DELAY = 120, - PLC_PARAM_3_WELDING_RAMPING_START_A_POWER_1 = 122, - PLC_PARAM_3_WELDING_RAMPING_START_A_POWER_2 = 124, - PLC_PARAM_3_WELDING_RAMPING_START_A_DISTANCE = 126, - PLC_PARAM_3_WELDING_RAMPING_START_B_POWER_1 = 128, - PLC_PARAM_3_WELDING_RAMPING_START_B_POWER_2 = 130, - PLC_PARAM_3_WELDING_RAMPING_START_B_DISTANCE = 132, - PLC_PARAM_3_WELDING_RAMPING_END_POWER_1 = 134, - PLC_PARAM_3_WELDING_RAMPING_END_POWER_2 = 136, - PLC_PARAM_3_WELDING_RAMPING_END_DISTANCE = 138, + PLC_EQUIPMENT_SPEED, + PLC_EQUIPMENT_SPEED_2WORD, - PLC_PARAM_1_WELDING_LASER_POWER_RING = 140, - PLC_PARAM_2_WELDING_LASER_POWER_RING = 142, - PLC_PARAM_3_WELDING_LASER_POWER_RING = 144, + PLC_PARAM_1_WELDING_LASER_POWER_CORE, + PLC_PARAM_1_WELDING_LASER_POWER_CORE_2WORD, + + PLC_PARAM_1_WELDING_LASER_POWER_RING, + PLC_PARAM_1_WELDING_LASER_POWER_RING_2WORD, + + PLC_PARAM_1_WELDING_DRAW_SPEED, + PLC_PARAM_1_WELDING_DRAW_SPEED_2WORD, + + PLC_PARAM_1_WELDING_JUMP_SPEED, + PLC_PARAM_1_WELDING_JUMP_SPEED_2WORD, + + PLC_PARAM_1_WELDING_LASER_ON_DELAY, + PLC_PARAM_1_WELDING_LASER_ON_DELAY_2WORD, + + PLC_PARAM_1_WELDING_JUMP_DELAY, + PLC_PARAM_1_WELDING_JUMP_DELAY_2WORD, + + PLC_PARAM_1_WELDING_RAMPING_START_A_POWER_1, + PLC_PARAM_1_WELDING_RAMPING_START_A_POWER_1_2WORD, + + PLC_PARAM_1_WELDING_RAMPING_START_A_POWER_2, + PLC_PARAM_1_WELDING_RAMPING_START_A_POWER_2_2WORD, + + PLC_PARAM_1_WELDING_RAMPING_START_A_DISTANCE, + PLC_PARAM_1_WELDING_RAMPING_START_A_DISTANCE_2WORD, + + PLC_PARAM_1_WELDING_RAMPING_START_B_POWER_1, + PLC_PARAM_1_WELDING_RAMPING_START_B_POWER_1_2WORD, + + PLC_PARAM_1_WELDING_RAMPING_START_B_POWER_2, + PLC_PARAM_1_WELDING_RAMPING_START_B_POWER_2_2WORD, + + PLC_PARAM_1_WELDING_RAMPING_START_B_DISTANCE, + PLC_PARAM_1_WELDING_RAMPING_START_B_DISTANCE_2WORD, + + PLC_PARAM_1_WELDING_RAMPING_END_POWER_1, + PLC_PARAM_1_WELDING_RAMPING_END_POWER_1_2WORD, + + PLC_PARAM_1_WELDING_RAMPING_END_POWER_2, + PLC_PARAM_1_WELDING_RAMPING_END_POWER_2_2WORD, + + PLC_PARAM_1_WELDING_RAMPING_END_DISTANCE, + PLC_PARAM_1_WELDING_RAMPING_END_DISTANCE_2WORD, + + PLC_PARAM_2_WELDING_LASER_POWER_CORE, + PLC_PARAM_2_WELDING_LASER_POWER_CORE_2WORD, + + PLC_PARAM_2_WELDING_LASER_POWER_RING, + PLC_PARAM_2_WELDING_LASER_POWER_RING_2WORD, + + PLC_PARAM_2_WELDING_DRAW_SPEED, + PLC_PARAM_2_WELDING_DRAW_SPEED_2WORD, + + PLC_PARAM_2_WELDING_JUMP_SPEED, + PLC_PARAM_2_WELDING_JUMP_SPEED_2WORD, + + PLC_PARAM_2_WELDING_LASER_ON_DELAY, + PLC_PARAM_2_WELDING_LASER_ON_DELAY_2WORD, + + PLC_PARAM_2_WELDING_JUMP_DELAY, + PLC_PARAM_2_WELDING_JUMP_DELAY_2WORD, + + PLC_PARAM_2_WELDING_RAMPING_START_A_POWER_1, + PLC_PARAM_2_WELDING_RAMPING_START_A_POWER_1_2WORD, + + PLC_PARAM_2_WELDING_RAMPING_START_A_POWER_2, + PLC_PARAM_2_WELDING_RAMPING_START_A_POWER_2_2WORD, + + PLC_PARAM_2_WELDING_RAMPING_START_A_DISTANCE, + PLC_PARAM_2_WELDING_RAMPING_START_A_DISTANCE_2WORD, + + PLC_PARAM_2_WELDING_RAMPING_START_B_POWER_1, + PLC_PARAM_2_WELDING_RAMPING_START_B_POWER_1_2WORD, + + PLC_PARAM_2_WELDING_RAMPING_START_B_POWER_2, + PLC_PARAM_2_WELDING_RAMPING_START_B_POWER_2_2WORD, + + PLC_PARAM_2_WELDING_RAMPING_START_B_DISTANCE, + PLC_PARAM_2_WELDING_RAMPING_START_B_DISTANCE_2WORD, + + PLC_PARAM_2_WELDING_RAMPING_END_POWER_1, + PLC_PARAM_2_WELDING_RAMPING_END_POWER_1_2WORD, + + PLC_PARAM_2_WELDING_RAMPING_END_POWER_2, + PLC_PARAM_2_WELDING_RAMPING_END_POWER_2_2WORD, + + PLC_PARAM_2_WELDING_RAMPING_END_DISTANCE, + PLC_PARAM_2_WELDING_RAMPING_END_DISTANCE_2WORD, + + PLC_PARAM_3_WELDING_LASER_POWER_CORE, + PLC_PARAM_3_WELDING_LASER_POWER_CORE_2WORD, + + PLC_PARAM_3_WELDING_LASER_POWER_RING, + PLC_PARAM_3_WELDING_LASER_POWER_RING_2WORD, + + PLC_PARAM_3_WELDING_DRAW_SPEED, + PLC_PARAM_3_WELDING_DRAW_SPEED_2WORD, + + PLC_PARAM_3_WELDING_JUMP_SPEED, + PLC_PARAM_3_WELDING_JUMP_SPEED_2WORD, + + PLC_PARAM_3_WELDING_LASER_ON_DELAY, + PLC_PARAM_3_WELDING_LASER_ON_DELAY_2WORD, + + PLC_PARAM_3_WELDING_JUMP_DELAY, + PLC_PARAM_3_WELDING_JUMP_DELAY_2WORD, + + PLC_PARAM_3_WELDING_RAMPING_START_A_POWER_1, + PLC_PARAM_3_WELDING_RAMPING_START_A_POWER_1_2WORD, + + PLC_PARAM_3_WELDING_RAMPING_START_A_POWER_2, + PLC_PARAM_3_WELDING_RAMPING_START_A_POWER_2_2WORD, + + PLC_PARAM_3_WELDING_RAMPING_START_A_DISTANCE, + PLC_PARAM_3_WELDING_RAMPING_START_A_DISTANCE_2WORD, + + PLC_PARAM_3_WELDING_RAMPING_START_B_POWER_1, + PLC_PARAM_3_WELDING_RAMPING_START_B_POWER_1_2WORD, + + PLC_PARAM_3_WELDING_RAMPING_START_B_POWER_2, + PLC_PARAM_3_WELDING_RAMPING_START_B_POWER_2_2WORD, + + PLC_PARAM_3_WELDING_RAMPING_START_B_DISTANCE, + PLC_PARAM_3_WELDING_RAMPING_START_B_DISTANCE_2WORD, + + PLC_PARAM_3_WELDING_RAMPING_END_POWER_1, + PLC_PARAM_3_WELDING_RAMPING_END_POWER_1_2WORD, + + PLC_PARAM_3_WELDING_RAMPING_END_POWER_2, + PLC_PARAM_3_WELDING_RAMPING_END_POWER_2_2WORD, + + PLC_PARAM_3_WELDING_RAMPING_END_DISTANCE, + PLC_PARAM_3_WELDING_RAMPING_END_DISTANCE_2WORD, } public enum eWordOutput : int @@ -321,94 +378,154 @@ namespace ILSOS_CCW_H52A.Device PC_DISPLACEMETNT_SENSOR_14, //PC 변위센서 결과값(#지그14번) RESET 값 0, OK이면 1, NG이면 2 PC_DISPLACEMETNT_SENSOR_15, //PC 변위센서 결과값(#지그15번) RESET 값 0, OK이면 1, NG이면 2 PC_DISPLACEMETNT_SENSOR_16, //PC 변위센서 결과값(#지그16번) RESET 값 0, OK이면 1, NG이면 2 - //////////////////////////////////////////////////////////////////////////////// - - //// WON : 2170 RMS 대비 enum 추가 추후 해당 주소 영역 확인 후 주소 매핑 필요, 하기 영역은 2word 로 구성되어야 할 것으로 보이므로 매핑 간격을 2word로 - //PC_WELDING_RECIPE_NO = 48, //설정된 PC Recipe 번호 - //PC_WELDING_LASER_POWER = 50, //PC 용접 레이저 파워 - //PC_WELDING_DRAW_SPEED = 52, - //PC_WELDING_JUMP_SPEED = 54, - //PC_WELDING_X_AXIS = 56, - //PC_WELDING_FOCAL_LENGTH = 58, - //PC_WELDING_LASER_ON_DELAY = 60, - //PC_WELDING_LASER_OFF_DELAY = 62, - //PC_WELDING_JUMP_DELAY = 64, - //PC_WELDING_MARK_DELAY = 66, - //PC_WELDING_POLYGON_DELAY = 68, - //PC_WELDING_RAMPING_START_A_POWER_1 = 70, - //PC_WELDING_RAMPING_START_A_POWER_2 = 72, - //PC_WELDING_RAMPING_START_A_DISTANCE = 74, - //PC_WELDING_RAMPING_START_B_POWER_1 = 76, - //PC_WELDING_RAMPING_START_B_POWER_2 = 78, - //PC_WELDING_RAMPING_START_B_DISTANCE = 80, - //PC_WELDING_RAMPING_END_POWER_1 = 82, - //PC_WELDING_RAMPING_END_POWER_2 = 84, - //PC_WELDING_RAMPING_END_DISTANCE = 86, - //PC_EQUIPMENT_SPEED = 88, - - - - //// WON : 2170 RMS 대비 enum 추가 추후 해당 주소 영역 확인 후 주소 매핑 필요, 하기 영역은 2word 로 구성되어야 할 것으로 보이므로 매핑 간격을 2word로 - // List에 제외 되어 있음 - 확인 필요 (CMY - 26.01.09) - //PLC_WELDING_LASER_OFF_DELAY = 62, - //PLC_WELDING_MARK_DELAY = 66, - //PLC_WELDING_POLYGON_DELAY = 66, // RMS 최종 버전 - PC_WELDING_RECIPE_NO = 48, // 설정할 PLC Recipe 번호 - PC_SCANNER_X_AXIS = 50, // 현재 Scanner X축 위치 - PC_WELDING_FOCAL_LENGTH = 52, // 현재 Scanner Z축 위치 - PC_EQUIPMENT_SPEED = 54, + PC_WELDING_RECIPE_NO = 48, + PC_WELDING_RECIPE_NO_2WORD, - PC_PARAM_1_WELDING_LASER_POWER = 56, - PC_PARAM_1_WELDING_DRAW_SPEED = 58, - PC_PARAM_1_WELDING_JUMP_SPEED = 60, - PC_PARAM_1_WELDING_LASER_ON_DELAY = 62, - PC_PARAM_1_WELDING_JUMP_DELAY = 64, - PC_PARAM_1_WELDING_RAMPING_START_A_POWER_1 = 66, - PC_PARAM_1_WELDING_RAMPING_START_A_POWER_2 = 68, - PC_PARAM_1_WELDING_RAMPING_START_A_DISTANCE = 70, - PC_PARAM_1_WELDING_RAMPING_START_B_POWER_1 = 72, - PC_PARAM_1_WELDING_RAMPING_START_B_POWER_2 = 74, - PC_PARAM_1_WELDING_RAMPING_START_B_DISTANCE = 76, - PC_PARAM_1_WELDING_RAMPING_END_POWER_1 = 78, - PC_PARAM_1_WELDING_RAMPING_END_POWER_2 = 80, - PC_PARAM_1_WELDING_RAMPING_END_DISTANCE = 82, + PC_SCANNER_X_AXIS, + PC_SCANNER_X_AXIS_2WORD, - PC_PARAM_2_WELDING_LASER_POWER = 84, - PC_PARAM_2_WELDING_DRAW_SPEED = 86, - PC_PARAM_2_WELDING_JUMP_SPEED = 88, - PC_PARAM_2_WELDING_LASER_ON_DELAY = 90, - PC_PARAM_2_WELDING_JUMP_DELAY = 92, - PC_PARAM_2_WELDING_RAMPING_START_A_POWER_1 = 94, - PC_PARAM_2_WELDING_RAMPING_START_A_POWER_2 = 96, - PC_PARAM_2_WELDING_RAMPING_START_A_DISTANCE = 98, - PC_PARAM_2_WELDING_RAMPING_START_B_POWER_1 = 100, - PC_PARAM_2_WELDING_RAMPING_START_B_POWER_2 = 102, - PC_PARAM_2_WELDING_RAMPING_START_B_DISTANCE = 104, - PC_PARAM_2_WELDING_RAMPING_END_POWER_1 = 106, - PC_PARAM_2_WELDING_RAMPING_END_POWER_2 = 108, - PC_PARAM_2_WELDING_RAMPING_END_DISTANCE = 110, + PC_WELDING_FOCAL_LENGTH, + PC_WELDING_FOCAL_LENGTH_2WORD, - PC_PARAM_3_WELDING_LASER_POWER = 112, - PC_PARAM_3_WELDING_DRAW_SPEED = 114, - PC_PARAM_3_WELDING_JUMP_SPEED = 116, - PC_PARAM_3_WELDING_LASER_ON_DELAY = 118, - PC_PARAM_3_WELDING_JUMP_DELAY = 120, - PC_PARAM_3_WELDING_RAMPING_START_A_POWER_1 = 122, - PC_PARAM_3_WELDING_RAMPING_START_A_POWER_2 = 124, - PC_PARAM_3_WELDING_RAMPING_START_A_DISTANCE = 126, - PC_PARAM_3_WELDING_RAMPING_START_B_POWER_1 = 128, - PC_PARAM_3_WELDING_RAMPING_START_B_POWER_2 = 130, - PC_PARAM_3_WELDING_RAMPING_START_B_DISTANCE = 132, - PC_PARAM_3_WELDING_RAMPING_END_POWER_1 = 134, - PC_PARAM_3_WELDING_RAMPING_END_POWER_2 = 136, - PC_PARAM_3_WELDING_RAMPING_END_DISTANCE = 138, + PC_EQUIPMENT_SPEED, + PC_EQUIPMENT_SPEED_2WORD, - // 260227 Laser 개조 후 파라미터 추가 - PC_PARAM_1_WELDING_LASER_POWER_RING = 140, - PC_PARAM_2_WELDING_LASER_POWER_RING = 142, - PC_PARAM_3_WELDING_LASER_POWER_RING = 144, + PC_PARAM_1_WELDING_LASER_POWER_CORE, + PC_PARAM_1_WELDING_LASER_POWER_CORE_2WORD, + + PC_PARAM_1_WELDING_LASER_POWER_RING, + PC_PARAM_1_WELDING_LASER_POWER_RING_2WORD, + + PC_PARAM_1_WELDING_DRAW_SPEED, + PC_PARAM_1_WELDING_DRAW_SPEED_2WORD, + + PC_PARAM_1_WELDING_JUMP_SPEED, + PC_PARAM_1_WELDING_JUMP_SPEED_2WORD, + + PC_PARAM_1_WELDING_LASER_ON_DELAY, + PC_PARAM_1_WELDING_LASER_ON_DELAY_2WORD, + + PC_PARAM_1_WELDING_JUMP_DELAY, + PC_PARAM_1_WELDING_JUMP_DELAY_2WORD, + + PC_PARAM_1_WELDING_RAMPING_START_A_POWER_1, + PC_PARAM_1_WELDING_RAMPING_START_A_POWER_1_2WORD, + + PC_PARAM_1_WELDING_RAMPING_START_A_POWER_2, + PC_PARAM_1_WELDING_RAMPING_START_A_POWER_2_2WORD, + + PC_PARAM_1_WELDING_RAMPING_START_A_DISTANCE, + PC_PARAM_1_WELDING_RAMPING_START_A_DISTANCE_2WORD, + + PC_PARAM_1_WELDING_RAMPING_START_B_POWER_1, + PC_PARAM_1_WELDING_RAMPING_START_B_POWER_1_2WORD, + + PC_PARAM_1_WELDING_RAMPING_START_B_POWER_2, + PC_PARAM_1_WELDING_RAMPING_START_B_POWER_2_2WORD, + + PC_PARAM_1_WELDING_RAMPING_START_B_DISTANCE, + PC_PARAM_1_WELDING_RAMPING_START_B_DISTANCE_2WORD, + + PC_PARAM_1_WELDING_RAMPING_END_POWER_1, + PC_PARAM_1_WELDING_RAMPING_END_POWER_1_2WORD, + + PC_PARAM_1_WELDING_RAMPING_END_POWER_2, + PC_PARAM_1_WELDING_RAMPING_END_POWER_2_2WORD, + + PC_PARAM_1_WELDING_RAMPING_END_DISTANCE, + PC_PARAM_1_WELDING_RAMPING_END_DISTANCE_2WORD, + + PC_PARAM_2_WELDING_LASER_POWER_CORE, + PC_PARAM_2_WELDING_LASER_POWER_CORE_2WORD, + + PC_PARAM_2_WELDING_LASER_POWER_RING, + PC_PARAM_2_WELDING_LASER_POWER_RING_2WORD, + + PC_PARAM_2_WELDING_DRAW_SPEED, + PC_PARAM_2_WELDING_DRAW_SPEED_2WORD, + + PC_PARAM_2_WELDING_JUMP_SPEED, + PC_PARAM_2_WELDING_JUMP_SPEED_2WORD, + + PC_PARAM_2_WELDING_LASER_ON_DELAY, + PC_PARAM_2_WELDING_LASER_ON_DELAY_2WORD, + + PC_PARAM_2_WELDING_JUMP_DELAY, + PC_PARAM_2_WELDING_JUMP_DELAY_2WORD, + + PC_PARAM_2_WELDING_RAMPING_START_A_POWER_1, + PC_PARAM_2_WELDING_RAMPING_START_A_POWER_1_2WORD, + + PC_PARAM_2_WELDING_RAMPING_START_A_POWER_2, + PC_PARAM_2_WELDING_RAMPING_START_A_POWER_2_2WORD, + + PC_PARAM_2_WELDING_RAMPING_START_A_DISTANCE, + PC_PARAM_2_WELDING_RAMPING_START_A_DISTANCE_2WORD, + + PC_PARAM_2_WELDING_RAMPING_START_B_POWER_1, + PC_PARAM_2_WELDING_RAMPING_START_B_POWER_1_2WORD, + + PC_PARAM_2_WELDING_RAMPING_START_B_POWER_2, + PC_PARAM_2_WELDING_RAMPING_START_B_POWER_2_2WORD, + + PC_PARAM_2_WELDING_RAMPING_START_B_DISTANCE, + PC_PARAM_2_WELDING_RAMPING_START_B_DISTANCE_2WORD, + + PC_PARAM_2_WELDING_RAMPING_END_POWER_1, + PC_PARAM_2_WELDING_RAMPING_END_POWER_1_2WORD, + + PC_PARAM_2_WELDING_RAMPING_END_POWER_2, + PC_PARAM_2_WELDING_RAMPING_END_POWER_2_2WORD, + + PC_PARAM_2_WELDING_RAMPING_END_DISTANCE, + PC_PARAM_2_WELDING_RAMPING_END_DISTANCE_2WORD, + + PC_PARAM_3_WELDING_LASER_POWER_CORE, + PC_PARAM_3_WELDING_LASER_POWER_CORE_2WORD, + + PC_PARAM_3_WELDING_LASER_POWER_RING, + PC_PARAM_3_WELDING_LASER_POWER_RING_2WORD, + + PC_PARAM_3_WELDING_DRAW_SPEED, + PC_PARAM_3_WELDING_DRAW_SPEED_2WORD, + + PC_PARAM_3_WELDING_JUMP_SPEED, + PC_PARAM_3_WELDING_JUMP_SPEED_2WORD, + + PC_PARAM_3_WELDING_LASER_ON_DELAY, + PC_PARAM_3_WELDING_LASER_ON_DELAY_2WORD, + + PC_PARAM_3_WELDING_JUMP_DELAY, + PC_PARAM_3_WELDING_JUMP_DELAY_2WORD, + + PC_PARAM_3_WELDING_RAMPING_START_A_POWER_1, + PC_PARAM_3_WELDING_RAMPING_START_A_POWER_1_2WORD, + + PC_PARAM_3_WELDING_RAMPING_START_A_POWER_2, + PC_PARAM_3_WELDING_RAMPING_START_A_POWER_2_2WORD, + + PC_PARAM_3_WELDING_RAMPING_START_A_DISTANCE, + PC_PARAM_3_WELDING_RAMPING_START_A_DISTANCE_2WORD, + + PC_PARAM_3_WELDING_RAMPING_START_B_POWER_1, + PC_PARAM_3_WELDING_RAMPING_START_B_POWER_1_2WORD, + + PC_PARAM_3_WELDING_RAMPING_START_B_POWER_2, + PC_PARAM_3_WELDING_RAMPING_START_B_POWER_2_2WORD, + + PC_PARAM_3_WELDING_RAMPING_START_B_DISTANCE, + PC_PARAM_3_WELDING_RAMPING_START_B_DISTANCE_2WORD, + + PC_PARAM_3_WELDING_RAMPING_END_POWER_1, + PC_PARAM_3_WELDING_RAMPING_END_POWER_1_2WORD, + + PC_PARAM_3_WELDING_RAMPING_END_POWER_2, + PC_PARAM_3_WELDING_RAMPING_END_POWER_2_2WORD, + + PC_PARAM_3_WELDING_RAMPING_END_DISTANCE, + PC_PARAM_3_WELDING_RAMPING_END_DISTANCE_2WORD, } } } diff --git a/Machines/ILSOS_CCW_H52A/Properties/AssemblyInfo.cs b/Machines/ILSOS_CCW_H52A/Properties/AssemblyInfo.cs index 1e5d0e3..fe9d84e 100644 --- a/Machines/ILSOS_CCW_H52A/Properties/AssemblyInfo.cs +++ b/Machines/ILSOS_CCW_H52A/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.4")] -[assembly: AssemblyFileVersion("1.0.0.4")] +[assembly: AssemblyVersion("1.0.0.5")] +[assembly: AssemblyFileVersion("1.0.0.5")] diff --git a/Machines/ILSOS_CCW_H52A/Recipes/RecipeEventHelper.cs b/Machines/ILSOS_CCW_H52A/Recipes/RecipeEventHelper.cs index ab2c9ea..f98b065 100644 --- a/Machines/ILSOS_CCW_H52A/Recipes/RecipeEventHelper.cs +++ b/Machines/ILSOS_CCW_H52A/Recipes/RecipeEventHelper.cs @@ -33,7 +33,8 @@ namespace ILSOS_CCW_H52A.Recipes #region PLC Upload Parameter 1 ScannerParam _LineParam_1 = ScannerCanvasUserCtrl.ScannerParams[0]; - plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_LASER_POWER, (int)(_LineParam_1.LaserPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_LASER_POWER.ToString()))); + plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_LASER_POWER_CORE, (int)(_LineParam_1.LaserPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_LASER_POWER_CORE.ToString()))); + plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_LASER_POWER_RING, (int)(_LineParam_1.LaserPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_LASER_POWER_RING.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_DRAW_SPEED, (int)(_LineParam_1.MarkSpeed * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_DRAW_SPEED.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_JUMP_SPEED, (int)(_LineParam_1.JumpSpeed * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_JUMP_SPEED.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_LASER_ON_DELAY, (int)(_LineParam_1.LaserOnDelay * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_LASER_ON_DELAY.ToString()))); @@ -47,14 +48,12 @@ namespace ILSOS_CCW_H52A.Recipes plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_1, (int)(_LineParam_1.RampingEndPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_1.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_2, (int)(_LineParam_1.RampingEndPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_2.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_DISTANCE, (int)(_LineParam_1.RampingEndDist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_DISTANCE.ToString()))); - // 260227 Laser 개조 후 파라미터 추가 - if(param.UseRingPowerRMS) - plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_LASER_POWER_RING, (int)(_LineParam_1.LaserPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_LASER_POWER_RING.ToString()))); #endregion #region PLC Upload Parameter 2 ScannerParam _LineParam_2 = ScannerCanvasUserCtrl.ScannerParams[1]; - plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_LASER_POWER, (int)(_LineParam_2.LaserPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_LASER_POWER.ToString()))); + plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_LASER_POWER_CORE, (int)(_LineParam_2.LaserPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_LASER_POWER_CORE.ToString()))); + plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_LASER_POWER_RING, (int)(_LineParam_2.LaserPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_LASER_POWER_RING.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_DRAW_SPEED, (int)(_LineParam_2.MarkSpeed * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_DRAW_SPEED.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_JUMP_SPEED, (int)(_LineParam_2.JumpSpeed * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_JUMP_SPEED.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_LASER_ON_DELAY, (int)(_LineParam_2.LaserOnDelay * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_LASER_ON_DELAY.ToString()))); @@ -68,14 +67,12 @@ namespace ILSOS_CCW_H52A.Recipes plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_POWER_1, (int)(_LineParam_2.RampingEndPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_POWER_1.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_POWER_2, (int)(_LineParam_2.RampingEndPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_POWER_2.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_DISTANCE, (int)(_LineParam_2.RampingEndDist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_DISTANCE.ToString()))); - // 260227 Laser 개조 후 파라미터 추가 - if (param.UseRingPowerRMS) - plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_LASER_POWER_RING, (int)(_LineParam_2.LaserPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_LASER_POWER_RING.ToString()))); #endregion #region PLC Upload Parameter 3 ScannerParam _LineParam_3 = ScannerCanvasUserCtrl.ScannerParams[2]; - plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_LASER_POWER, (int)(_LineParam_3.LaserPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_LASER_POWER.ToString()))); + plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_LASER_POWER_CORE, (int)(_LineParam_3.LaserPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_LASER_POWER_CORE.ToString()))); + plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_LASER_POWER_RING, (int)(_LineParam_3.LaserPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_LASER_POWER_RING.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_DRAW_SPEED, (int)(_LineParam_3.MarkSpeed * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_DRAW_SPEED.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_JUMP_SPEED, (int)(_LineParam_3.JumpSpeed * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_JUMP_SPEED.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_LASER_ON_DELAY, (int)(_LineParam_3.LaserOnDelay * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_LASER_ON_DELAY.ToString()))); @@ -89,9 +86,6 @@ namespace ILSOS_CCW_H52A.Recipes plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_POWER_1, (int)(_LineParam_3.RampingEndPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_POWER_1.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_POWER_2, (int)(_LineParam_3.RampingEndPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_POWER_2.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_DISTANCE, (int)(_LineParam_3.RampingEndDist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_DISTANCE.ToString()))); - // 260227 Laser 개조 후 파라미터 추가 - if (param.UseRingPowerRMS) - plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_LASER_POWER_RING, (int)(_LineParam_3.LaserPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_LASER_POWER_RING.ToString()))); #endregion Log.I(string.Format($"SET PC_RECIPE_PARAM_UPLOAD_COMPLETE True")); @@ -117,7 +111,8 @@ namespace ILSOS_CCW_H52A.Recipes #region Scanner Upload Parameter 1 ScannerParam _LineParam_1 = ScannerCanvasUserCtrl.ScannerParams[0]; - _LineParam_1.LaserPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_LASER_POWER); + _LineParam_1.LaserPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_LASER_POWER_CORE); + _LineParam_1.LaserPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_LASER_POWER_RING); _LineParam_1.MarkSpeed = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_DRAW_SPEED); _LineParam_1.JumpSpeed = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_JUMP_SPEED); _LineParam_1.LaserOnDelay = (int)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_LASER_ON_DELAY); @@ -131,13 +126,11 @@ namespace ILSOS_CCW_H52A.Recipes _LineParam_1.RampingEndPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_END_POWER_1); _LineParam_1.RampingEndPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_END_POWER_2); _LineParam_1.RampingEndDist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_END_DISTANCE); - // 260227 Laser 개조 후 파라미터 추가 - if (param.UseRingPowerRMS) - _LineParam_1.LaserPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_LASER_POWER_RING); #endregion #region Scanner Upload Parameter 2 ScannerParam _LineParam_2 = ScannerCanvasUserCtrl.ScannerParams[1]; - _LineParam_2.LaserPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_LASER_POWER); + _LineParam_2.LaserPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_LASER_POWER_CORE); + _LineParam_2.LaserPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_LASER_POWER_RING); _LineParam_2.MarkSpeed = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_DRAW_SPEED); _LineParam_2.JumpSpeed = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_JUMP_SPEED); _LineParam_2.LaserOnDelay = (int)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_LASER_ON_DELAY); @@ -151,12 +144,11 @@ namespace ILSOS_CCW_H52A.Recipes _LineParam_2.RampingEndPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_END_POWER_1); _LineParam_2.RampingEndPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_END_POWER_2); _LineParam_2.RampingEndDist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_END_DISTANCE); - if (param.UseRingPowerRMS) - _LineParam_2.LaserPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_LASER_POWER_RING); #endregion #region Scanner Upload Parameter 3 ScannerParam _LineParam_3 = ScannerCanvasUserCtrl.ScannerParams[2]; - _LineParam_3.LaserPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_LASER_POWER); + _LineParam_3.LaserPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_LASER_POWER_CORE); + _LineParam_3.LaserPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_LASER_POWER_RING); _LineParam_3.MarkSpeed = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_DRAW_SPEED); _LineParam_3.JumpSpeed = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_JUMP_SPEED); _LineParam_3.LaserOnDelay = (int)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_LASER_ON_DELAY); @@ -170,8 +162,6 @@ namespace ILSOS_CCW_H52A.Recipes _LineParam_3.RampingEndPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_END_POWER_1); _LineParam_3.RampingEndPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_END_POWER_2); _LineParam_3.RampingEndDist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_END_DISTANCE); - if (param.UseRingPowerRMS) - _LineParam_3.LaserPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_LASER_POWER_RING); #endregion //TODO: Recipe 저장 되어지면 안될꺼 같은데, 확인 필요함. diff --git a/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs b/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs index ec7d66c..22bab29 100644 --- a/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs +++ b/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs @@ -391,8 +391,7 @@ namespace ILSOS_CCW_H52A.Sequences // Scanner Initialize if (_Scanner.GetModulationMode()) { _ModulationMode = true; - } - else { + } else { _ModulationMode = false; } @@ -490,16 +489,14 @@ namespace ILSOS_CCW_H52A.Sequences while (360.0 <= finalValue) { finalValue -= 360.0; } - } - else if (finalValue < 0) { + } else if (finalValue < 0) { while (finalValue < 0) { finalValue += 360.0; } } return finalValue; - } - catch { + } catch { return -9999.9999; } } @@ -579,8 +576,7 @@ namespace ILSOS_CCW_H52A.Sequences return SequenceAction.Error(); } return SequenceAction.Ok(); - } - else { + } else { if (jigComplete.IsCanExist) { #region 용접 시간, 엔코더 측정/기록 double elaspedTime = _Scanner.GetTime(); @@ -623,26 +619,13 @@ namespace ILSOS_CCW_H52A.Sequences Status.GetProcessingWeldingData().RecipeNo = _RecipeNo; Status.GetProcessingWeldingData().LaserPowerByLBAD = _LaserPowerByLBAD.ToString(); - //// 보고 데이터는 스케줄러의 ActiveReportSlot(Complete 또는 PendingComplete)에서 읽음 - //var report = _CellScheduler.ActiveReportSlot; - //if (report != null) { - // Status.GetProcessingWeldingData().LotId = report.LotId; - // Status.GetProcessingWeldingData().CellId = report.CellId; - // Status.GetProcessingWeldingData().WeldingStartTime = report.WeldStartTime; - // Status.GetProcessingWeldingData().WeldingEndTime = report.WeldEndTime; - // Status.GetProcessingWeldingData().WeldingSpanTimeMilliseconds = report.WeldingSpanTime.TotalMilliseconds.ToString(); - // Status.GetProcessingWeldingData().JigNo = report.JigNo.ToString(); - // SaveCellAPD(); - //} - - //// 보고 데이터는 스케줄러의 ActiveReportSlot(Complete 또는 PendingComplete)에서 읽음 - Status.GetProcessingWeldingData().LotId = jigComplete.LotId; - Status.GetProcessingWeldingData().CellId = jigComplete.CellId; - Status.GetProcessingWeldingData().WeldingStartTime = jigComplete.WeldStartTime; - Status.GetProcessingWeldingData().WeldingEndTime = jigComplete.WeldEndTime; - Status.GetProcessingWeldingData().WeldingSpanTimeMilliseconds = jigComplete.WeldingSpanTime.TotalMilliseconds.ToString(); - Status.GetProcessingWeldingData().JigNo = jigComplete.JigNo.ToString(); - SaveCellAPD(); + Status.GetProcessingWeldingData().LotId = jigComplete.LotId; + Status.GetProcessingWeldingData().CellId = jigComplete.CellId; + Status.GetProcessingWeldingData().WeldingStartTime = jigComplete.WeldStartTime; + Status.GetProcessingWeldingData().WeldingEndTime = jigComplete.WeldEndTime; + Status.GetProcessingWeldingData().WeldingSpanTimeMilliseconds = jigComplete.WeldingSpanTime.TotalMilliseconds.ToString(); + Status.GetProcessingWeldingData().JigNo = jigComplete.JigNo.ToString(); + SaveCellAPD(); } UtilUnit.logUnit.SetLog(LogUnit.eLogType.PRODUCT, MethodBase.GetCurrentMethod().Name, "UPDATE_WELDING_TIME;" + jigComplete.WeldingSpanTime.TotalMilliseconds); @@ -745,8 +728,7 @@ namespace ILSOS_CCW_H52A.Sequences if (UsePlcShotThemAll) { canExist = true; Log.I("Settings - PLC : Shot Them All Mode"); - } - else + } else canExist = GetRotaryCanExist(_WeldingJigNo); //Log.I("Can Exist : " + canExist.ToString() + ", JigNo " + _WeldingJigNo + " ,CountNo " + _WeldingCount + ", StartAngle(Y) : " + _WeldingStartAngle); @@ -771,12 +753,10 @@ namespace ILSOS_CCW_H52A.Sequences recvInfo.LotId = rLot; recvInfo.CellId = rCell; Log.I($"[PendingRestore] Jig{_WeldingJigNo} 셀 복원 >> CellId({rCell})"); - } - else { + } else { Log.W($"[PendingRestore] Jig{_WeldingJigNo} canExist=false, 복원 데이터 폐기 >> CellId({rCell})"); } - } - else if (ProcessManager.Instance.ReceivedCellInfoQueue.TryDequeue(out var cell)) { + } else if (ProcessManager.Instance.ReceivedCellInfoQueue.TryDequeue(out var cell)) { if (canExist) { recvInfo.LotId = cell.LotId; recvInfo.CellId = cell.CellId; @@ -805,7 +785,7 @@ namespace ILSOS_CCW_H52A.Sequences $"[ListNo({_CellScheduler.Prefetch2.ListNo})] [WeldingCount({_CellScheduler.Prefetch2.WeldingCount})]" + $"[StartAngle(Y)({_CellScheduler.Prefetch2.StartAngle})]"); - if(_CellScheduler.Prefetch1 != null) + if (_CellScheduler.Prefetch1 != null) Log.I($"Prefetch1 >> CellId({_CellScheduler.Prefetch1.CellId}) [CanExist({_CellScheduler.Prefetch1.IsCanExist})] [JigNo({_CellScheduler.Prefetch1.JigNo})] " + $"[ListNo({_CellScheduler.Prefetch1.ListNo})] [WeldingCount({_CellScheduler.Prefetch1.WeldingCount})]" + $"[StartAngle(Y)({_CellScheduler.Prefetch1.StartAngle})]"); @@ -815,16 +795,14 @@ namespace ILSOS_CCW_H52A.Sequences if (_WeldingJigNo - 1 < _ScannerCanvasUserCtrl.Model.Layers.Length) { _SelectedDrawObjectList = _ScannerCanvasUserCtrl.Model.Layers[_WeldingJigNo - 1].Objects; Log.I(string.Format("Page 불러오기 : [{0}])", _WeldingJigNo - 1)); - } - else { + } else { _SelectedDrawObjectList = _ScannerCanvasUserCtrl.Model.Layers[0].Objects; Log.I(string.Format("Page 불러오기 : [0])")); } #endregion return SEQ_SET_PARAMS_UPLOAD_WELDING_LIST_SEQ; - } - else { + } else { return SEQ_EXECUTE_WELDING; } #endregion @@ -953,8 +931,7 @@ namespace ILSOS_CCW_H52A.Sequences _Scanner.ExecuteList(_WeldingScannerListNo); Log.I(string.Format($"START Welding : ExecuteList_{_WeldingScannerListNo}")); - } - else { + } else { _Scanner.AutoChange(); Log.I(string.Format($"Next upload list : uploadList_{_WeldingScannerListNo}")); } @@ -1139,8 +1116,7 @@ namespace ILSOS_CCW_H52A.Sequences bool cycleStop = false; if (cycleStop) { return SEQ_SAVE_RESULT_DATA; - } - else { + } else { return SEQ_CHECK_LOAD_COMPLETE; } } diff --git a/WeldingComponents/WeldingCommon/Settings/SystemParameter.cs b/WeldingComponents/WeldingCommon/Settings/SystemParameter.cs index 5c83403..bb3b1ff 100644 --- a/WeldingComponents/WeldingCommon/Settings/SystemParameter.cs +++ b/WeldingComponents/WeldingCommon/Settings/SystemParameter.cs @@ -478,13 +478,6 @@ namespace WeldingCommon.Settings [Category("CellPosMeasure")] [DisplayName("CellCenterOffsetY")] public double CellPosMeasureCenterOffsetY { get; set; } = 0; - - // 260227 Laser 개조 후 파라미터 추가 - [Browsable(true)] - [ReadOnly(false)] - [Category("RMS")] - [DisplayName("Use RingPower RMS")] - public bool UseRingPowerRMS { get; set; } = false; } public class ILSOSSizeF {