pets-device/JBao_Temp_Humi_Fan_FW
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除条件配置功能，修改成联动配置DP，并且增加31天运行记录，修改程序需求

Browse Source
This commit is contained in:
wuchuyuan
2026-09-03 10:21:11 +08:00
parent 5377186cfb
commit d56d8204e1
31 changed files with 1609 additions and 1430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dp_definition.json
+44 -89
View File
@@ -15,7 +15,7 @@
"len": 1,
"scale": 1.0,
"dir": "rw",
"description": "设备总开关",
"description": "设备总开关，预留",
"values": {
"0": "关",
"1": "开"
@@ -80,101 +80,29 @@
},
{
"id": 5,
"display_name": "条件使能",
"key": "cond_en",
"display_name": "联动删除",
"key": "linkage_delete",
"kind": "normal",
"type": "bool",
"len": 1,
"scale": 1.0,
"dir": "rw",
"description": "一键启动/禁用所有条件配置",
"description": "APP没用到此设备，则下发联动删除",
"values": {
"0": "关",
"1": "开"
"0": "无操作",
"1": "删除联动"
}
},
{
"id": 6,
"display_name": "条件配置1",
"key": "cond_config1",
"display_name": "联动配置",
"key": "linkage_config",
"kind": "normal",
"type": "raw",
"len": 7,
"len": 20,
"scale": 1.0,
"dir": "rw",
"description": "温度阈值：有符号int16大端，值=℃×10；Byte0=使能；Byte1-2=温度阈值；Byte3=湿度阈值；Byte4=持续分钟(0=立即)；Byte5=动作模式(0/1/2)；Byte6=Bit7-5温度比较, Bit4-2湿度比较, Bit1-0保留",
"values": {}
},
{
"id": 7,
"display_name": "条件配置2",
"key": "cond_config2",
"kind": "normal",
"type": "raw",
"len": 7,
"scale": 1.0,
"dir": "rw",
"description": "同上（7字节）",
"values": {}
},
{
"id": 8,
"display_name": "条件配置3",
"key": "cond_config3",
"kind": "normal",
"type": "raw",
"len": 7,
"scale": 1.0,
"dir": "rw",
"description": "同上（7字节）",
"values": {}
},
{
"id": 9,
"display_name": "条件配置4",
"key": "cond_config4",
"kind": "normal",
"type": "raw",
"len": 7,
"scale": 1.0,
"dir": "rw",
"description": "同上（7字节）",
"values": {}
},
{
"id": 10,
"display_name": "条件配置5",
"key": "cond_config5",
"kind": "normal",
"type": "raw",
"len": 7,
"scale": 1.0,
"dir": "rw",
"description": "同上（7字节）",
"values": {}
},
{
"id": 11,
"display_name": "条件配置6",
"key": "cond_config6",
"kind": "normal",
"type": "raw",
"len": 7,
"scale": 1.0,
"dir": "rw",
"description": "同上（7字节）",
"values": {}
},
{
"id": 12,
"display_name": "条件配置7",
"key": "cond_config7",
"kind": "normal",
"type": "raw",
"len": 7,
"scale": 1.0,
"dir": "rw",
"description": "同上（7字节）",
"description": "缸体编号为uint16，温度类型为int8，湿度和版本为uint8；\n后面应该会加上条件和动作，先预留13个Byte",
"values": {}
},
{
@@ -278,6 +206,33 @@
},
{
"id": 21,
"display_name": "运行记录",
"key": "run_record",
"kind": "normal",
"type": "raw",
"len": 124,
"scale": 1.0,
"dir": "ro",
"description": "31天的运行记录，每4个字节表示当天运行的总时长，单位：秒\nByte0-3：今天风扇运行的总时长\nByte4-7：昨天风扇运行的总时长\n.\n.\n.\nByte120-123：前30天风扇运行的总时长",
"values": {}
},
{
"id": 22,
"display_name": "心跳",
"key": "heartbeat",
"kind": "normal",
"type": "bool",
"len": 1,
"scale": 1.0,
"dir": "wo",
"description": "APP进入页面之后每5s下发一次心跳，当子设备12秒内没收到心跳\n则停止温湿度上报服务器，防止上报频繁，此条DP预留",
"values": {
"0": "无操作",
"1": "心跳"
}
},
{
"id": 23,
"display_name": "设备故障使能",
"key": "fault_en",
"kind": "normal",
@@ -289,7 +244,7 @@
"values": {}
},
{
"id": 22,
"id": 24,
"display_name": "设备故障",
"key": "fault_code",
"kind": "fault",
@@ -306,7 +261,7 @@
"level": 2
},
{
"id": 23,
"id": 25,
"display_name": "设备告警使能",
"key": "alarm_en",
"kind": "normal",
@@ -318,7 +273,7 @@
"values": {}
},
{
"id": 24,
"id": 26,
"display_name": "设备告警",
"key": "alarm_code",
"kind": "alarm",
@@ -331,7 +286,7 @@
"level": 1
},
{
"id": 25,
"id": 27,
"display_name": "恢复出厂设置",
"key": "factory_reset",
"kind": "normal",
@@ -345,7 +300,7 @@
}
},
{
"id": 26,
"id": 28,
"display_name": "预留DP1",
"key": "reserva_dp1",
"kind": "normal",
@@ -357,7 +312,7 @@
"values": {}
},
{
"id": 27,
"id": 29,
"display_name": "预留DP2",
"key": "reserva_dp2",
"kind": "normal",
@@ -369,7 +324,7 @@
"values": {}
},
{
"id": 28,
"id": 30,
"display_name": "预留DP3",
"key": "reserva_dp3",
"kind": "normal",