Bladeren bron

V1.01-001

修改字体格式
liaizun 4 maanden geleden
bovenliggende
commit
af6183f93e

+ 4 - 4
Machine/JinHongMachine/JHAction.c

@@ -13,7 +13,7 @@ void ExtiAcitionX02(void)
     }    
 }
 
-//³õʼ»¯¶¯×÷
+//�始化动作
 void JH_Mechine_InitAction(void)
 {
     switch(cMachineType)
@@ -46,7 +46,7 @@ void JH_Mechine_InitAction(void)
         case GONG_ZHI_MA:
             break;
    
-        case CHUANTOU_NL_HELIAN_JI:   //´©Í·ºÏÁ´»ú
+        case CHUANTOU_NL_HELIAN_JI:   //穿头�链机
             JH_CTHL_NL_InitAction();
             break;
         default:
@@ -60,11 +60,11 @@ void JH_Mechine_Action(void)
     switch(cMachineType)
     {
 
-        case CHUAN_TOU_QIE_DUAN_JI:   //´©Í·Çжϻú
+        case CHUAN_TOU_QIE_DUAN_JI:   //穿头切断机
                 //GL_QDCT_Action();
           break;
       
-        case CHUANTOU_NL_HELIAN_JI:   //´©Í·ºÏÁ´»ú
+        case CHUANTOU_NL_HELIAN_JI:   //穿头�链机
             JH_CTHL_NL_Action();
             break;
         default:

+ 4 - 4
Machine/JinHongMachine/JHAction.h

@@ -4,7 +4,7 @@
 
 
 
-//机器种类定义
+//鏈哄櫒绉嶇被瀹氫箟
 
 #define JIAO_YA_DIN_CUN  1 
 #define CHU_CHI_JI       2
@@ -20,9 +20,9 @@
 #define JIN_SHU_KLSZ_JI  12
 #define HE_LIAN_JI       13
 #define FANG_KUAI_CHA_XIAO_JI 14
-#define CHUANTOU_HELIAN_JI 15  //穿头合链
-#define CHUANTOU_NL_HELIAN_JI 16  //尼龙穿头合链
-/**机器设置**/
+#define CHUANTOU_HELIAN_JI 15  //绌垮ご鍚堥摼
+#define CHUANTOU_NL_HELIAN_JI 16  //灏奸緳绌垮ご鍚堥摼
+/**鏈哄櫒璁剧疆**/
 extern void JH_Mechine_InitAction(void);
 extern void JH_Mechine_Action(void);
 

File diff suppressed because it is too large
+ 182 - 182
Machine/JinHongMachine/JHChuantou_NL_HeLian.c


+ 241 - 241
Machine/JinHongMachine/JHChuantou_NL_HeLian.h

@@ -19,52 +19,52 @@ extern void JH_CTHL_NL_InitAction(void);
 #define JH_CTHL_NL_VAVLE_ERROR_TIME   3000 
 #define JH_CTHL_NL_MOTOR_ALARM_TIME   5000
 
-//故障代码列表
+//鏁呴殰浠g爜鍒楄〃
 #define JH_CTHL_NL_NO_ALARM                0
-#define JH_CTHL_NL_WLZDTJ_ALARM            1   //无拉链自动停机
-#define JH_CTHL_NL_XKSC_Limit_ALARM        2   //X03斜口上止到位异常
-#define JH_CTHL_NL_TLiao_Limit_ALARM       3   //X04推料到位异常
-
-#define JH_CTHL_NL_HSLiao_Limit_ALARM      5   //X06横送料到位异常
-#define JH_CTHL_NL_HSLiao_Origin_ALARM     6   //X07横送料原位异常
-#define JH_CTHL_NL_JLiao_Limit_ALARM       7   //X10接料到位异常
-#define JH_CTHL_NL_CTM_Limit_ALARM         8   //X11穿头模到位异常
-#define JH_CTHL_NL_CTM_Origin_ALARM        9   //X12穿头模原位异常
-#define JH_CTHL_NL_First_CT_Origin_ALARM   10  //X13一次穿头原位异常
-#define JH_CTHL_NL_LTou_Check_ALARM        11   //X14拉头缺料感应异常
-#define JH_CTHL_NL_CXSC_Limit_ALARM        12   //X15插稍上止感应异常
-#define JH_CTHL_NL_CX_Limit_ALARM          13   //X16插稍到位感应异常
-#define JH_CTHL_NL_XKTD_Origin_ALARM       14   //X17斜口原位感应异常
-#define JH_CTHL_NL_CXGL_Limit_ALARM        15   //X20插稍下移到位异常
-#define JH_CTHL_NL_SF_ALR_ALARM            16   //X22伺服报警异常
-#define JH_CTHL_NL_SF_Origin_ALARM         17   //X23伺服原位(穿链原位)异常
-#define JH_CTHL_NL_ZLT_ALARM               18   //装拉头异常
-#define JH_CTHL_NL_FK_Check_ALARM          19   //X02方块检测
-#define JH_CTHL_NL_FKCXDW_ALARM            20   //方块插销定位异常警告
-#define JH_CTHL_NL_YCCRYWYC_ALARM          21   //一次穿入原位异常
-#define JH_CTHL_NL_XCXXCYC_ALARM           22   //小插销行程异常
-#define JH_CTHL_NL_HENSONGLIAO_ALARM       23   //横送料不能输出
-#define JH_CTHL_NL_YCCT_ALARM              24   //一次穿头不能输出
-#define JH_CTHL_NL_YCXM_Origin_ALARM       25   //一次穿头和下模不能输出
-#define JH_CTHL_NL_DXKCTXM_Origin_ALARM    26   //顶斜口和穿头下模不能输出
-#define JH_CTHL_NL_XKTD_ALARM              27   //斜口推带不能有输出
-#define JH_CTHL_NL_CXQJD_ALARM             28   //插销前夹带不能有输出
-#define JH_CTHL_NL_WFZIDONGCX_ALARM        29   //无法自动插销
-#define JH_CTHL_NL_SafeDoor_ALARM          30    //安全门关上才能启动
-#define JH_CTHL_NL_YAxis_Limit_ALARM       31    //合链电机超过最大行程范围
-#define JH_CTHL_NL_YAxis_Origin_ALARM      32    //合链电机回零失败
-#define JH_CTHL_NL_Y_SF_ALR_ALARM          33      //Y伺服报警  
-#define JH_CTHL_NL_SongDai_ALARM           34      //送带异常
-#define JH_CTHL_NL_SERVO_CONFIG_ALARM      35      //伺服配置转矩限制失败
+#define JH_CTHL_NL_WLZDTJ_ALARM            1   //鏃犳媺閾捐嚜鍔ㄥ仠鏈�
+#define JH_CTHL_NL_XKSC_Limit_ALARM        2   //X03鏂滃彛涓婃�鍒颁綅寮傚父
+#define JH_CTHL_NL_TLiao_Limit_ALARM       3   //X04鎺ㄦ枡鍒颁綅寮傚父
+
+#define JH_CTHL_NL_HSLiao_Limit_ALARM      5   //X06妯�€佹枡鍒颁綅寮傚父
+#define JH_CTHL_NL_HSLiao_Origin_ALARM     6   //X07妯�€佹枡鍘熶綅寮傚父
+#define JH_CTHL_NL_JLiao_Limit_ALARM       7   //X10鎺ユ枡鍒颁綅寮傚父
+#define JH_CTHL_NL_CTM_Limit_ALARM         8   //X11绌垮ご妯″埌浣嶅紓甯�
+#define JH_CTHL_NL_CTM_Origin_ALARM        9   //X12绌垮ご妯″師浣嶅紓甯�
+#define JH_CTHL_NL_First_CT_Origin_ALARM   10  //X13涓€娆$┛澶村師浣嶅紓甯�
+#define JH_CTHL_NL_LTou_Check_ALARM        11   //X14鎷夊ご缂烘枡鎰熷簲寮傚父
+#define JH_CTHL_NL_CXSC_Limit_ALARM        12   //X15鎻掔◢涓婃�鎰熷簲寮傚父
+#define JH_CTHL_NL_CX_Limit_ALARM          13   //X16鎻掔◢鍒颁綅鎰熷簲寮傚父
+#define JH_CTHL_NL_XKTD_Origin_ALARM       14   //X17鏂滃彛鍘熶綅鎰熷簲寮傚父
+#define JH_CTHL_NL_CXGL_Limit_ALARM        15   //X20鎻掔◢涓嬬Щ鍒颁綅寮傚父
+#define JH_CTHL_NL_SF_ALR_ALARM            16   //X22浼烘湇鎶ヨ�寮傚父
+#define JH_CTHL_NL_SF_Origin_ALARM         17   //X23浼烘湇鍘熶綅(绌块摼鍘熶綅)寮傚父
+#define JH_CTHL_NL_ZLT_ALARM               18   //瑁呮媺澶村紓甯�
+#define JH_CTHL_NL_FK_Check_ALARM          19   //X02鏂瑰潡妫€娴�
+#define JH_CTHL_NL_FKCXDW_ALARM            20   //鏂瑰潡鎻掗攢瀹氫綅寮傚父璀﹀憡
+#define JH_CTHL_NL_YCCRYWYC_ALARM          21   //涓€娆$┛鍏ュ師浣嶅紓甯�
+#define JH_CTHL_NL_XCXXCYC_ALARM           22   //灏忔彃閿€琛岀▼寮傚父
+#define JH_CTHL_NL_HENSONGLIAO_ALARM       23   //妯�€佹枡涓嶈兘杈撳嚭
+#define JH_CTHL_NL_YCCT_ALARM              24   //涓€娆$┛澶翠笉鑳借緭鍑�
+#define JH_CTHL_NL_YCXM_Origin_ALARM       25   //涓€娆$┛澶村拰涓嬫ā涓嶈兘杈撳嚭
+#define JH_CTHL_NL_DXKCTXM_Origin_ALARM    26   //椤舵枩鍙e拰绌垮ご涓嬫ā涓嶈兘杈撳嚭
+#define JH_CTHL_NL_XKTD_ALARM              27   //鏂滃彛鎺ㄥ甫涓嶈兘鏈夎緭鍑�
+#define JH_CTHL_NL_CXQJD_ALARM             28   //鎻掗攢鍓嶅す甯︿笉鑳芥湁杈撳嚭
+#define JH_CTHL_NL_WFZIDONGCX_ALARM        29   //鏃犳硶鑷�姩鎻掗攢
+#define JH_CTHL_NL_SafeDoor_ALARM          30    //瀹夊叏闂ㄥ叧涓婃墠鑳藉惎鍔�
+#define JH_CTHL_NL_YAxis_Limit_ALARM       31    //鍚堥摼鐢垫満瓒呰繃鏈€澶ц�绋嬭寖鍥�
+#define JH_CTHL_NL_YAxis_Origin_ALARM      32    //鍚堥摼鐢垫満鍥為浂澶辫触
+#define JH_CTHL_NL_Y_SF_ALR_ALARM          33      //Y浼烘湇鎶ヨ�  
+#define JH_CTHL_NL_SongDai_ALARM           34      //閫佸甫寮傚父
+#define JH_CTHL_NL_SERVO_CONFIG_ALARM      35      //浼烘湇閰嶇疆杞�煩闄愬埗澶辫触
 
 #define JH_CTHL_NL_AutoStep            cStepMByte
 #define JH_CTHL_NL_ZhuangLiaoStep      cStepMByte1
 #define JH_CTHL_NL_TLiaoStep           cStepMByte2
-#define JH_CTHL_NL_TD_MotorStep        cStepMByte3     //拖带电机
+#define JH_CTHL_NL_TD_MotorStep        cStepMByte3     //鎷栧甫鐢垫満
 #define JH_CTHL_NL_JiaLianStep         cStepMByte4
 #define JH_CTHL_NL_ZhenDongStep        cStepMByte6
 #define JH_CTHL_NL_SongLiaoStep        cStepMByte7
-#define JH_CTHL_NL_CL_MotorStep        cStepMByte8     //穿链
+#define JH_CTHL_NL_CL_MotorStep        cStepMByte8     //绌块摼
 #define JH_CTHL_NL_AutoStep1           cStepMByte9
 
 #define JH_CTHL_NL_bFKCXTDDW_Step      cStepMByte10    
@@ -96,14 +96,14 @@ extern void JH_CTHL_NL_InitAction(void);
 
 #define JH_CTHL_NL_RunStepSave         cUShort16Buff1
 #define JH_CTHL_NL_TDMotorStepSave         cUShort16Buff2
-//32位无符号变量
+//32浣嶆棤绗﹀彿鍙橀噺
 #define JH_CTHL_NL_LianLengthCheck     cUDword32Buff1
 #define JH_CTHL_NL_LianLengthAutoCheck cUDword32Buff2
 #define JH_CTHL_NL_LianLengthAutoCheckOLD cUDword32Buff3
 #define JH_CTHL_NL_TimeBuff cUDword32Buff4
 #define JH_CTHL_NL_LianLengthCheckReal     cUDword32Buff5
 #define JH_CTHL_NL_LianLengthAutoFirst     cUDword32Buff6
-//32位有符号变量
+//32浣嶆湁绗﹀彿鍙橀噺
 #define JH_CTHL_NL_XSavePosBuff        cDword32Buff1
 #define JH_CTHL_NL_X_CXPosBuff         cDword32Buff2
 #define JH_CTHL_NL_YSavePosBuff        cDword32Buff3
@@ -120,7 +120,7 @@ extern void JH_CTHL_NL_InitAction(void);
 #define JH_CTHL_LianLengthERROR_Check  cDword32Buff14
 #define JH_CTHL_NL_LianLengthXC_Check   cDword32Buff15
 
-//8位变量
+//8浣嶅彉閲�
 #define JH_CTHL_NL_TryCnt              cCharBuff1
 #define JH_CTHL_NL_cZipCnt             cCharBuff2
 #define cStopInCnt                  cCharBuff3
@@ -135,7 +135,7 @@ extern void JH_CTHL_NL_InitAction(void);
 #define  cHeLianone                      cCharBuff12
 #define  cDJzzcd                    cCharBuff13
 #define  cXCDWONE                    cCharBuff14
-//位标志位
+//浣嶆爣蹇椾綅
 #define bTuiLaTouOkFlg              bBitFlag0
 #define bZhuangLiaoOkFlg            bBitFlag1
 #define bXiaMoENFlg                 bBitFlag2
@@ -158,173 +158,173 @@ extern void JH_CTHL_NL_InitAction(void);
 #define JH_CTHL_NL_SPEED_ADDR     78
 #define JH_CTHL_NL_ALARM_ADDR     100
 
-#define JH_CTHL_NL_PARAM_CYCLE_PULSE       user_datas[0]//0 转一圈脉冲数 (拖带) 
-#define JH_CTHL_NL_PARAM_CYCLE_LENGTH      user_datas[1]//0.1 转一圈拖带多长 (拖带) 
-#define JH_CTHL_NL_PARAM_TD_RunSpeed       user_datas[2]//整数 拖带电机拖带速度
-#define JH_CTHL_NL_PARAM_FKDW_Speed        user_datas[3]//整数 方块定位速度(低速度)
-#define JH_CTHL_NL_PARAM_CL_Speed          user_datas[4]//整数 合链速度
-#define JH_CTHL_NL_PARAM_CL_Back_O_Speed   user_datas[5]//整数 合链电机回零速度
-#define JH_CTHL_NL_PARAM_FKDW_Length       user_datas[6]//0.01 方块定位长度
-#define JH_CTHL_NL_PARAM_CXDW_Length       user_datas[7]//0.01 插销定位长度
-#define  JH_CTHL_NL_PARAM_CL_Length         user_datas[8]//0.01 合链长度(气缸时为时间)
-#define JH_CTHL_NL_PARAM_CLT_Time           (10*user_datas[8])//0.01 合链时间
-#define JH_CTHL_NL_PARAM_CL_MAX_Length     user_datas[9]//0.01 穿链最长限制
-
-#define JH_CTHL_NL_PARAM_TLiao_BACKDELAY   (10*user_datas[10])//0.01推拉头到位延时返回
-#define JH_CTHL_NL_PARAM_MaGou_DELAY       (10*user_datas[11])//0.01接料到位延时码勾
-#define JH_CTHL_NL_PARAM_HSLiaoOff_DELAY   (10*user_datas[12])//0.01码勾输出后退横送料
-#define JH_CTHL_NL_PARAM_CheckLT_DELAY     (10*user_datas[13])//0.01码勾输出后延时检测拉头
-#define JH_CTHL_NL_PARAM_HL_BACK_Time      (10*user_datas[14])//0.01合链气缸返回时间
-#define JH_CTHL_NL_PARAM_First_CL_Timer     (10*user_datas[15])    //0.01一次穿入时间
-#define JH_CTHL_NL_PARAM_MGOff_XiaMo_DELAY (10*user_datas[16])     //0.01松码勾后延时退下模
-#define JH_CTHL_NL_PARAM_CXCR_DELAY        (10*user_datas[17])    //0.01插销延时穿入
-#define JH_CTHL_NL_PARAM_XKDW_TD_DELAY        (10*user_datas[18])    //0.01斜口定位后延时拖带
-#define JH_CTHL_NL_PARAM_XK_CR_DELAY        (10*user_datas[19])    //0.01斜口延时穿拉头
-#define JH_CTHL_NL_PARAM_DXK_XKDW_Off_DELAY (10*user_datas[20])    //0.01顶斜口后延时退方块勾针
-//#define JH_CTHL_NL_PARAM_XCQJD_XCDW_DELAY      (10*user_datas[21])    //0.01插销前夹带后延时插销定位
-#define JH_CTHL_NL_PARAM_First_CL_DELAY        (10*user_datas[22])    //0.01延时一次穿入
-#define JH_CTHL_NL_PARAM_HLJJ_CL_DELAY        (10*user_datas[23])    //0.01合链夹具延时合链  
-#define JH_CTHL_NL_PARAM_ZDP_Start_TIME      (10*user_datas[24])      //0.01振动盘启动延时  
-#define JH_CTHL_NL_PARAM_ZDP_Stop_TIME       (10*user_datas[25])       //0.01振动盘延时停止 
-#define JH_CTHL_NL_PARAM_XCX_LENTH           user_datas[26]       //0.01 小插销感应后再走标准长度
-
-#define JH_CTHL_NL_PARAM_XCXWC_LENTH          user_datas[27]       //0.01 小插销标准长度过长的误差值 
-#define JH_CTHL_NL_PARAM_TDFZ_LENTH          user_datas[28]       //0.01拖带电机反转长度
-#define JH_CTHL_NL_PARAM_WLCDSHEZHI_LENTH   (10* user_datas[29])       //0.1无拉链情况再走长度设置
-
-#define JH_CTHL_NL_PARAM_YCYCLE_PULSE       user_datas[30]//Y轴转一圈脉冲数  
-#define JH_CTHL_NL_PARAM_YCYCLE_LENGTH      user_datas[31]//Y轴 整数 转一圈拖带多长 
-
-#define JH_CTHL_NL_PARAM_CR_MODE      user_datas[32]//气缸穿入(0)还时电机穿入(1)
-//#define JH_CTHL_NL_PARAM_XXHT_Time           (10*user_datas[33])//0.01 插销退回时间
-#define JH_CTHL_NL_PARAM_XKDW_Speed           (user_datas[33])//斜口定位速度
-#define JH_CTHL_NL_PARAM_DXK_DELAY           (10*user_datas[34])//0.01 插销退回时间
-#define JH_CTHL_NL_PARAM_CXJZ_HT_DELAY        (10*user_datas[35])    //0.01插销前夹具延时后退 
-#define JH_CTHL_NL_PARAM_Y_MAX_LENTH        (user_datas[36])    //0.01 合链电机最大行程
-#define JH_CTHL_NL_PARAM_LACHUBAOHU_LENTH        (user_datas[37])    //0.01 上止定位延时停电机
-#define JH_CTHL_NL_PARAM_TDCR_LowSpeed     user_datas[38]  //拖带穿入慢速度
-#define JH_CTHL_NL_PARAM_TDCR_LowSpeedLength user_datas[39]  //拖带穿入慢速距离
-#define JH_CTHL_NL_PARAM_HSLYDTL_DELAY        (10*user_datas[40])    //0.01 横送料原点延时推料
-#define JH_CTHL_NL_PARAM_UP_DOWN_OUT_SELECT  (user_datas[41])       //拉链类型   0 树脂,1尼龙
-#define JH_CTHL_NL_PARAM_TuiDXM_Lenght  (user_datas[42])       //退顶斜码位置
-#define JH_CTHL_NL_PARAM_GFJ_WorkMode  (user_datas[43])       //公分节操作选择
-#define JH_CTHL_NL_PARAM_GFJ_Length     (user_datas[44])       //公分节长度标准
-#define JH_CTHL_NL_PARAM_QianMaSelect  (user_datas[45])       //前码类型选择
-#define JH_CTHL_NL_PARAM_ZDP_AUTO       user_datas[46]   //振动盘控制
-#define JH_CTHL_NL_PARAM_MOTOR_ENSelect       user_datas[47]   //合链电机类型  0 伺服 ,1 步进
-#define JH_CTHL_NL_PARAM_BoardSelect       user_datas[48]   //板块类型  0 DB15 ,1 无DB15
-#define JH_CTHL_NL_PARAM_SongDaiTime       (10*user_datas[49])   //送带时间
-#define JH_CTHL_NL_PARAM_SongDaiEn       user_datas[50]   //送带配置  0 无送带 ,1 有送带
-#define JH_CTHL_NL_PARAM_CXSX_En       user_datas[51]   //插销上下开关  0 开 ,1 关
-#define JH_CTHL_NL_PARAM_FKDW_LowSpeedLength user_datas[52]  //方块定位的慢速长度
-#define JH_CTHL_NL_PARAM_FKTD_ChangeSpeedPos user_datas[53]  //拖带变速位置
-#define JH_CTHL_NL_PARAM_FDOff_Pos            user_datas[54]  //分带关闭位置
-#define JH_CTHL_NL_PARAM_FD_EN            user_datas[55]  //分带开关
-#define JH_CTHL_NL_PARAM_FKJD_DELAY            (10*user_datas[56])  //方块夹带延时
-#define JH_CTHL_NL_PARAM_FKJDFZ_DELAY        (10*user_datas[57])  //方块夹带延时
-#define JH_CTHL_NL_PARAM_XKMS_LENGTH        user_datas[58]  //前码穿入慢速长度
-
-
-#define JH_CTHL_NL_PARAM_CR_SPEED             user_datas[60]  //穿入速度
-#define JH_CTHL_NL_PARAM_CR_LENGTH             user_datas[61]  //穿入长度
-
-#define JH_CTHL_NL_FK_IN_SPEED                 user_datas[62]  //方块感应后慢速度
-#define JH_CTHL_NL_XC_IN_LENGTH                 user_datas[63]  //小插感应后慢速长度
-#define JH_CTHL_NL_CX_IN_DW_LENGTH                 user_datas[64]  //小插感应后再走长度
-
-#define JH_CTHL_NL_PARAM_XCRU              user_datas[65]//作监控
-#define JH_CTHL_NL_PARAM_CXCR              user_datas[66]//作监控
-#define JH_CTHL_NL_PARAM_QMDW_LENGTH              user_datas[67]//延时输出前码定位
+#define JH_CTHL_NL_PARAM_CYCLE_PULSE       user_datas[0]//0 杞�竴鍦堣剦鍐叉暟 (鎷栧甫) 
+#define JH_CTHL_NL_PARAM_CYCLE_LENGTH      user_datas[1]//0.1 杞�竴鍦堟嫋甯﹀�闀� (鎷栧甫) 
+#define JH_CTHL_NL_PARAM_TD_RunSpeed       user_datas[2]//鏁存暟 鎷栧甫鐢垫満鎷栧甫閫熷害
+#define JH_CTHL_NL_PARAM_FKDW_Speed        user_datas[3]//鏁存暟 鏂瑰潡瀹氫綅閫熷害(浣庨€熷害)
+#define JH_CTHL_NL_PARAM_CL_Speed          user_datas[4]//鏁存暟 鍚堥摼閫熷害
+#define JH_CTHL_NL_PARAM_CL_Back_O_Speed   user_datas[5]//鏁存暟 鍚堥摼鐢垫満鍥為浂閫熷害
+#define JH_CTHL_NL_PARAM_FKDW_Length       user_datas[6]//0.01 鏂瑰潡瀹氫綅闀垮害
+#define JH_CTHL_NL_PARAM_CXDW_Length       user_datas[7]//0.01 鎻掗攢瀹氫綅闀垮害
+#define  JH_CTHL_NL_PARAM_CL_Length         user_datas[8]//0.01 鍚堥摼闀垮害(姘旂几鏃朵负鏃堕棿)
+#define JH_CTHL_NL_PARAM_CLT_Time           (10*user_datas[8])//0.01 鍚堥摼鏃堕棿
+#define JH_CTHL_NL_PARAM_CL_MAX_Length     user_datas[9]//0.01 绌块摼鏈€闀块檺鍒�
+
+#define JH_CTHL_NL_PARAM_TLiao_BACKDELAY   (10*user_datas[10])//0.01鎺ㄦ媺澶村埌浣嶅欢鏃惰繑鍥�
+#define JH_CTHL_NL_PARAM_MaGou_DELAY       (10*user_datas[11])//0.01鎺ユ枡鍒颁綅寤舵椂鐮佸嬀
+#define JH_CTHL_NL_PARAM_HSLiaoOff_DELAY   (10*user_datas[12])//0.01鐮佸嬀杈撳嚭鍚庨€€妯�€佹枡
+#define JH_CTHL_NL_PARAM_CheckLT_DELAY     (10*user_datas[13])//0.01鐮佸嬀杈撳嚭鍚庡欢鏃舵�娴嬫媺澶�
+#define JH_CTHL_NL_PARAM_HL_BACK_Time      (10*user_datas[14])//0.01鍚堥摼姘旂几杩斿洖鏃堕棿
+#define JH_CTHL_NL_PARAM_First_CL_Timer     (10*user_datas[15])    //0.01涓€娆$┛鍏ユ椂闂�
+#define JH_CTHL_NL_PARAM_MGOff_XiaMo_DELAY (10*user_datas[16])     //0.01鏉剧爜鍕惧悗寤舵椂閫€涓嬫ā
+#define JH_CTHL_NL_PARAM_CXCR_DELAY        (10*user_datas[17])    //0.01鎻掗攢寤舵椂绌垮叆
+#define JH_CTHL_NL_PARAM_XKDW_TD_DELAY        (10*user_datas[18])    //0.01鏂滃彛瀹氫綅鍚庡欢鏃舵嫋甯�
+#define JH_CTHL_NL_PARAM_XK_CR_DELAY        (10*user_datas[19])    //0.01鏂滃彛寤舵椂绌挎媺澶�
+#define JH_CTHL_NL_PARAM_DXK_XKDW_Off_DELAY (10*user_datas[20])    //0.01椤舵枩鍙e悗寤舵椂閫€鏂瑰潡鍕鹃拡
+//#define JH_CTHL_NL_PARAM_XCQJD_XCDW_DELAY      (10*user_datas[21])    //0.01鎻掗攢鍓嶅す甯﹀悗寤舵椂鎻掗攢瀹氫綅
+#define JH_CTHL_NL_PARAM_First_CL_DELAY        (10*user_datas[22])    //0.01寤舵椂涓€娆$┛鍏�
+#define JH_CTHL_NL_PARAM_HLJJ_CL_DELAY        (10*user_datas[23])    //0.01鍚堥摼澶瑰叿寤舵椂鍚堥摼  
+#define JH_CTHL_NL_PARAM_ZDP_Start_TIME      (10*user_datas[24])      //0.01鎸�姩鐩樺惎鍔ㄥ欢鏃�  
+#define JH_CTHL_NL_PARAM_ZDP_Stop_TIME       (10*user_datas[25])       //0.01鎸�姩鐩樺欢鏃跺仠姝� 
+#define JH_CTHL_NL_PARAM_XCX_LENTH           user_datas[26]       //0.01 灏忔彃閿€鎰熷簲鍚庡啀璧版爣鍑嗛暱搴�
+
+#define JH_CTHL_NL_PARAM_XCXWC_LENTH          user_datas[27]       //0.01 灏忔彃閿€鏍囧噯闀垮害杩囬暱鐨勮�宸�€� 
+#define JH_CTHL_NL_PARAM_TDFZ_LENTH          user_datas[28]       //0.01鎷栧甫鐢垫満鍙嶈浆闀垮害
+#define JH_CTHL_NL_PARAM_WLCDSHEZHI_LENTH   (10* user_datas[29])       //0.1鏃犳媺閾炬儏鍐靛啀璧伴暱搴﹁�缃�
+
+#define JH_CTHL_NL_PARAM_YCYCLE_PULSE       user_datas[30]//Y杞磋浆涓€鍦堣剦鍐叉暟  
+#define JH_CTHL_NL_PARAM_YCYCLE_LENGTH      user_datas[31]//Y杞� 鏁存暟 杞�竴鍦堟嫋甯﹀�闀� 
+
+#define JH_CTHL_NL_PARAM_CR_MODE      user_datas[32]//姘旂几绌垮叆(0)杩樻椂鐢垫満绌垮叆(1)
+//#define JH_CTHL_NL_PARAM_XXHT_Time           (10*user_datas[33])//0.01 鎻掗攢閫€鍥炴椂闂�
+#define JH_CTHL_NL_PARAM_XKDW_Speed           (user_datas[33])//鏂滃彛瀹氫綅閫熷害
+#define JH_CTHL_NL_PARAM_DXK_DELAY           (10*user_datas[34])//0.01 鎻掗攢閫€鍥炴椂闂�
+#define JH_CTHL_NL_PARAM_CXJZ_HT_DELAY        (10*user_datas[35])    //0.01鎻掗攢鍓嶅す鍏峰欢鏃跺悗閫€ 
+#define JH_CTHL_NL_PARAM_Y_MAX_LENTH        (user_datas[36])    //0.01 鍚堥摼鐢垫満鏈€澶ц�绋�
+#define JH_CTHL_NL_PARAM_LACHUBAOHU_LENTH        (user_datas[37])    //0.01 涓婃�瀹氫綅寤舵椂鍋滅數鏈�
+#define JH_CTHL_NL_PARAM_TDCR_LowSpeed     user_datas[38]  //鎷栧甫绌垮叆鎱㈤€熷害
+#define JH_CTHL_NL_PARAM_TDCR_LowSpeedLength user_datas[39]  //鎷栧甫绌垮叆鎱㈤€熻窛绂�
+#define JH_CTHL_NL_PARAM_HSLYDTL_DELAY        (10*user_datas[40])    //0.01 妯�€佹枡鍘熺偣寤舵椂鎺ㄦ枡
+#define JH_CTHL_NL_PARAM_UP_DOWN_OUT_SELECT  (user_datas[41])       //鎷夐摼绫诲瀷   0 鏍戣剛锛�1灏奸緳
+#define JH_CTHL_NL_PARAM_TuiDXM_Lenght  (user_datas[42])       //閫€椤舵枩鐮佷綅缃�
+#define JH_CTHL_NL_PARAM_GFJ_WorkMode  (user_datas[43])       //鍏�垎鑺傛搷浣滈€夋嫨
+#define JH_CTHL_NL_PARAM_GFJ_Length     (user_datas[44])       //鍏�垎鑺傞暱搴︽爣鍑�
+#define JH_CTHL_NL_PARAM_QianMaSelect  (user_datas[45])       //鍓嶇爜绫诲瀷閫夋嫨
+#define JH_CTHL_NL_PARAM_ZDP_AUTO       user_datas[46]   //鎸�姩鐩樻帶鍒�
+#define JH_CTHL_NL_PARAM_MOTOR_ENSelect       user_datas[47]   //鍚堥摼鐢垫満绫诲瀷  0 浼烘湇 锛�1 姝ヨ繘
+#define JH_CTHL_NL_PARAM_BoardSelect       user_datas[48]   //鏉垮潡绫诲瀷  0 DB15 锛�1 鏃燚B15
+#define JH_CTHL_NL_PARAM_SongDaiTime       (10*user_datas[49])   //閫佸甫鏃堕棿
+#define JH_CTHL_NL_PARAM_SongDaiEn       user_datas[50]   //閫佸甫閰嶇疆  0 鏃犻€佸甫 锛�1 鏈夐€佸甫
+#define JH_CTHL_NL_PARAM_CXSX_En       user_datas[51]   //鎻掗攢涓婁笅寮€鍏�  0 寮€ 锛�1 鍏�
+#define JH_CTHL_NL_PARAM_FKDW_LowSpeedLength user_datas[52]  //鏂瑰潡瀹氫綅鐨勬參閫熼暱搴�
+#define JH_CTHL_NL_PARAM_FKTD_ChangeSpeedPos user_datas[53]  //鎷栧甫鍙橀€熶綅缃�
+#define JH_CTHL_NL_PARAM_FDOff_Pos            user_datas[54]  //鍒嗗甫鍏抽棴浣嶇疆
+#define JH_CTHL_NL_PARAM_FD_EN            user_datas[55]  //鍒嗗甫寮€鍏�
+#define JH_CTHL_NL_PARAM_FKJD_DELAY            (10*user_datas[56])  //鏂瑰潡澶瑰甫寤舵椂
+#define JH_CTHL_NL_PARAM_FKJDFZ_DELAY        (10*user_datas[57])  //鏂瑰潡澶瑰甫寤舵椂
+#define JH_CTHL_NL_PARAM_XKMS_LENGTH        user_datas[58]  //鍓嶇爜绌垮叆鎱㈤€熼暱搴�
+
+
+#define JH_CTHL_NL_PARAM_CR_SPEED             user_datas[60]  //绌垮叆閫熷害
+#define JH_CTHL_NL_PARAM_CR_LENGTH             user_datas[61]  //绌垮叆闀垮害
+
+#define JH_CTHL_NL_FK_IN_SPEED                 user_datas[62]  //鏂瑰潡鎰熷簲鍚庢參閫熷害
+#define JH_CTHL_NL_XC_IN_LENGTH                 user_datas[63]  //灏忔彃鎰熷簲鍚庢參閫熼暱搴�
+#define JH_CTHL_NL_CX_IN_DW_LENGTH                 user_datas[64]  //灏忔彃鎰熷簲鍚庡啀璧伴暱搴�
+
+#define JH_CTHL_NL_PARAM_XCRU              user_datas[65]//浣滅洃鎺�
+#define JH_CTHL_NL_PARAM_CXCR              user_datas[66]//浣滅洃鎺�
+#define JH_CTHL_NL_PARAM_QMDW_LENGTH              user_datas[67]//寤舵椂杈撳嚭鍓嶇爜瀹氫綅
 #define JH_CTHL_NL_PARAM_CX_DELAY              (user_datas[68]*10)
-#define JH_CTHL_PARAM_DCGO_LENGTH            user_datas[69]//前码定位后再走长度
-#define JH_CTHL_PARAM_YaDai_LENGTH            user_datas[70]//提前压带
+#define JH_CTHL_PARAM_DCGO_LENGTH            user_datas[69]//鍓嶇爜瀹氫綅鍚庡啀璧伴暱搴�
+#define JH_CTHL_PARAM_YaDai_LENGTH            user_datas[70]//鎻愬墠鍘嬪甫
 //
-//伺服参数 180~190
-#define SERVO_PARAM_TRARR_LIMITMAX              user_datas[180]//伺服扭矩最大限制
-#define SERVO_PARAM_TRARR_LIMITMIN              user_datas[181]//伺服扭矩最小限制
-#define SERVO_PARAM_SPEED_DIFFER               user_datas[182]//速度差值
-#define SERVO_PARAM_ENCODE                     user_datas[190]//转换后的值
-#define SERVO_PARAM_ALARM                      user_datas[192]//转换后的值
-//横送检测时间
-#define HSLIAO_CHECK_TIME                      1//横送是检测穿头模和第一次合链是否在原位
-//输入 
-
-#define JH_CTHL_NL_START_IN            M0384 //X00  //启动
+//浼烘湇鍙傛暟 180~190
+#define SERVO_PARAM_TRARR_LIMITMAX              user_datas[180]//浼烘湇鎵�煩鏈€澶ч檺鍒�
+#define SERVO_PARAM_TRARR_LIMITMIN              user_datas[181]//浼烘湇鎵�煩鏈€灏忛檺鍒�
+#define SERVO_PARAM_SPEED_DIFFER               user_datas[182]//閫熷害宸�€�
+#define SERVO_PARAM_ENCODE                     user_datas[190]//杞�崲鍚庣殑鍊�
+#define SERVO_PARAM_ALARM                      user_datas[192]//杞�崲鍚庣殑鍊�
+//妯�€佹�娴嬫椂闂�
+#define HSLIAO_CHECK_TIME                      1//妯�€佹槸妫€娴嬬┛澶存ā鍜岀�涓€娆″悎閾炬槸鍚﹀湪鍘熶綅
+//杈撳叆 
+
+#define JH_CTHL_NL_START_IN            M0384 //X00  //鍚�姩
 #define JH_CTHL_NL_START_IN_UP         (M0384 && !OLDM384)//(X00 && !OLDX00)
-#define JH_CTHL_NL_STOP_IN             M0385 // X01  //停止
+#define JH_CTHL_NL_STOP_IN             M0385 // X01  //鍋滄�
 #define JH_CTHL_NL_STOP_IN_UP          (M0385 && !OLDM385)//(X01 && !OLDX01)
 #define JH_CTHL_NL_STOP_IN_DW          (!M0385 && OLDM385)//(!X01 && OLDX01)
-#define JH_CTHL_NL_FK_Check            M0386   //X02方块检测
+#define JH_CTHL_NL_FK_Check            M0386   //X02鏂瑰潡妫€娴�
 #define JH_CTHL_NL_FK_Check_UP          (M0386 && !OLDM386)
 #define JH_CTHL_NL_FK_Check_DW          (!M0386 && OLDM386)
 
-#define JH_CTHL_NL_XKSC_Limit_IN       M0387   //X03斜口上止到位
-#define JH_CTHL_NL_TLiao_Limit_IN      M0388   //X04推料到位
-#define JH_CTHL_NL_SafeDoor_IN         1//M0389   //X05安全门
-#define JH_CTHL_NL_HSLiao_Limit_IN     M0390   //X06横送料到位
-#define JH_CTHL_NL_HSLiao_Origin_IN    M0391   //X07横送料原位
-#define JH_CTHL_NL_JLiao_Limit_IN      M0392   //X10接料到位
-#define JH_CTHL_NL_CTM_Limit_IN        M0393   //X11穿头模到位
-#define JH_CTHL_NL_CTM_Origin_IN       M0394   //X12穿头模原位
-#define JH_CTHL_NL_First_CT_Origin_IN  M0395   //X13一次穿头原位
-#define JH_CTHL_NL_LTou_Check          M0396   //X14拉头缺料感应
-#define JH_CTHL_NL_CXSC_Limit_IN       M0397   //X15插稍上止感应
+#define JH_CTHL_NL_XKSC_Limit_IN       M0387   //X03鏂滃彛涓婃�鍒颁綅
+#define JH_CTHL_NL_TLiao_Limit_IN      M0388   //X04鎺ㄦ枡鍒颁綅
+#define JH_CTHL_NL_SafeDoor_IN         1//M0389   //X05瀹夊叏闂�
+#define JH_CTHL_NL_HSLiao_Limit_IN     M0390   //X06妯�€佹枡鍒颁綅
+#define JH_CTHL_NL_HSLiao_Origin_IN    M0391   //X07妯�€佹枡鍘熶綅
+#define JH_CTHL_NL_JLiao_Limit_IN      M0392   //X10鎺ユ枡鍒颁綅
+#define JH_CTHL_NL_CTM_Limit_IN        M0393   //X11绌垮ご妯″埌浣�
+#define JH_CTHL_NL_CTM_Origin_IN       M0394   //X12绌垮ご妯″師浣�
+#define JH_CTHL_NL_First_CT_Origin_IN  M0395   //X13涓€娆$┛澶村師浣�
+#define JH_CTHL_NL_LTou_Check          M0396   //X14鎷夊ご缂烘枡鎰熷簲
+#define JH_CTHL_NL_CXSC_Limit_IN       M0397   //X15鎻掔◢涓婃�鎰熷簲
 #define JH_CTHL_NL_CXSC_Limit_IN_UP    (M0397 && !OLDM397)
 #define JH_CTHL_NL_CXSC_Limit_IN_DW    (!M0397 && OLDM397)
-#define JH_CTHL_NL_CX_Limit_IN         M0398   //X16插稍到位感应
-#define JH_CTHL_NL_XKTD_Origin_IN      M0399   //X17斜口推带原位感应
-#define JH_CTHL_NL_CXXY_Limit_IN       M0400   //X20插稍下移到位
-#define JH_CTHL_NL_ZDP_IN              M0401   //X21振动盘
-#define JH_CTHL_NL_SF_ALR_IN           M0402   //X22伺服报警
-#define JH_CTHL_NL_SF_Origin_IN        M0403   //X23伺服原位(穿链原位)
-#define JH_CTHL_NL_Y_SF_ALR_IN           M0404   //X24伺服报警
-
-#define JH_CTHL_NL_SongDai_Origin_IN           M0405   //X25 送带原点
-#define JH_CTHL_NL_SongDai_Limit_IN           M0406   //X26 送带到位
-
-//#define JH_CTHL_NL_Test_Motor_P           M0404   //测试用
-//#define JH_CTHL_NL_Test_Motor_N        M0405   //测试用
-
-//输出
-#define JH_CTHL_NL_XKDW_VAVLE          M0304  //Y00 斜口定位电磁阀(方块勾针)            
-#define JH_CTHL_NL_XKTD_VAVLE          M0305  //Y01 斜口推带电磁阀(前码前后)
-#define JH_CTHL_NL_DXK_VAVLE           M0306  //Y02 顶斜口电磁阀(顶斜码)
-#define JH_CTHL_NL_GDXM_VAVLE          M0307  //Y03 固定斜码
-#define JH_CTHL_NL_FKGD_VAVLE          M0308  //Y04 方块固定电磁阀(方块定位)
-#define JH_CTHL_NL_CXSCDW_VAVLE        M0330  //Y05 插销上止定位电磁阀(小插勾针)
-#define JH_CTHL_NL_CXSX_VAVLE          M0310  //Y06 插销下移电磁阀(小插销上下)
-#define JH_CTHL_NL_CXQJD_VAVLE         M0311  //Y07 插销前夹带电磁阀(插销前锁带)
-//#define JH_CTHL_NL_CXHT_VAVLE          M0312       //Y10 摆臂
-#define JH_CTHL_NL_BB_VAVLE            M0312         //Y10 摆臂
-#define JH_CTHL_NL_HLJJ_VAVLE          M0313       //Y11 合链夹具电磁阀(夹子)
-#define JH_CTHL_NL_CXHDW_VAVLE         M0314       //Y12 插销后定位电磁阀(穿小插)
-#define JH_CTHL_NL_CXHJD_VAVLE         M0315       //Y13 插销后夹带电磁阀(穿小插锁带)
-#define JH_CTHL_NL_FKJD_VAVLE          M0316       //Y14 方块夹带电磁阀(大插锁带)
-#define JH_CTHL_NL_TLiao_VAVLE         M0317       //Y15 推料电磁阀
-#define JH_CTHL_NL_HSLiao_VAVLE        M0318       //Y16 横送料电磁阀
-#define JH_CTHL_NL_JLTou_VAVLE         M0319       //Y17 接拉头电磁阀
-#define JH_CTHL_NL_CTXMSS_VAVLE        M0320       //Y20 穿头下模上升电磁阀
-#define JH_CTHL_NL_FengDai_VAVLE       M0321       //Y21 分带电磁阀
-#define JH_CTHL_NL_ZhenDongPian_OUT    M0322       //Y22 振动盘启动
-#define JH_CTHL_NL_First_CT_VAVLE      M0323       //Y23 穿拉头电磁阀
-#define JH_CTHL_NL_MGuo_VAVLE          M0324       //Y24 码勾电磁阀
-#define JH_CTHL_NL_Run_DENG_VAVLE      M0325       //Y25 运行
-#define JH_CTHL_NL_Stop_DENG_VAVLE      M0327       //Y27 待机
-#define JH_CTHL_NL_ERROR_DENG_VAVLE      M0328       //Y30 报警
-
-#define JH_CTHL_NL_CXDWZ_VAVLE     M0326       //Y26 插销定位针(到位)电磁阀(小插卡位)
-
-#define JH_CTHL_NL_YaiDai_VAVLE     M0309   //Y27 告警清除
-
-#define JH_CTHL_NL_SongDai_VAVLE   M0330       //Y30 送带电机启动
-
-#define JH_CTHL_NL_HL_VAVLE            M0330       //Y25 合链电磁阀
-#define JH_CTHL_NL_ALARMCLR_VAVLE     M0330   //Y27 告警清除
-
-#define JH_CTHL_NL_Run_State       M0330   //Y31 运行灯
-#define JH_CTHL_NL_Stop_State      M0330   //Y32 停止灯
-
-//M0~M4全局固定使用
+#define JH_CTHL_NL_CX_Limit_IN         M0398   //X16鎻掔◢鍒颁綅鎰熷簲
+#define JH_CTHL_NL_XKTD_Origin_IN      M0399   //X17鏂滃彛鎺ㄥ甫鍘熶綅鎰熷簲
+#define JH_CTHL_NL_CXXY_Limit_IN       M0400   //X20鎻掔◢涓嬬Щ鍒颁綅
+#define JH_CTHL_NL_ZDP_IN              M0401   //X21鎸�姩鐩�
+#define JH_CTHL_NL_SF_ALR_IN           M0402   //X22浼烘湇鎶ヨ�
+#define JH_CTHL_NL_SF_Origin_IN        M0403   //X23浼烘湇鍘熶綅(绌块摼鍘熶綅)
+#define JH_CTHL_NL_Y_SF_ALR_IN           M0404   //X24浼烘湇鎶ヨ�
+
+#define JH_CTHL_NL_SongDai_Origin_IN           M0405   //X25 閫佸甫鍘熺偣
+#define JH_CTHL_NL_SongDai_Limit_IN           M0406   //X26 閫佸甫鍒颁綅
+
+//#define JH_CTHL_NL_Test_Motor_P           M0404   //娴嬭瘯鐢�
+//#define JH_CTHL_NL_Test_Motor_N        M0405   //娴嬭瘯鐢�
+
+//杈撳嚭
+#define JH_CTHL_NL_XKDW_VAVLE          M0304  //Y00 鏂滃彛瀹氫綅鐢电�闃€(鏂瑰潡鍕鹃拡)            
+#define JH_CTHL_NL_XKTD_VAVLE          M0305  //Y01 鏂滃彛鎺ㄥ甫鐢电�闃€(鍓嶇爜鍓嶅悗)
+#define JH_CTHL_NL_DXK_VAVLE           M0306  //Y02 椤舵枩鍙g數纾侀榾锛堥《鏂滅爜锛�
+#define JH_CTHL_NL_GDXM_VAVLE          M0307  //Y03 鍥哄畾鏂滅爜
+#define JH_CTHL_NL_FKGD_VAVLE          M0308  //Y04 鏂瑰潡鍥哄畾鐢电�闃€(鏂瑰潡瀹氫綅)
+#define JH_CTHL_NL_CXSCDW_VAVLE        M0330  //Y05 鎻掗攢涓婃�瀹氫綅鐢电�闃€(灏忔彃鍕鹃拡)
+#define JH_CTHL_NL_CXSX_VAVLE          M0310  //Y06 鎻掗攢涓嬬Щ鐢电�闃€(灏忔彃閿€涓婁笅)
+#define JH_CTHL_NL_CXQJD_VAVLE         M0311  //Y07 鎻掗攢鍓嶅す甯︾數纾侀榾(鎻掗攢鍓嶉攣甯�)
+//#define JH_CTHL_NL_CXHT_VAVLE          M0312       //Y10 鎽嗚噦
+#define JH_CTHL_NL_BB_VAVLE            M0312         //Y10 鎽嗚噦
+#define JH_CTHL_NL_HLJJ_VAVLE          M0313       //Y11 鍚堥摼澶瑰叿鐢电�闃€(澶瑰瓙)
+#define JH_CTHL_NL_CXHDW_VAVLE         M0314       //Y12 鎻掗攢鍚庡畾浣嶇數纾侀榾(绌垮皬鎻�)
+#define JH_CTHL_NL_CXHJD_VAVLE         M0315       //Y13 鎻掗攢鍚庡す甯︾數纾侀榾(绌垮皬鎻掗攣甯�)
+#define JH_CTHL_NL_FKJD_VAVLE          M0316       //Y14 鏂瑰潡澶瑰甫鐢电�闃€(澶ф彃閿佸甫)
+#define JH_CTHL_NL_TLiao_VAVLE         M0317       //Y15 鎺ㄦ枡鐢电�闃€
+#define JH_CTHL_NL_HSLiao_VAVLE        M0318       //Y16 妯�€佹枡鐢电�闃€
+#define JH_CTHL_NL_JLTou_VAVLE         M0319       //Y17 鎺ユ媺澶寸數纾侀榾
+#define JH_CTHL_NL_CTXMSS_VAVLE        M0320       //Y20 绌垮ご涓嬫ā涓婂崌鐢电�闃€
+#define JH_CTHL_NL_FengDai_VAVLE       M0321       //Y21 鍒嗗甫鐢电�闃€
+#define JH_CTHL_NL_ZhenDongPian_OUT    M0322       //Y22 鎸�姩鐩樺惎鍔�
+#define JH_CTHL_NL_First_CT_VAVLE      M0323       //Y23 绌挎媺澶寸數纾侀榾
+#define JH_CTHL_NL_MGuo_VAVLE          M0324       //Y24 鐮佸嬀鐢电�闃€
+#define JH_CTHL_NL_Run_DENG_VAVLE      M0325       //Y25 杩愯�
+#define JH_CTHL_NL_Stop_DENG_VAVLE      M0327       //Y27 寰呮満
+#define JH_CTHL_NL_ERROR_DENG_VAVLE      M0328       //Y30 鎶ヨ�
+
+#define JH_CTHL_NL_CXDWZ_VAVLE     M0326       //Y26 鎻掗攢瀹氫綅閽�(鍒颁綅)鐢电�闃€(灏忔彃鍗′綅)
+
+#define JH_CTHL_NL_YaiDai_VAVLE     M0309   //Y27 鍛婅�娓呴櫎
+
+#define JH_CTHL_NL_SongDai_VAVLE   M0330       //Y30 閫佸甫鐢垫満鍚�姩
+
+#define JH_CTHL_NL_HL_VAVLE            M0330       //Y25 鍚堥摼鐢电�闃€
+#define JH_CTHL_NL_ALARMCLR_VAVLE     M0330   //Y27 鍛婅�娓呴櫎
+
+#define JH_CTHL_NL_Run_State       M0330   //Y31 杩愯�鐏�
+#define JH_CTHL_NL_Stop_State      M0330   //Y32 鍋滄�鐏�
+
+//M0~M4鍏ㄥ眬鍥哄畾浣跨敤
 /*
 #define bRunning                    M0000
 #define bStart                      M0001
@@ -332,51 +332,51 @@ extern void JH_CTHL_NL_InitAction(void);
 #define bAlarmStop                  M0003
 #define bClearTotal                 M0004
 */
-#define JH_CTHL_NL_bTLiao          M0005      //手动推料
-#define JH_CTHL_NL_bHSL            M0006      //手动横送料     
-#define JH_CTHL_NL_bJLT            M0007       //接拉头
-#define JH_CTHL_NL_bMG             M0008       //码勾
-#define JH_CTHL_NL_bFKJD           M0009       //方块夹带
-#define JH_CTHL_NL_bXKTD           M0010       //斜口推带
-#define JH_CTHL_NL_bXKDW           M0011       //斜口定位
-#define JH_CTHL_NL_bCTXM           M0012       //穿头下模
-#define JH_CTHL_NL_bDXK            M0013       //顶斜口
-#define JH_CTHL_NL_bFKGD           M0014       //方块固定
-#define JH_CTHL_NL_bCXQJD          M0015       //插销前夹带
-#define JH_CTHL_NL_bCXSY           M0016       //插销下移电磁阀
-#define JH_CTHL_NL_bCXDWZ          M0017       //Y14 插销定位针电磁阀
-#define JH_CTHL_NL_bCXHJD          M0018       //Y15 插销后夹带电磁阀
-#define JH_CTHL_NL_bCXHDW          M0019       //Y16 插销后定位电磁阀(插销穿入)
-#define JH_CTHL_NL_bXKGD           M0020       //Y17 固定斜码电磁阀
-#define JH_CTHL_NL_bFirst_CT       M0021       //Y20 一次穿头电磁阀(穿拉头)
-#define JH_CTHL_NL_bHLJJ           M0022       //Y21 合链夹具电磁阀
-#define JH_CTHL_NL_bCXSCDW         M0023       //Y23 插销上止定位电磁阀
-#define JH_CTHL_NL_bCXHT           M0034       //Y10 插销后退
-#define JH_CTHL_NL_bHL             M0035        //合链电磁阀
-#define JH_CTHL_NL_bZDP            M0036        //振动盘
-#define JH_CTHL_NL_bBB             M0037        //摆臂
-#define JH_CTHL_NL_bFD             M0038        //分带
+#define JH_CTHL_NL_bTLiao          M0005      //鎵嬪姩鎺ㄦ枡
+#define JH_CTHL_NL_bHSL            M0006      //鎵嬪姩妯�€佹枡     
+#define JH_CTHL_NL_bJLT            M0007       //鎺ユ媺澶�
+#define JH_CTHL_NL_bMG             M0008       //鐮佸嬀
+#define JH_CTHL_NL_bFKJD           M0009       //鏂瑰潡澶瑰甫
+#define JH_CTHL_NL_bXKTD           M0010       //鏂滃彛鎺ㄥ甫
+#define JH_CTHL_NL_bXKDW           M0011       //鏂滃彛瀹氫綅
+#define JH_CTHL_NL_bCTXM           M0012       //绌垮ご涓嬫ā
+#define JH_CTHL_NL_bDXK            M0013       //椤舵枩鍙�
+#define JH_CTHL_NL_bFKGD           M0014       //鏂瑰潡鍥哄畾
+#define JH_CTHL_NL_bCXQJD          M0015       //鎻掗攢鍓嶅す甯�
+#define JH_CTHL_NL_bCXSY           M0016       //鎻掗攢涓嬬Щ鐢电�闃€
+#define JH_CTHL_NL_bCXDWZ          M0017       //Y14 鎻掗攢瀹氫綅閽堢數纾侀榾
+#define JH_CTHL_NL_bCXHJD          M0018       //Y15 鎻掗攢鍚庡す甯︾數纾侀榾
+#define JH_CTHL_NL_bCXHDW          M0019       //Y16 鎻掗攢鍚庡畾浣嶇數纾侀榾(鎻掗攢绌垮叆)
+#define JH_CTHL_NL_bXKGD           M0020       //Y17 鍥哄畾鏂滅爜鐢电�闃€
+#define JH_CTHL_NL_bFirst_CT       M0021       //Y20 涓€娆$┛澶寸數纾侀榾(绌挎媺澶�)
+#define JH_CTHL_NL_bHLJJ           M0022       //Y21 鍚堥摼澶瑰叿鐢电�闃€
+#define JH_CTHL_NL_bCXSCDW         M0023       //Y23 鎻掗攢涓婃�瀹氫綅鐢电�闃€
+#define JH_CTHL_NL_bCXHT           M0034       //Y10 鎻掗攢鍚庨€€
+#define JH_CTHL_NL_bHL             M0035        //鍚堥摼鐢电�闃€
+#define JH_CTHL_NL_bZDP            M0036        //鎸�姩鐩�
+#define JH_CTHL_NL_bBB             M0037        //鎽嗚噦
+#define JH_CTHL_NL_bFD             M0038        //鍒嗗甫
 
 #define JH_CTHL_NL_bTiaoShiStep    M0041
 #define JH_CTHL_NL_bTiaoShiMode    M0040
-#define JH_CTHL_NL_bOnceStart      M0042        //单一启动,做一条停止
-#define JH_CTHL_NL_bBanZiDong      M0047      //前码穿入
-#define JH_CTHL_NL_CXC             M0048        //小插穿入
-
-#define JH_CTHL_NL_bCLMotor_P      M0026       //穿链电机正转
-#define JH_CTHL_NL_bCLMotor_N      M0025       //穿链电机反转
-//下面为动作组合按键
-#define JH_CTHL_NL_bAutoZhuangLiao M0024       //自动装料
-#define JH_CTHL_NL_bCLMotor_O      M0027       //穿链电机定位原点
-#define JH_CTHL_NL_bCL_First       M0028       //一次穿链动作
-#define JH_CTHL_NL_bFKTDDW         M0029       //拖带方块定位
-#define JH_CTHL_NL_bFKCXTDDW       M0030       //拖带方块插销定位
-#define JH_CTHL_NL_bCXMotorDW      M0031       //插销电机前定位
-#define JH_CTHL_NL_bCXCR           M0032       //插销穿入(包含电机前定位,插销下移,后夹,后定位)
-#define JH_CTHL_NL_bMotorHL        M0033       //电机合链操作
-
-#define JH_CTHL_NL_bTDMotor_P      M0046       //穿链电机正转
-#define JH_CTHL_NL_bTDMotor_N      M0045       //穿链电机反转
+#define JH_CTHL_NL_bOnceStart      M0042        //鍗曚竴鍚�姩锛屽仛涓€鏉″仠姝�
+#define JH_CTHL_NL_bBanZiDong      M0047      //鍓嶇爜绌垮叆
+#define JH_CTHL_NL_CXC             M0048        //灏忔彃绌垮叆
+
+#define JH_CTHL_NL_bCLMotor_P      M0026       //绌块摼鐢垫満姝h浆
+#define JH_CTHL_NL_bCLMotor_N      M0025       //绌块摼鐢垫満鍙嶈浆
+//涓嬮潰涓哄姩浣滅粍鍚堟寜閿�
+#define JH_CTHL_NL_bAutoZhuangLiao M0024       //鑷�姩瑁呮枡
+#define JH_CTHL_NL_bCLMotor_O      M0027       //绌块摼鐢垫満瀹氫綅鍘熺偣
+#define JH_CTHL_NL_bCL_First       M0028       //涓€娆$┛閾惧姩浣�
+#define JH_CTHL_NL_bFKTDDW         M0029       //鎷栧甫鏂瑰潡瀹氫綅
+#define JH_CTHL_NL_bFKCXTDDW       M0030       //鎷栧甫鏂瑰潡鎻掗攢瀹氫綅
+#define JH_CTHL_NL_bCXMotorDW      M0031       //鎻掗攢鐢垫満鍓嶅畾浣�
+#define JH_CTHL_NL_bCXCR           M0032       //鎻掗攢绌垮叆(鍖呭惈鐢垫満鍓嶅畾浣�,鎻掗攢涓嬬Щ,鍚庡す,鍚庡畾浣�)
+#define JH_CTHL_NL_bMotorHL        M0033       //鐢垫満鍚堥摼鎿嶄綔
+
+#define JH_CTHL_NL_bTDMotor_P      M0046       //绌块摼鐢垫満姝h浆
+#define JH_CTHL_NL_bTDMotor_N      M0045       //绌块摼鐢垫満鍙嶈浆
 
 //
 #define QDCT_TOTAL_ADDR  8

File diff suppressed because it is too large
+ 966 - 993
Project/Project.dep


+ 2 - 2
Project/settings/Project.Debug.cspy.bat

@@ -25,7 +25,7 @@ if not "%~1" == "" goto debugFile
 
 @echo on 
 
-"C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "E:\1Works\1Softwork\GC23005\Project\settings\Project.Debug.general.xcl" --backend -f "E:\1Works\1Softwork\GC23005\Project\settings\Project.Debug.driver.xcl" 
+"C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "E:\1Works\GCfork\GC23005\Project\settings\Project.Debug.general.xcl" --backend -f "E:\1Works\GCfork\GC23005\Project\settings\Project.Debug.driver.xcl" 
 
 @echo off 
 goto end 
@@ -34,7 +34,7 @@ goto end
 
 @echo on 
 
-"C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "E:\1Works\1Softwork\GC23005\Project\settings\Project.Debug.general.xcl" "--debug_file=%~1" --backend -f "E:\1Works\1Softwork\GC23005\Project\settings\Project.Debug.driver.xcl" 
+"C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "E:\1Works\GCfork\GC23005\Project\settings\Project.Debug.general.xcl" "--debug_file=%~1" --backend -f "E:\1Works\GCfork\GC23005\Project\settings\Project.Debug.driver.xcl" 
 
 @echo off 
 :end

+ 2 - 2
Project/settings/Project.Debug.cspy.ps1

@@ -23,9 +23,9 @@
 
 if ($debugfile -eq "")
 {
-& "C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "E:\1Works\1Softwork\GC23005\Project\settings\Project.Debug.general.xcl" --backend -f "E:\1Works\1Softwork\GC23005\Project\settings\Project.Debug.driver.xcl" 
+& "C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "E:\1Works\GCfork\GC23005\Project\settings\Project.Debug.general.xcl" --backend -f "E:\1Works\GCfork\GC23005\Project\settings\Project.Debug.driver.xcl" 
 }
 else
 {
-& "C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "E:\1Works\1Softwork\GC23005\Project\settings\Project.Debug.general.xcl" --debug_file=$debugfile --backend -f "E:\1Works\1Softwork\GC23005\Project\settings\Project.Debug.driver.xcl" 
+& "C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2\common\bin\cspybat" -f "E:\1Works\GCfork\GC23005\Project\settings\Project.Debug.general.xcl" --debug_file=$debugfile --backend -f "E:\1Works\GCfork\GC23005\Project\settings\Project.Debug.driver.xcl" 
 }

+ 1 - 1
Project/settings/Project.Debug.general.xcl

@@ -2,7 +2,7 @@
 
 "C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2\arm\bin\armjlink2.dll" 
 
-"E:\1Works\1Softwork\GC23005\Project\iar_release\Exe\Project.out" 
+"E:\1Works\GCfork\GC23005\Project\iar_release\Exe\Project.out" 
 
 --plugin="C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2\arm\bin\armbat.dll" 
 

+ 16 - 0
Project/settings/Project_EncodingOverride.xml

@@ -116,4 +116,20 @@
         <path>E:\1Works\1Softwork\GC23005\User\user_app.h</path>
         <encoding>UTF-8</encoding>
     </override>
+    <override>
+        <path>E:\1Works\GCfork\GC23005\Machine\JinHongMachine\JHAction.c</path>
+        <encoding>UTF-8</encoding>
+    </override>
+    <override>
+        <path>E:\1Works\GCfork\GC23005\Machine\JinHongMachine\JHAction.h</path>
+        <encoding>UTF-8</encoding>
+    </override>
+    <override>
+        <path>E:\1Works\GCfork\GC23005\Machine\JinHongMachine\JHChuantou_NL_HeLian.c</path>
+        <encoding>UTF-8</encoding>
+    </override>
+    <override>
+        <path>E:\1Works\GCfork\GC23005\Machine\JinHongMachine\JHChuantou_NL_HeLian.h</path>
+        <encoding>UTF-8</encoding>
+    </override>
 </userOverrides>

File diff suppressed because it is too large
+ 8 - 8
Project/settings/project.wsdt


Some files were not shown because too many files changed in this diff