Compare commits

..

No commits in common. "main" and "optical-embos-250916" have entirely different histories.

3 changed files with 87 additions and 294 deletions

View File

@ -279,9 +279,7 @@ void OpticalAsyncTask(void)
{
int rslt;
rslt = ERR_NONE;
#if(SCAN_TIMEINTERVAL == 1)
isEmptyMaterialSta(0);
#endif
#if (MODULE_LOOSE == 1) // 松料电机装置
if (((g_workCtrl.cursta.workStatus & WORK_STA_SIMULATE) == 0) &&
1 ) // 松料允许;非模拟状态
@ -310,9 +308,6 @@ int SendOpticalTask(void) //
if ((IsOptStoringLow2() == SENSOR_ON) ||
0)
{
#if(FEEDINGBACK_ADJUST == 1)
g_optWorkCtrl.feedingOpit = 1;
#endif
LooseMotorRevOn(); //松料电机 转动
//printf("LooseMotor run %d\r\n");
@ -323,39 +318,13 @@ int SendOpticalTask(void) //
if((IsOptStoringLow1() == SENSOR_ON) ||
0)
{
#if(FEEDINGBACK_ADJUST == 1)
if(g_optWorkCtrl.feedingOpit == 1)
{
#endif
LooseMotorRevOff(); // 松料电机 停止
#if(FEEDINGBACK_ADJUST == 1)
g_optWorkCtrl.feedingOpit = 0;
}
}
}
else
{
if(g_optWorkCtrl.collectingOpit == 1)
{
LooseMotorOff();
g_optWorkCtrl.collectingOpit = 0;
}
#endif
}
}
}
#if(FEEDINGBACK_ADJUST == 1)
//工作中
if((g_workCtrl.cursta.workStatus & WORK_STA_WORKING) != 0 ||
// (g_workCtrl.cursta.workStatus & WORK_STA_BUSY) != 0 ||
0)
{
if(IsOptStoringLow1() == SENSOR_ON)
{
g_optWorkCtrl.collectingOpit = 1;
LooseMotorOn();
}
}
#endif
//工作中光纤储料低位1没触发且送料电机转动时启动松料电机
return err;
}
@ -364,7 +333,7 @@ int SendOpticalTask(void) //
void OpticalTimerTask(void)
{
SendStatus(1); // 发送状态
// OperatorTaskWhenRun(0);
OperatorTaskWhenRun(0);
}
int OpticalCloseAll(void)
@ -388,17 +357,11 @@ int sendOpticalTaskWhenRun(void) //
//光纤储料低位1/2触发开始松料
int err = ERR_NONE;
#if(FEEDINGBACK_ADJUST == 1)
if(g_optWorkCtrl.pointOpit == 1)
{
#endif
if ((IsOptStoringLow2() == SENSOR_ON) ||
(IsOptStoringLow1() != SENSOR_ON) ||
0)
{
#if(FEEDINGBACK_ADJUST == 1)
g_optWorkCtrl.feedingOpit = 1;
#endif
LooseMotorRevOn(); //松料电机 转动
//printf("LooseMotor run %d\r\n");
@ -410,52 +373,11 @@ int sendOpticalTaskWhenRun(void) //
0)
{
LooseMotorRevOff(); // 松料电机 停止
#if(FEEDINGBACK_ADJUST == 1)
g_optWorkCtrl.feedingOpit = 0;
#endif
}
}
#if(FEEDINGBACK_ADJUST == 1)
}
else
{
if ((IsOptStoringLow2() == SENSOR_ON) ||
0)
{
g_optWorkCtrl.feedingOpit = 1;
LooseMotorRevOn(); //松料电机 转动
//工作中光纤储料低位1没触发且送料电机转动时启动松料电机
//printf("LooseMotor run %d\r\n");
//DelayRef(300);
}
else
{
if((IsOptStoringLow1() == SENSOR_ON) ||
0)
{
if(g_optWorkCtrl.feedingOpit == 1)
{
LooseMotorRevOff(); // 松料电机 停止
g_optWorkCtrl.feedingOpit = 0;
}
else
{
g_optWorkCtrl.collectingOpit = 1;
LooseMotorOn();
}
}
else
{
if(g_optWorkCtrl.collectingOpit == 1)
{
LooseMotorOff();
g_optWorkCtrl.collectingOpit = 0;
}
}
}
}
#endif
return err;
}
#if(MATERIAL_SCAN == 1)
@ -466,7 +388,6 @@ int isEmptyMaterialSta(u16 len)//
{
if(g_optWorkCtrl.IsNoMaterialEn == 1)
{
#if(SCAN_TIMEINTERVAL == 0)
// //情况1
// if(IsEmptyMaterial() == SENSOR_ON)
// {
@ -486,6 +407,7 @@ int isEmptyMaterialSta(u16 len)//
g_optWorkCtrl.IsNoMaterialScanLen = g_pOpticalMcPara->materialFreeScanNum;//断线检测扫描次数复位
g_optWorkCtrl.IsNoMaterialFlag = 2;
}
//情况3
if((IsEmptyMaterial() != SENSOR_ON))
{
@ -513,48 +435,8 @@ int isEmptyMaterialSta(u16 len)//
g_optWorkCtrl.IsNoMaterialFlag = 2;
return STA_NORMAL_STOP;
}
#else
if(g_optWorkCtrl.IsNoMaterialStart == 0)
{
g_optWorkCtrl.IsNoMaterialScanTime = GetMsSoftTimer();
g_optWorkCtrl.IsNoMaterialStart = 1;
}
if((IsEmptyMaterial() != SENSOR_ON))
{
g_optWorkCtrl.IsNoMaterialTime = 0;
g_optWorkCtrl.IsNoMaterialScanTime = GetMsSoftTimer();
}
u32 materTimer = GetMsSoftTimer();
if((materTimer - g_optWorkCtrl.IsNoMaterialScanTime + g_optWorkCtrl.IsNoMaterialTime) > 20000)
{
printf("curtime=%d,IsNoMaterialScanTime=%d, IsNoMaterialTime=%d\r\n",materTimer,g_optWorkCtrl.IsNoMaterialScanTime,g_optWorkCtrl.IsNoMaterialTime);
ReportError(ERR_NO_MATERIAL_ERROR);
g_optWorkCtrl.IsNoMaterialTime = 0;
g_optWorkCtrl.IsNoMaterialStart = 0;
g_optWorkCtrl.opticalSta = 1;//断线检测报警
return STA_NORMAL_STOP;
}
#endif
}
#if(SCAN_TIMEINTERVAL == 1)
else
{
if(g_optWorkCtrl.IsNoMaterialStart == 1)
{
g_optWorkCtrl.IsNoMaterialTime = GetMsSoftTimer() - g_optWorkCtrl.IsNoMaterialScanTime;
printf("IsNoMaterialTime=%d\r\n",g_optWorkCtrl.IsNoMaterialTime);
g_optWorkCtrl.IsNoMaterialStart = 0;
}
}
if(g_optWorkCtrl.opticalSta == 1)//断线检测报警
{
return ERR_NO_MATERIAL_ERROR;
}
#endif
}
return 0;
}
#endif
@ -3916,7 +3798,7 @@ int MoveMTS1BHStop_a(u32 para1,u32 para2) // ֹͣ
int MTP_1PulseToP1Pulse(s32 Pulse)
{
Pulse *= 8.488;// 8.488p/mm 电机每圈400脉冲外径15
Pulse *= 8.488;// 8.488p/mm
return Pulse;
}
@ -4887,11 +4769,8 @@ int MoveXYRS1P1ToWorkPos(DataItem * pCurDat, MotoSpd *pSpd, int rToSpinPosFlag,i
err = MoveXYR1S1P1ToPos(posx, posy, posr1, poss1, posp1, &spd, s1MotoRunFlag);
if(err == ERR_NONE)
{
g_optWorkCtrl.IsNoMaterialEn = 1;
}
}
return err;
}
@ -4912,7 +4791,7 @@ int MoveXYRS1P1SToWorkPos(DataItem * pCurDat, int uh) //
posr1 = PitkToRpp(g_workCtrl.workPos[MTR1_IDX]);
poss1 = g_workCtrl.workPos[MTS1_IDX];
posp1 = g_workCtrl.workPos[MTP1_IDX];
printf("work pos x:%d, y:%d\r\n",posx, posy);
g_optWorkCtrl.IsNoMaterialEn = 0;
if (uh != 0)
@ -4936,11 +4815,8 @@ int MoveXYRS1P1SToWorkPos(DataItem * pCurDat, int uh) //
err = MoveXYR1S1P1ToPos(posx, posy, posr1, poss1, posp1, NULL, 0);
}
if(err == ERR_NONE)
{
g_optWorkCtrl.IsNoMaterialEn = 1;
}
}
return err;
}
@ -5576,13 +5452,9 @@ int GetWorkPosFromIndex(void)
break; // 结束
}
ChangeWorkPos(&sewStep, 1);
#if(0)
printf("idx: %d\tposx = %d\tposy = %d\r\n",idx, g_workCtrl.workPos[MTX_IDX], g_workCtrl.workPos[MTY_IDX]);
DelayRef(10);
#endif
}
g_workCtrl.workAvaible = DATA_VALID; // 工作坐标有效标志
printf("start x:%d,y:%d \r\n",g_workCtrl.workPos[MTX_IDX],g_workCtrl.workPos[MTY_IDX]);
return 0;
}
@ -6596,9 +6468,6 @@ int OpticalWork(int mode)
g_optWorkCtrl.IsNoMaterialFlag = 2;
g_optWorkCtrl.IsNoMaterialScanLen = g_pOpticalMcPara->materialFreeScanNum;
g_optWorkCtrl.IsNoMaterialEn = 1;
#if(FEEDINGBACK_ADJUST == 1)
g_optWorkCtrl.pointOpit = 0;
#endif
err = OpticalCloseAll();
// 打开吸风
FanMotosOn(); // 吸风开
@ -6682,13 +6551,11 @@ int OpticalWork(int mode)
{
if(g_optWorkCtrl.usecomx == 1)
{
// printf("usecomx \r\n");
g_workCtrl.workPos[MTX_IDX] += g_pOpticalMcPara->startPosoffx;
g_optWorkCtrl.usecomx = 0;
}
if(g_optWorkCtrl.usecomy == 1)
{
// printf("usecomy \r\n");
g_workCtrl.workPos[MTY_IDX] += g_pOpticalMcPara->startPosoffy;
g_optWorkCtrl.usecomy = 0;
}
@ -6812,9 +6679,6 @@ int OpticalWork(int mode)
if(curDat.ctrl == DATA_OPTI)
{
curDat.ctrl = DATA_DRAWING;
#if(FEEDINGBACK_ADJUST == 1)
g_optWorkCtrl.pointOpit = 1;
#endif
}
if (GetDatIndex() < GetFileItemNums())
@ -6851,9 +6715,6 @@ int OpticalWork(int mode)
//布线结束后的动作
if((oldDat.ctrl == DATA_DRAWING || oldDat.ctrl == DATA_PRESSURE) && g_optWorkCtrl.motopreFlag == 1)
{
#if(FEEDINGBACK_ADJUST == 1)
g_optWorkCtrl.pointOpit = 0;
#endif
FixMatCylinderOff();//顶料松开
DelayRef(300);
UpClipMatClipCylinderOff();//上夹料松开
@ -6948,9 +6809,6 @@ int OpticalWork(int mode)
// 吐丝数据动作处理
if (curDat.ctrl == DATA_OPTI)
{
#if(FEEDINGBACK_ADJUST == 1)
g_optWorkCtrl.pointOpit = 1;
#endif
// g_optWorkCtrl.runSteps1 = 0;
g_optWorkCtrl.motoRunFlag = 1;
err = MoveR1ToPos(2500, NULL);//旋转到吐丝位置:90°
@ -7039,9 +6897,9 @@ int OpticalWork(int mode)
{
err = MoveU1ToPos(g_pOpticalMcPara->rkLowPos, NULL);//机头下降
PreMatCylinderOn();//压料
DelayRef(g_pOpticalMcPara->PreWaitTime);
DelayRef(200);
PreMatCylinderOff();//压料松开
DelayRef(100);
DelayRef(300);
UpClipMatClipCylinderOn();//上夹料夹料
}
if(err == ERR_NONE)
@ -7451,13 +7309,11 @@ int OpticalWork(int mode)
{
if(g_optWorkCtrl.usecomx == 1)
{
// printf("usecomx \r\n");
g_workCtrl.workPos[MTX_IDX] += g_pOpticalMcPara->startPosoffx;
g_optWorkCtrl.usecomx = 0;
}
if(g_optWorkCtrl.usecomy == 1)
{
// printf("usecomy \r\n");
g_workCtrl.workPos[MTY_IDX] += g_pOpticalMcPara->startPosoffy;
g_optWorkCtrl.usecomy = 0;
}
@ -7603,6 +7459,7 @@ int OpticalWork(int mode)
if(g_optWorkCtrl.opticalSta == 1)//断线检测报警
{
err = ERR_NO_MATERIAL_ERROR;
g_optWorkCtrl.opticalSta = 0;
}
ReportError(err);
@ -7637,9 +7494,9 @@ int OpticalWork(int mode)
if(g_optWorkCtrl.opticalSta == 1)//断线检测报警
{
err = ERR_NO_MATERIAL_ERROR;
g_optWorkCtrl.IsNoMaterialEn = 0;
g_optWorkCtrl.opticalSta = 0;
}
OpticalCloseAll();
UpClipMatClipCylinderOn(); // 上夹料开
@ -7703,7 +7560,6 @@ int OpticalWork(int mode)
err = OpticalGotoFinishPos();
}
g_optWorkCtrl.IsNoMaterialEn = 0;
g_workCtrl.cursta.workStatus &= ~(WORK_STA_BUSY|WORK_STA_WORKING); // 清除正在忙标志
@ -8209,11 +8065,11 @@ int FastJump(u32 idx)
{
err = STA_WORK_OVER; // 结束
}
/* else
else
{
err = MoveXYRS1P1ToWorkPos(&curDat, NULL, 0, 0);
}
printf("after move to work\r\n");*/
printf("after move to work\r\n");
}
}
@ -8283,7 +8139,7 @@ int OpticalStartWork(void)
ReportError(err);
// ReportError(ERR_NONE);
ReportError(ERR_NONE);
return err;
}
@ -8566,19 +8422,6 @@ void OutputByHand(u16 obj, u16 act, u16 para)
}
break;
}
case OT_FIXMAT: //顶料
{
if (act == UP_OPEN_ON)
{
FixMatCylinderOff(); // 顶料气缸
}
else // 关闭
{
FixMatCylinderOn(); // 顶料气缸
}
break;
}
case OT_BLOWING: // 放料
{
if (act == UP_OPEN_ON)

View File

@ -19,52 +19,6 @@
#include "shell.h"
#include "opticalpara.h"
#include "workctrl.h"
//-------------------------------功能模块配置------------------------------------------
#if (1)
#define MATERIAL_SCAN 1 // 无料检测(断线检测)
#define SCAN_TIMEINTERVAL 1 // 使用时间间隔检测传感器
#define FEEDINGBACK_ADJUST 1 // 使用送料电机反转调整
#define AFTERTURN_COMPEN 1 // 拐角补偿
#define XY_GAP_CONVERT 0 // 间隙补偿
#define MODULE_X 1 // X电机模块
#define X_FINDZERO_DIR 1 // = -1, X向负方向找零位传感器; = 1, X向正方向找零位传感器;
#define MODULE_Y 1 // Y电机模块
#define MODULE_FEED_LL 0 // 进料模块
#define MOTO_LIFT 0 // 电机升降
#define LIFT_U1 1 // 提升1模块
#define LIFT_U2 0 // 提升2模块
#define LIFT_U3 0 // 提升3模块
#define AIR_LIFT 0 // 气动升降
#define MOTO_TURN 1 // 电机旋转跟踪
#define TURN_R1 1 // 旋转1模块
#define TURN_R2 0 // 旋转2模块
#define TURN_R3 0 // 旋转3模块
#define MODULE_SEND 1 //送料电机模块
#define MODULE_PULL 1 //拉料电机模块
#define MODULE_LOOSE 1 //松料电机模块
#define MODULE_PUSH 0 //推料
#define POS_EN_NONE 0x0000
#define POS_EN_X 0x0001
#define POS_EN_Y 0x0002
#define POS_EN_XY 0x0003
#endif
//---------------------------------------------------------------------------------------------------
//----------------------------------------工作控制参数定义------------------------------------
typedef struct
@ -108,11 +62,6 @@ typedef struct
s32 IsNoMaterialScanLen; // 断线检测扫描长度
u8 IsNoMaterialFlag; // 断线标志 =0断线
u8 IsNoMaterialEn; // 断线检测扫描启动
#if(SCAN_TIMEINTERVAL == 1)
u32 IsNoMaterialStart; // 断线检测扫描启动
u32 IsNoMaterialScanTime; // 断线检测扫描时间
u32 IsNoMaterialTime; // 断线检测已扫描时间
#endif
//-----------------------
s32 encoder1Vale; // 编码器1值
s32 encoder2Vale; // 编码器2值
@ -130,11 +79,7 @@ typedef struct
// u8 useGapCorx; // 使用反向对接间隙补偿
// u8 useGapCory; // 使用反向对接间隙补偿
int spinLenOffset; // 偏移长度
#if(FEEDINGBACK_ADJUST == 1)
u8 feedingOpit; // 送光纤
u8 collectingOpit; // 收光纤
u8 pointOpit; // 布线中
#endif
}OptWorkCtrl;
OptWorkCtrl g_optWorkCtrl;
@ -154,23 +99,51 @@ typedef struct
OptBorder g_optBorder;
//----------------------------------------------------------------------------
#define FUNC_BIT0 0x01
#define FUNC_BIT1 0x02
#define FUNC_BIT2 0x04
#define FUNC_BIT3 0x08
#define FUNC_BIT4 0x10
#define FUNC_BIT5 0x20
#define FUNC_BIT6 0x40
#define FUNC_BIT7 0x80
#define FUNC_BIT8 0x100
#define FUNC_BIT9 0x200
#define FUNC_BIT10 0x400
#define FUNC_BIT11 0x800
#define FUNC_BIT12 0x1000
#define FUNC_BIT13 0x2000
#define FUNC_BIT14 0x4000
#define FUNC_BIT15 0x8000
#define FUNC_BIT16 0x10000
//-------------------------------功能模块配置------------------------------------------
#if (1)
#define MATERIAL_SCAN 1 // 无料检测(断线检测)
#define AFTERTURN_COMPEN 1 // 拐角补偿
#define XY_GAP_CONVERT 0 // 间隙补偿
#define MODULE_X 1 // X电机模块
#define X_FINDZERO_DIR 1 // = -1, X向负方向找零位传感器; = 1, X向正方向找零位传感器;
#define MODULE_Y 1 // Y电机模块
#define MODULE_FEED_LL 0 // 进料模块
#define MOTO_LIFT 1 // 电机升降
#define LIFT_U1 1 // 提升1模块
#define LIFT_U2 0 // 提升2模块
#define LIFT_U3 0 // 提升3模块
#define AIR_LIFT 0 // 气动升降
#define MOTO_TURN 1 // 电机旋转跟踪
#define TURN_R1 1 // 旋转1模块
#define TURN_R2 0 // 旋转2模块
#define TURN_R3 0 // 旋转3模块
#define MODULE_SEND 1 //送料电机模块
#define MODULE_PULL 1 //拉料电机模块
#define MODULE_LOOSE 1 //松料电机模块
#define POS_EN_NONE 0x0000
#define POS_EN_X 0x0001
#define POS_EN_Y 0x0002
#define POS_EN_XY 0x0003
#endif
//---------------------------------------------------------------------------------------------------
//-------------------------------------------输入输出信号---------------------------------------------
@ -240,15 +213,10 @@ OptBorder g_optBorder;
#define CORE_INPUT16_IDX DSS_DEF_IDX
#define CORE_INPUT16_BIT DSS_DEF_BIT
#if(AIR_LIFT == 1)
#define IN_ADJUST_LIFT_HIGH FUNC_BIT0 // 机头升降上位
#define IN_ADJUST_LIFT_LOW FUNC_BIT1 // 机头升降下位
#endif
#if(MODULE_PUSH == 1)
#define IN_ADJUST_PUSH_ON FUNC_BIT2 // 推料出位
#define IN_ADJUST_PUSH_OFF FUNC_BIT3 // 推料回位
#endif
// J16
#define IsBlowingCylinderPlaceOn() GetExInput(1)
#define CORE_INPUT17_IDX DSS_DEF_IDX
#define CORE_INPUT17_BIT DSS_DEF_BIT
//输出信号
// H1
@ -273,26 +241,8 @@ OptBorder g_optBorder;
#define Fan1MotoOn Output7On // 风机正转开
#define Fan1MotoOff Output7Off // 风机正转关
#define LooseMotorOn Output8On // 松料电机反转开
#define LooseMotorOff Output8Off // 松料电机反转关
#if(MAX_SUPPORT_EXTIO >= 1)
#define FixMatCylinderOn() do{SetExtOutputOn(1,FUNC_BIT0);}while(0)//顶料气缸开
#define FixMatCylinderOff() do{SetExtOutputOff(1,FUNC_BIT0);}while(0)//顶料气缸关
#else
#define FixMatCylinderOn() do{SetExOutput(1,0);}while(0)//顶料气缸开
#define FixMatCylinderOff() do{SetExOutput(1,1);}while(0)//顶料气缸关
#endif
#if(AIR_LIFT == 1)
#define HeadLiftUp() do{SetExtOutputOn(1,FUNC_BIT1);}while(0)//机头升降上升
#define HeadLiftDown() do{SetExtOutputOff(1,FUNC_BIT1);}while(0)//机头升降下降
#endif
#if(MODULE_PUSH == 1)
#define PushMatCylinderOn() do{SetExtOutputOn(1,FUNC_BIT2);}while(0)//推料气缸开
#define PushMatCylinderOff() do{SetExtOutputOff(1,FUNC_BIT2);}while(0)//推料气缸开
#endif
//输入输出信号名称
static const char g_opticalInputName[INPUT_NUM][INPUT_STR_LEN] =
{
@ -506,8 +456,8 @@ static const char g_opticalOutputName[OUTPUT_NUM][OUTPUT_STR_LEN] =
#define OT_OWNCLIP 0x0110 // 下夹料气缸控制 开/关
#define OT_UPCLIP 0x0111 // 上夹料气缸控制 开/关
#define OT_HEAD_SPIN 0x0112 // 机头旋转控制
#define OT_FIXMAT 0x0113 // 顶料气缸控制 开/关
#define OT_RESERVE1 0x0113 // 预留1
#define OT_RESERVE2 0x0114 // 预留2
#define OT_HEAD_UPDOWN 0x0119 // 机头升降控制

View File

@ -113,7 +113,7 @@ typedef struct
u32 rkLiftAng; // 加工抬刀角度,范围 0--18000单位0.01度
s32 opitEndPosOffset; // 吐丝结束位置偏移, 范围0--2000单位0.01mm
//155
u32 PreWaitTime; // 压料延时时间,范围 0--5000单位ms
u32 rev156;
u32 rev157;
u32 rev158;
u32 rev159;
@ -360,7 +360,7 @@ static const char * g_opticalMcParastrlist[PARA_NUM] =
"加工抬刀角度",
"吐丝结束位置偏移",
// 155
"压料延时时间",
"",
"",
"",
"",
@ -675,7 +675,7 @@ static const u32 g_defOpticalMcParaList[PARA_NUM][4] =
{PTYPE_U, 0, 18000, 0}, // u32 rkLiftAng; // 加工抬刀角度,范围 0--18000单位0.01度
{PTYPE_S, 0, 2000,1000}, // s32 opitEndPosOffset; // 吐丝结束位置偏移, 范围0--2000单位0.01mm
// 155
{PTYPE_U, 0, 5000, 200}, // u32 PreWaitTime; // 压料延时时间,范围 0--5000单位ms
{PTYPE_U, 0, 0, 0}, //
{PTYPE_U, 0, 0, 0}, //
{PTYPE_U, 0, 0, 0}, //
{PTYPE_U, 0, 0, 0}, //