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

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

View File

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

View File

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

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>ֵ // 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> 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_RS485_HEATER)
&& (DevAction_Info->DevActionOutput[i].DevActionOutCfg.DevType != DEV_Virtual_ColorTemp) && (DevAction_Info->DevActionOutput[i].DevActionOutCfg.DevType != DEV_Virtual_ColorTemp)
&& (DevAction_Info->DevActionOutput[i].DevActionOutCfg.DevType != Dev_485_BLE_Music) && (DevAction_Info->DevActionOutput[i].DevActionOutCfg.DevType != Dev_485_BLE_Music)

View File

@@ -354,10 +354,10 @@ ARM Macro Assembler Page 6
00000000 00000000
Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M0 --apcs=interw Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M0 --apcs=interw
ork --depend=.\objects\startup_armcm0.d -o.\objects\startup_armcm0.o -I.\RTE\_T ork --depend=.\objects\startup_armcm0.d -o.\objects\startup_armcm0.o -I.\RTE\_T
EST -ID:\Keil_v5\Pack\Keil\WCH57x_DFP\1.1.0\Drivers\CMSIS\Device\WCH\CH57x\Incl EST -ID:\Keil_v5\ARM\PACK\Keil\WCH57x_DFP\1.1.0\Drivers\CMSIS\Device\WCH\CH57x\
ude -ID:\Keil_v5\ARM\CMSIS\Include --predefine="__MICROLIB SETA 1" --predefine= Include -ID:\Keil_v5\ARM\CMSIS\Include --predefine="__MICROLIB SETA 1" --predef
"__UVISION_VERSION SETA 529" --list=.\listings\startup_armcm0.lst ..\CORE\start ine="__UVISION_VERSION SETA 529" --list=.\listings\startup_armcm0.lst ..\CORE\s
up_ARMCM0.s tartup_ARMCM0.s

View File

@@ -1,170 +0,0 @@
<html>
<body>
<pre>
<h1><EFBFBD>Vision Build Log</h1>
<h2>Tool Versions:</h2>
IDE-Version: <20><>Vision V5.29.0.0
Copyright (C) 2019 ARM Ltd and ARM Germany GmbH. All rights reserved.
License Information: 11 ΢<><CEA2><EFBFBD>û<EFBFBD>, ΢<><CEA2><EFBFBD>й<EFBFBD>, LIC=9N0AE-5IIL6-C2RL6-D8CZW-3JTCV-CC614
Tool Versions:
Toolchain: MDK-ARM Professional Version: 5.29.0.0
Toolchain Path: D:\Keil_v5\ARM\ARMCC\Bin
C Compiler: Armcc.exe V5.06 update 6 (build 750)
Assembler: Armasm.exe V5.06 update 6 (build 750)
Linker/Locator: ArmLink.exe V5.06 update 6 (build 750)
Library Manager: ArmAr.exe V5.06 update 6 (build 750)
Hex Converter: FromElf.exe V5.06 update 6 (build 750)
CPU DLL: SARMCM3.DLL V5.29.0.0
Dialog DLL: DARMCM1.DLL V1.19.2.0
Target DLL: Segger\JL2CM3.dll V2.99.36.0
Dialog DLL: TARMCM1.DLL V1.14.1.0
<h2>Project:</h2>
D:\Project_git\BLV_C1F_Module\Pro\Pro-9999_Logic_CC_251027_0x5000_Simplify\MDK_PROJECT\project.uvprojx
Project File Date: 03/13/2026
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
Rebuild target 'TEST'
assembling startup_ARMCM0.s...
compiling CH57x_sys.c...
compiling CH57x_gpio.c...
compiling CH57x_int.c...
compiling CH57x_pwr.c...
compiling CH57x_clk.c...
compiling CH57x_adc.c...
compiling main.c...
compiling CH57x_uart0.c...
compiling CH57x_uart1.c...
compiling CH57x_timer0.c...
compiling CH57x_flash.c...
compiling CH57x_uart2.c...
compiling CH57x_uart3.c...
compiling CH57x_spi0.c...
compiling CH57x_spi1.c...
compiling Debug.c...
compiling rtc.c...
compiling dwg.c...
compiling key.c...
compiling Log_api.c...
compiling usart.c...
compiling flash.c...
compiling check_fun.c...
compiling SPI_SRAM.c...
compiling md5.c...
compiling rw_logging.c...
compiling DNS.c...
compiling BLV_Authorize.c...
compiling net.c...
compiling BLV_BUS_Dev_C5IOFun.c...
compiling BLV_485_Dev_CardFun.c...
compiling BLV_BUS_Dev_C5MusicFun.c...
compiling BLV_485_Protocol.c...
compiling PC_DeviceTest_Fun.c...
compiling BLV_NET_Function.c...
compiling BLV_485_Dev_TempFun.c...
compiling BLV_485_Dev_Touch_SwiFun.c...
compiling BLV_485_Dev_IrSendFun.c...
compiling BLV_485_Dev_C7TFun.c...
compiling BLV_485_Dev_A9RelayFun.c...
compiling BLV_485_Dev_PwmFun.c...
compiling BLV_485_Dev_TimeFun.c...
compiling BLV_Nor_DevFun.c...
compiling BLV_BUS_Dev_C12DimmingFun.c...
compiling BLV_485_Dev_XiaoBaoFun.c...
compiling BLV_485_Dev_TempT1Fun.c...
compiling BLV_All_Dev_Init.c...
compiling BLV_485_Dev_A9LDFun.c...
compiling BLV_485_Dev_RGB_Light_BeltFun.c...
compiling BLV_485_Dev_PirFun.c...
compiling BLV_485_Dev_LEDFun.c...
compiling BLV_485_Dev_SliderFun.c...
compiling BLV_485_Dev_AirRevealFun.c...
compiling BLV_485_Dev_A9IO_SwiFun.c...
compiling BLV_485_Dev_SwitchFun.c...
compiling BLV_485_Dev_AirDetectFun.c...
compiling BLV_485_Dev_A8PBFun.c...
compiling BLV_485_Dev_BLWMusicFun.c...
compiling BLV_Dev_Action.c...
compiling BLV_485_Dev_MusicFun.c...
compiling BLV_485_Dev_C5RelayFun.c...
compiling BLV_485_Dev_C12DimFun.c...
compiling BLV_485_Dev_IN_CH6.c...
compiling BLV_485_Dev_SwiRelayFun.c...
compiling BLV_485_Dev_HuaErSiFun.c...
compiling BLV_485_Dev_CardStateFun.c...
compiling BLV_TempPrompt_Action.c...
compiling BLV_485_Dev_LCDFun.c...
compiling BLV_485_Dev_FloorHeatFun.c...
compiling BLV_485_Dev_FreshAirFun.c...
compiling BLV_485_Dev_CLEDFloorHeatFun.c...
compiling BLV_485_Dev_CLEDFreshAirFun.c...
compiling BLV_485_Dev_BLWFloorHeatFun.c...
compiling BLV_485_Dev_BLWFreshAirFun.c...
compiling BLV_485_Dev_BLE_Music.c...
compiling BLV_485_Dev_ShangJingTianIrSendFun.c...
compiling BLV_485_Dev_EnergyMonitor.c...
compiling BLV_485_Dev_Rotary_SwitchFun.c...
compiling BLV_485_Dev_BLVP1_Rotary_Switch.c...
compiling BLV_485_Dev_BLVP2_Rotary_Switch.c...
compiling BLV_485_Dev_CurtainFun.c...
compiling BLV_485_Dev_BLWLockFun.c...
compiling BLV_485_Dev_BinShen_Curtain.c...
compiling BLV_485_Dev_ChuangJiaLockFun.c...
compiling BLV_485_Dev_WeixinLockFun.c...
compiling BLV_RF_GatewayHost.c...
compiling BLV_485_Dev_FreegoLockFun.c...
compiling BLV_485_Dev_PB20_Relay_Fun.c...
compiling BLV_485_Dev_PB20_LED_Fun.c...
compiling BLV_485_Dev_YangGeLockFun.c...
compiling BLV_485_Dev_PB20_Strip_Fun.c...
compiling BLV_Bus_Dev_PB20Fun.c...
compiling BLV_Nor_Dev_ServiceFun.c...
compiling BLV_Nor_Dev_LVoutputFun.c...
compiling BLV_Nor_Dev_LVinputFun.c...
compiling BLV_Nor_Dev_CurtainFun.c...
compiling BLV_Nor_Dev_HVoutFun.c...
compiling BLV_Nor_Dev_ColorTemp.c...
compiling BLV_Nor_Dev_NoCard.c...
compiling BLV_Nor_Dev_VirtualTimeFun.c...
compiling BLV_Nor_Dev_GlobalSet.c...
compiling BLV_Nor_Dev_CarbonFun.c...
compiling BLV_Nor_Dev_Scene_Restore.c...
compiling utils_hmac.c...
compiling aLiYun.c...
compiling BLV_Nor_Dev_VirtualCard.c...
compiling utils_md5.c...
compiling MQTTConnectClient.c...
compiling MQTTDeserializePublish.c...
compiling MQTTFormat.c...
compiling MQTTPacket.c...
compiling mqtt.c...
compiling Udp_Internal_Protocol.c...
compiling MQTTSerializePublish.c...
compiling MQTTSubscribeClient.c...
compiling MQTTUnsubscribeClient.c...
compiling BLV_Logic_Edit.c...
compiling utils_sha1.c...
linking...
Program Size: Code=221384 RO-data=8324 RW-data=812 ZI-data=22660
FromELF: creating hex file...
After Build - User command #1: D:\Keil_v5\\ARM\ARMCC\bin\fromelf.exe --bin --output=Bin\C1F_A_L4_45_260313_NM.bin .\Objects\C1F_A_L4_45_260313_NM.axf
".\Objects\C1F_A_L4_45_260313_NM.axf" - 0 Error(s), 0 Warning(s).
<h2>Software Packages used:</h2>
Package Vendor: Keil
http://wch.cn/pack/Keil.WCH57x_DFP.1.1.0.pack
Keil.WCH57x_DFP.1.1.0
WCH wireless MCU CH57x Family Support, Drivers and Examples
<h2>Collection of Component include folders:</h2>
.\RTE\_TEST
D:\Keil_v5\ARM\PACK\Keil\WCH57x_DFP\1.1.0\Drivers\CMSIS\Device\WCH\CH57x\Include
<h2>Collection of Component Files used:</h2>
Build Time Elapsed: 00:00:14
</pre>
</body>
</html>

View File

@@ -1,125 +0,0 @@
--cpu Cortex-M0
".\objects\main.o"
".\objects\startup_armcm0.o"
".\objects\ch57x_sys.o"
".\objects\ch57x_clk.o"
".\objects\ch57x_int.o"
".\objects\ch57x_pwr.o"
".\objects\ch57x_gpio.o"
".\objects\ch57x_adc.o"
".\objects\ch57x_flash.o"
".\objects\ch57x_timer0.o"
".\objects\ch57x_uart0.o"
".\objects\ch57x_uart1.o"
".\objects\ch57x_uart2.o"
".\objects\ch57x_uart3.o"
".\objects\ch57x_spi0.o"
".\objects\ch57x_spi1.o"
"..\SYSLIB\LIB\NET\CH57xNET.LIB"
".\objects\usart.o"
".\objects\debug.o"
".\objects\key.o"
".\objects\rtc.o"
".\objects\flash.o"
".\objects\dwg.o"
".\objects\check_fun.o"
".\objects\spi_sram.o"
".\objects\rw_logging.o"
".\objects\log_api.o"
".\objects\md5.o"
".\objects\dns.o"
".\objects\net.o"
".\objects\blv_net_function.o"
".\objects\blv_authorize.o"
".\objects\blv_485_protocol.o"
".\objects\pc_devicetest_fun.o"
".\objects\blv_bus_dev_c5iofun.o"
".\objects\blv_bus_dev_c5musicfun.o"
".\objects\blv_485_dev_cardfun.o"
".\objects\blv_485_dev_tempfun.o"
".\objects\blv_485_dev_touch_swifun.o"
".\objects\blv_485_dev_irsendfun.o"
".\objects\blv_485_dev_c7tfun.o"
".\objects\blv_485_dev_a9relayfun.o"
".\objects\blv_485_dev_pwmfun.o"
".\objects\blv_bus_dev_c12dimmingfun.o"
".\objects\blv_485_dev_xiaobaofun.o"
".\objects\blv_nor_devfun.o"
".\objects\blv_485_dev_tempt1fun.o"
".\objects\blv_485_dev_timefun.o"
".\objects\blv_all_dev_init.o"
".\objects\blv_dev_action.o"
".\objects\blv_485_dev_rgb_light_beltfun.o"
".\objects\blv_485_dev_pirfun.o"
".\objects\blv_485_dev_ledfun.o"
".\objects\blv_485_dev_a9ldfun.o"
".\objects\blv_485_dev_sliderfun.o"
".\objects\blv_485_dev_airrevealfun.o"
".\objects\blv_485_dev_airdetectfun.o"
".\objects\blv_485_dev_switchfun.o"
".\objects\blv_485_dev_a8pbfun.o"
".\objects\blv_485_dev_a9io_swifun.o"
".\objects\blv_485_dev_blwmusicfun.o"
".\objects\blv_485_dev_musicfun.o"
".\objects\blv_485_dev_c12dimfun.o"
".\objects\blv_485_dev_c5relayfun.o"
".\objects\blv_485_dev_swirelayfun.o"
".\objects\blv_485_dev_in_ch6.o"
".\objects\blv_485_dev_huaersifun.o"
".\objects\blv_485_dev_cardstatefun.o"
".\objects\blv_tempprompt_action.o"
".\objects\blv_485_dev_lcdfun.o"
".\objects\blv_485_dev_floorheatfun.o"
".\objects\blv_485_dev_freshairfun.o"
".\objects\blv_485_dev_cledfloorheatfun.o"
".\objects\blv_485_dev_cledfreshairfun.o"
".\objects\blv_485_dev_blwfreshairfun.o"
".\objects\blv_485_dev_blwfloorheatfun.o"
".\objects\blv_485_dev_ble_music.o"
".\objects\blv_485_dev_energymonitor.o"
".\objects\blv_485_dev_shangjingtianirsendfun.o"
".\objects\blv_485_dev_rotary_switchfun.o"
".\objects\blv_485_dev_blvp1_rotary_switch.o"
".\objects\blv_485_dev_blvp2_rotary_switch.o"
".\objects\blv_485_dev_curtainfun.o"
".\objects\blv_485_dev_binshen_curtain.o"
".\objects\blv_485_dev_blwlockfun.o"
".\objects\blv_485_dev_chuangjialockfun.o"
".\objects\blv_485_dev_weixinlockfun.o"
".\objects\blv_rf_gatewayhost.o"
".\objects\blv_485_dev_freegolockfun.o"
".\objects\blv_485_dev_yanggelockfun.o"
".\objects\blv_485_dev_pb20_led_fun.o"
".\objects\blv_485_dev_pb20_relay_fun.o"
".\objects\blv_485_dev_pb20_strip_fun.o"
".\objects\blv_bus_dev_pb20fun.o"
".\objects\blv_nor_dev_servicefun.o"
".\objects\blv_nor_dev_lvinputfun.o"
".\objects\blv_nor_dev_lvoutputfun.o"
".\objects\blv_nor_dev_hvoutfun.o"
".\objects\blv_nor_dev_curtainfun.o"
".\objects\blv_nor_dev_colortemp.o"
".\objects\blv_nor_dev_nocard.o"
".\objects\blv_nor_dev_virtualtimefun.o"
".\objects\blv_nor_dev_virtualcard.o"
".\objects\blv_nor_dev_carbonfun.o"
".\objects\blv_nor_dev_globalset.o"
".\objects\blv_nor_dev_scene_restore.o"
".\objects\udp_internal_protocol.o"
".\objects\blv_logic_edit.o"
".\objects\aliyun.o"
".\objects\mqtt.o"
".\objects\utils_hmac.o"
".\objects\utils_md5.o"
".\objects\utils_sha1.o"
".\objects\mqttconnectclient.o"
".\objects\mqttdeserializepublish.o"
".\objects\mqttformat.o"
".\objects\mqttpacket.o"
".\objects\mqttserializepublish.o"
".\objects\mqttsubscribeclient.o"
".\objects\mqttunsubscribeclient.o"
--library_type=microlib --strict --scatter ".\Objects\C1F_A_L4_45_260313_NM.sct"
--summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols
--info sizes --info totals --info unused --info veneers
--list ".\Listings\C1F_A_L4_45_260313_NM.map" -o .\Objects\C1F_A_L4_45_260313_NM.axf

View File

@@ -1,16 +0,0 @@
; *************************************************************
; *** Scatter-Loading Description File generated by uVision ***
; *************************************************************
LR_IROM1 0x00005000 0x00039000 { ; load region size_region
ER_IROM1 0x00005000 0x00039000 { ; load address = execution address
*.o (RESET, +First)
*(InRoot$$Sections)
.ANY (+RO)
.ANY (+XO)
}
RW_IRAM1 0x20000000 0x00008000 { ; RW data
.ANY (+RW +ZI)
}
}

View File

@@ -1,52 +0,0 @@
<html>
<body>
<pre>
<h1><EFBFBD>Vision Build Log</h1>
<h2>Tool Versions:</h2>
IDE-Version: <20><>Vision V5.29.0.0
Copyright (C) 2019 ARM Ltd and ARM Germany GmbH. All rights reserved.
License Information: cc cc, cc, LIC=8VRJ7-ET3GP-BSUYX-HQQMI-9SM4L-15YCH
Tool Versions:
Toolchain: MDK-ARM Plus Version: 5.29.0.0
Toolchain Path: D:\Keil_v5\ARM\ARMCC\Bin
C Compiler: Armcc.exe V5.06 update 6 (build 750)
Assembler: Armasm.exe V5.06 update 6 (build 750)
Linker/Locator: ArmLink.exe V5.06 update 6 (build 750)
Library Manager: ArmAr.exe V5.06 update 6 (build 750)
Hex Converter: FromElf.exe V5.06 update 6 (build 750)
CPU DLL: SARMCM3.DLL V5.29.0.0
Dialog DLL: DARMCM1.DLL V1.19.2.0
Target DLL: Segger\JL2CM3.dll V2.99.36.0
Dialog DLL: TARMCM1.DLL V1.14.1.0
<h2>Project:</h2>
E:\Git_Project_Sourcode\BLV_C1F_Module\Pro\Pro-9999_Logic_CC_251027_0x5000_Simplify\MDK_PROJECT\project.uvprojx
Project File Date: 03/27/2026
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
Build target 'TEST'
compiling BLV_485_Dev_TempFun.c...
linking...
Program Size: Code=221016 RO-data=8324 RW-data=812 ZI-data=22660
FromELF: creating hex file...
After Build - User command #1: D:\Keil_v5\\ARM\ARMCC\bin\fromelf.exe --bin --output=Bin\C1F_A_L4_45_260327_NM.bin .\Objects\C1F_A_L4_45_260327_NM.axf
".\Objects\C1F_A_L4_45_260327_NM.axf" - 0 Error(s), 0 Warning(s).
<h2>Software Packages used:</h2>
Package Vendor: Keil
http://wch.cn/pack/Keil.WCH57x_DFP.1.1.0.pack
Keil.WCH57x_DFP.1.1.0
WCH wireless MCU CH57x Family Support, Drivers and Examples
<h2>Collection of Component include folders:</h2>
.\RTE\_TEST
D:\Keil_v5\Pack\Keil\WCH57x_DFP\1.1.0\Drivers\CMSIS\Device\WCH\CH57x\Include
<h2>Collection of Component Files used:</h2>
Build Time Elapsed: 00:00:04
</pre>
</body>
</html>

File diff suppressed because one or more lines are too long

View File

@@ -47,23 +47,23 @@
/*485<38><35><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ*/ /*485<38><35><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ*/
#define RS485_Switch_Touch_Flag 0x01 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_Switch_Touch_Flag 0x01 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
#define RS485_Switch_A9IO_Flag 0x01 //A9IO<49><4F><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_Switch_A9IO_Flag 0x00 //A9IO<49><4F><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
#define RS485_Switch_Rotary_Flag 0x00 //<2F><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define RS485_Switch_Rotary_Flag 0x00 //<2F><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define RS485_Switch_Rotary_P1_Flag 0x00 //<2F><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><D0AD>1 #define RS485_Switch_Rotary_P1_Flag 0x00 //<2F><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><D0AD>1
#define RS485_Switch_Rotary_P2_Flag 0x00 //<2F><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><D0AD>2 #define RS485_Switch_Rotary_P2_Flag 0x00 //<2F><>ť<EFBFBD><C5A5><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Э<EFBFBD><D0AD>2
/*485<38><35><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EAB6A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/ /*485<38><35><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EAB6A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
/*485<38>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ*/ /*485<38>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ*/
#define RS485_Temp_T1_Flag 0x01 //T1<54>¿<EFBFBD><C2BF><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_Temp_T1_Flag 0x00 //T1<54>¿<EFBFBD><C2BF><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
#define RS485_Temp_T1_Flag_Si 0x01 //T1<54>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĺܣ<C4B9> #define RS485_Temp_T1_Flag_Si 0x01 //T1<54>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĺܣ<C4B9>
#define RS485_Temp_T1_Active_Flag 0x01 //T1<54>¿<EFBFBD><C2BF><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ĺ<EFBFBD> #define RS485_Temp_T1_Active_Flag 0x00 //T1<54>¿<EFBFBD><C2BF><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ĺ<EFBFBD>
#define RS485_Temp_C7T_Flag 0x00 //C7T<37>¿<EFBFBD><C2BF><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_Temp_C7T_Flag 0x00 //C7T<37>¿<EFBFBD><C2BF><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
/*485<38>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EAB6A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/ /*485<38>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EAB6A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
/*485<38>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ*/ /*485<38>¿<EFBFBD><C2BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ*/
#define RS485_LED_Flag 0x01 //485PWM<57><4D><EFBFBD><EFBFBD><EFBFBD>ܱ<EFBFBD><DCB1><EFBFBD> #define RS485_LED_Flag 0x01 //485PWM<57><4D><EFBFBD><EFBFBD><EFBFBD>ܱ<EFBFBD><DCB1><EFBFBD>
#define RS485_LED_PWM_Flag 0x00 //PWM0~10V<30><56><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_LED_PWM_Flag 0x00 //PWM0~10V<30><56><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
#define RS485_LED_A9LD_Flag 0x01 //A9LD<4C><44><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_LED_A9LD_Flag 0x00 //A9LD<4C><44><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
#define RS485_LED_Slider_Flag 0x00 //Slider<65><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_LED_Slider_Flag 0x00 //Slider<65><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
#define RS485_LED_A8PB_Flag 0x00 //A8PB<50><42><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_LED_A8PB_Flag 0x00 //A8PB<50><42><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
#define RS485_LED_C12Dim_Flag 0x01 //C12Dim<69><6D><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_LED_C12Dim_Flag 0x01 //C12Dim<69><6D><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
@@ -77,11 +77,11 @@
#define RS485_RFGatewayHost_Flag 0x00 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>BLW΢<57><CEA2><EFBFBD><EFBFBD> #define RS485_RFGatewayHost_Flag 0x00 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>BLW΢<57><CEA2><EFBFBD><EFBFBD>
/*485΢<35><CEA2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ*/ /*485΢<35><CEA2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ*/
#define RS485_WxLock_Flag 0x00 //΢<><CEA2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define RS485_WxLock_Flag 0x01 //΢<><CEA2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define RS485_WxLock_BLW_Flag 0x00 //BLW΢<57><CEA2><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_WxLock_BLW_Flag 0x00 //BLW΢<57><CEA2><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
#define RS485_WxLock_FreeGo_Flag 0x00 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>΢<EFBFBD><CEA2><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_WxLock_FreeGo_Flag 0x00 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>΢<EFBFBD><CEA2><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
#define RS485_WxLock_CJia_Flag 0x00 //<2F><><EFBFBD><EFBFBD>΢<EFBFBD><CEA2><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_WxLock_CJia_Flag 0x00 //<2F><><EFBFBD><EFBFBD>΢<EFBFBD><CEA2><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
#define RS485_WxLock_YangGe_Flag 0x00 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD> #define RS485_WxLock_YangGe_Flag 0x01 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><31><CEAA><EFBFBD><EFBFBD><30>ر<EFBFBD>
/*485΢<35><CEA2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EAB6A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/ /*485΢<35><CEA2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EAB6A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
#define RS485_AirDetect_Flag 0x00 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־ #define RS485_AirDetect_Flag 0x00 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־
@@ -89,9 +89,9 @@
#define RS485_TimeCtrl_Flag 0x00 //ʱ<><CAB1><EFBFBD><EFBFBD><E8B1B8><EFBFBD><EFBFBD> #define RS485_TimeCtrl_Flag 0x00 //ʱ<><CAB1><EFBFBD><EFBFBD><E8B1B8><EFBFBD><EFBFBD>
#define RS485_Curtain_Flag 0x01 //485<38><35><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define RS485_Curtain_Flag 0x00 //485<38><35><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define RS485_DOOYA_Curtain_Flag 0x00 //<2F><><EFBFBD>Ǵ<EFBFBD><C7B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define RS485_DOOYA_Curtain_Flag 0x00 //<2F><><EFBFBD>Ǵ<EFBFBD><C7B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define RS485_BinShen_Curtain_Flag 0x01 //<2F><><EFBFBD><EFBFBD><EAB4B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #define RS485_BinShen_Curtain_Flag 0x00 //<2F><><EFBFBD><EFBFBD><EAB4B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define RS485_CardState_Flag 0x01 //<2F>忨״̬ͬ<CCAC><CDAC> #define RS485_CardState_Flag 0x01 //<2F>忨״̬ͬ<CCAC><CDAC>
@@ -127,13 +127,13 @@
#define Dev_485_Pir_Flag 0x00 //485<38><35><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ #define Dev_485_Pir_Flag 0x00 //485<38><35><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ
#define Dev_Nor_ColorTemp 0x00 //ɫ<><C9AB>ģ<EFBFBD><C4A3> #define Dev_Nor_ColorTemp 0x01 //ɫ<><C9AB>ģ<EFBFBD><C4A3>
#define Dev_485_Card_Polling_Flag 0x01 //<2F><>ѵ<EFBFBD>˿<EFBFBD>485<38>忨ȡ<E5BFA8><C8A1> #define Dev_485_Card_Polling_Flag 0x01 //<2F><>ѵ<EFBFBD>˿<EFBFBD>485<38>忨ȡ<E5BFA8><C8A1>
#define Dev_485_Card_Active_Flag 0x01 //<2F><><EFBFBD><EFBFBD><EFBFBD>˿<EFBFBD>485<38>忨ȡ<E5BFA8><C8A1> #define Dev_485_Card_Active_Flag 0x00 //<2F><><EFBFBD><EFBFBD><EFBFBD>˿<EFBFBD>485<38>忨ȡ<E5BFA8><C8A1>
#define Dev_485_IrSend_Polling_Flag 0x01 //<2F><>ѵ<EFBFBD>˿ں<CBBF><DABA><EFBFBD>ת<EFBFBD><D7AA> - <20><><EFBFBD><EFBFBD><EFBFBD>ܿ<EFBFBD><DCBF><EFBFBD> #define Dev_485_IrSend_Polling_Flag 0x01 //<2F><>ѵ<EFBFBD>˿ں<CBBF><DABA><EFBFBD>ת<EFBFBD><D7AA> - <20><><EFBFBD><EFBFBD><EFBFBD>ܿ<EFBFBD><DCBF><EFBFBD>
#define Dev_485_IrSend_Active_Flag 0x01 //<2F><><EFBFBD><EFBFBD><EFBFBD>˿ں<CBBF><DABA><EFBFBD>ת<EFBFBD><D7AA> - <20><><EFBFBD><EFBFBD><EFBFBD>ܿ<EFBFBD><DCBF><EFBFBD> #define Dev_485_IrSend_Active_Flag 0x00 //<2F><><EFBFBD><EFBFBD><EFBFBD>˿ں<CBBF><DABA><EFBFBD>ת<EFBFBD><D7AA> - <20><><EFBFBD><EFBFBD><EFBFBD>ܿ<EFBFBD><DCBF><EFBFBD>
#define Dev_485_SJTIrSend_Polling_Flag 0x00 //<2F><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA> - <20>Ͼ<EFBFBD><CFBE>о<EFBFBD><D0BE><EFBFBD>IRACC<43><43><EFBFBD><EFBFBD><EFBFBD>յ<EFBFBD>Э<EFBFBD><D0AD>ת<EFBFBD><D7AA>ģ<EFBFBD><EFBFBD>ͺ<EFBFBD>:IRACC-SWG-H #define Dev_485_SJTIrSend_Polling_Flag 0x00 //<2F><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA> - <20>Ͼ<EFBFBD><CFBE>о<EFBFBD><D0BE><EFBFBD>IRACC<43><43><EFBFBD><EFBFBD><EFBFBD>յ<EFBFBD>Э<EFBFBD><D0AD>ת<EFBFBD><D7AA>ģ<EFBFBD><EFBFBD>ͺ<EFBFBD>:IRACC-SWG-H
#define Dev_485_SJTIrSend_Active_Flag 0x00 //<2F><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA> - <20>Ͼ<EFBFBD><CFBE>о<EFBFBD><D0BE><EFBFBD>IRACC<43><43><EFBFBD><EFBFBD><EFBFBD>յ<EFBFBD>Э<EFBFBD><D0AD>ת<EFBFBD><D7AA>ģ<EFBFBD><EFBFBD>ͺ<EFBFBD>:IRACC-SWG-H #define Dev_485_SJTIrSend_Active_Flag 0x00 //<2F><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA> - <20>Ͼ<EFBFBD><CFBE>о<EFBFBD><D0BE><EFBFBD>IRACC<43><43><EFBFBD><EFBFBD><EFBFBD>յ<EFBFBD>Э<EFBFBD><D0AD>ת<EFBFBD><D7AA>ģ<EFBFBD><EFBFBD>ͺ<EFBFBD>:IRACC-SWG-H
@@ -141,7 +141,7 @@
#define Dev_Nor_Carbon_Flag 0x01 //̼<><CCBC><EFBFBD><EFBFBD> #define Dev_Nor_Carbon_Flag 0x01 //̼<><CCBC><EFBFBD><EFBFBD>
#define Dev_Nor_Scene_Restore_Flag 0x00 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>滹ԭ #define Dev_Nor_Scene_Restore_Flag 0x01 //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>滹ԭ
#define Dev_Nor_GlobalSet_Flag 0x01 //ȫ<><C8AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,2025-07-14,YYW #define Dev_Nor_GlobalSet_Flag 0x01 //ȫ<><C8AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,2025-07-14,YYW

View File

@@ -18,6 +18,8 @@
-> () -> ()
5() 5()
6 - - OK 6 - - OK
70x0E
8 ->
``` ```