Boonlive_RD_Embedded/BLV_C1F_Module
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修改执行方式0x0E冲突的问题，修改部分执行方式的备注

Browse Source 
1.修改温控器执行风速减时和其它设备执行方式0x0E冲突的问题
2.修改弱电输出、反馈灯的执行方式的备注描述，   闪烁 -> 取反
This commit is contained in:
lsj147
2026-03-27 11:21:15 +08:00
parent 5f2f16a918
commit 55fd9765db
22 changed files with 33677 additions and 70749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BasicCode/Drive/BLV_485_Protocol/BLV_485_Dev_SwitchFun.c
View File

@@ -374,7 +374,7 @@ void Dev_Swi_Output_Ctrl(uint32_t CfgDevAddIn, uint16_t DevInputAddr, uint32_t D
DevActionGlobal.SleepLight_State = 0x00;
}
break;
case 0x04: //<2F><>˸
case 0x04: //ȡ<EFBFBD><EFBFBD>
start = Rs485SwiInfo.DevSendBuf[DevOutputLoop];
if(0x01 == start)
{

2
BasicCode/Drive/BLV_Nor_Dev/BLV_Nor_Dev_LVoutputFun.c
View File

@@ -126,7 +126,7 @@ void BLW_LVoutput_Control_State(uint32_t CfgDevAddIn, uint16_t DevInputAddr, uin
{
case 0x01:state = OPEN;break;
case 0x02:state = CLOSE;break;
case 0x04: //<2F><>˸
case 0x04: //ȡ<EFBFBD><EFBFBD>
if(0x01 == DevLVoutputInfo.DevLVoutputState[DevOutputLoop])
{
state = 0x00;

2
BasicCode/Logic_Scheduling/BLV_Dev_Action/BLV_Dev_Action.c
View File

@@ -3995,7 +3995,7 @@ void Logic_Action_Output_DataGet(DEV_ACTION_INFO *DevAction_Info, uint8_t *DevCt
// DevAction_Info->DevActionOutput[i].DevActionOutCfg.DevCtrlState |= 0x6400; //<2F><><EFBFBD>ֽڸ<D6BD>ֵ
// }
if( ( (DEV_CTRLWAY_RELATESCENE == (DevAction_Info->DevActionOutput[i].DevActionOutCfg.DevCtrlState&0x00ff)) //<2F><>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀǰ<C4BF><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>غʹ<D8BA><CDB4><EFBFBD>
||(CFG_Dev_CtrlWay_Is_RelateBlink == (DevAction_Info->DevActionOutput[i].DevActionOutCfg.DevCtrlState&0x00ff))) //<2F><>Ӧ<EFBFBD><D3A6>˸ Ŀǰ<C4BF><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
|| ( (CFG_Dev_CtrlWay_Is_RelateBlink == (DevAction_Info->DevActionOutput[i].DevActionOutCfg.DevCtrlState&0x00ff)) && (DevAction_Info->DevActionOutput[i].DevActionOutCfg.DevType != DEV_RS485_TEMP) ) ) //<2F><>Ӧ<EFBFBD><D3A6>˸ Ŀǰ<C4BF><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
&& (DevAction_Info->DevActionOutput[i].DevActionOutCfg.DevType != DEV_RS485_HEATER)
&& (DevAction_Info->DevActionOutput[i].DevActionOutCfg.DevType != DEV_Virtual_ColorTemp)
&& (DevAction_Info->DevActionOutput[i].DevActionOutCfg.DevType != Dev_485_BLE_Music)