1、修复了打开激光后无法保持的bug
2、未注册时无需向网关发送已打开激光指令 3、开启和关闭激光时会向网关上报状态
This commit is contained in:
Submodule Module/LaserTracing_Debug updated: 03e1d001ef...5915837afb
@@ -101,8 +101,6 @@ typedef struct {
|
|||||||
bool CaliFlag; //标校标志位
|
bool CaliFlag; //标校标志位
|
||||||
|
|
||||||
int16_t Nonce; //随机数
|
int16_t Nonce; //随机数
|
||||||
|
|
||||||
bool LaserFlag;
|
|
||||||
}AppDetect_t;
|
}AppDetect_t;
|
||||||
extern AppDetect_t App;
|
extern AppDetect_t App;
|
||||||
|
|
||||||
|
|||||||
+6
-2
@@ -1821,12 +1821,16 @@ void GwRevLoopHandler(void)
|
|||||||
PrintfMess();
|
PrintfMess();
|
||||||
if(SGCP.LaserOnOff == true)
|
if(SGCP.LaserOnOff == true)
|
||||||
{
|
{
|
||||||
ToGWLaserRes(SGCP.LaserOnOff);
|
LASER1_ON();
|
||||||
|
if(SGCP.LoginOk == true)
|
||||||
|
ToGWLaserRes(SGCP.LaserOnOff);
|
||||||
DBG_LOG("The laser has been activated!\r\n");
|
DBG_LOG("The laser has been activated!\r\n");
|
||||||
}
|
}
|
||||||
else if(SGCP.LaserOnOff == false)
|
else if(SGCP.LaserOnOff == false)
|
||||||
{
|
{
|
||||||
ToGWLaserRes(SGCP.LaserOnOff);
|
LASER1_OFF();
|
||||||
|
if(SGCP.LoginOk == true)
|
||||||
|
ToGWLaserRes(SGCP.LaserOnOff);
|
||||||
DBG_LOG("The laser has been turned off!\r\n");
|
DBG_LOG("The laser has been turned off!\r\n");
|
||||||
}
|
}
|
||||||
SGCP.GWStatus = GW_STATUS_IDLE;
|
SGCP.GWStatus = GW_STATUS_IDLE;
|
||||||
|
|||||||
@@ -211,7 +211,6 @@ static void AppInit(void)
|
|||||||
App.AccRead_EndFlag = false;
|
App.AccRead_EndFlag = false;
|
||||||
App.UpdateOk = false;
|
App.UpdateOk = false;
|
||||||
App.CaliFlag = false;
|
App.CaliFlag = false;
|
||||||
App.LaserFlag = false;
|
|
||||||
|
|
||||||
App.Status = APP_STATUS_ON;
|
App.Status = APP_STATUS_ON;
|
||||||
App.TD1mSDelayCnt = (App.Nonce % 2000) + 2000;
|
App.TD1mSDelayCnt = (App.Nonce % 2000) + 2000;
|
||||||
@@ -383,11 +382,6 @@ static void AppLoopHandler(void)
|
|||||||
//App.Status = APP_STATUS_ACTION;//持续工作
|
//App.Status = APP_STATUS_ACTION;//持续工作
|
||||||
App.Status = APP_STATUS_OFF;
|
App.Status = APP_STATUS_OFF;
|
||||||
}
|
}
|
||||||
else if(App.LaserFlag == true)
|
|
||||||
{
|
|
||||||
App.LaserFlag = false;
|
|
||||||
LASER1_ON();
|
|
||||||
}
|
|
||||||
break;}
|
break;}
|
||||||
|
|
||||||
case APP_STATUS_WAIT_LOGIN:{
|
case APP_STATUS_WAIT_LOGIN:{
|
||||||
|
|||||||
Reference in New Issue
Block a user