Mentalflow
/
ProtocolParser
mirror of https://github.com/mentalfl0w/ProtocolParser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CustomDataFrame: Bug fix.

This commit is contained in:
Mentalflow 2024-03-11 00:47:53 +08:00
parent 93c11e7ecf
commit d8b17bdf51
Signed by: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app_source/qml/components/FrameChooser.qml
View File

@ -34,7 +34,7 @@ Item {
Component.onCompleted: { Component.onCompleted: {
let result = Config.getArray('Protocol', 'data_frame_name') let result = Config.getArray('Protocol', 'data_frame_name')
if (result) if (result.length)
{ {
frame_model.clear() frame_model.clear()
var name_array=[],type_array=[] var name_array=[],type_array=[]

4
app_source/source/zigbeedataresolver.cpp
View File

@ -254,18 +254,20 @@ void ZigBeeDataResolver::des_port_parser(zigbee_protocol::ZigbeeFrame &zframe, b
QStringList name_list, type_list; QStringList name_list, type_list;
name_list = Config::instance()->getArray("Protocol", "data_frame_name").toStringList(); name_list = Config::instance()->getArray("Protocol", "data_frame_name").toStringList();
type_list = Config::instance()->getArray("Protocol", "data_frame_type").toStringList(); type_list = Config::instance()->getArray("Protocol", "data_frame_type").toStringList();
if (!name_list.length())
break;
note_text += "传感器数据："; note_text += "传感器数据：";
void* pdata = (void *)ddata->data; void* pdata = (void *)ddata->data;
for (uint8_t i = 0; i < name_list.length(); i++) for (uint8_t i = 0; i < name_list.length(); i++)
{ {
note_text += name_list[i]+ ":" + sensor_data_reader(&pdata,type_list[i]) + ' '; note_text += name_list[i]+ ":" + sensor_data_reader(&pdata,type_list[i]) + ' ';
} }
object.insert("note_text",QJsonValue(note_text));
break; break;
} }
default: default:
break; break;
} }
object.insert("note_text",QJsonValue(note_text));
if (QRandomGenerator::global()->bounded(2)!=0 && is_demo) if (QRandomGenerator::global()->bounded(2)!=0 && is_demo)
object.insert("decrypted_text", QJsonValue(QString(zdata.toHex(' ').toUpper()))); object.insert("decrypted_text", QJsonValue(QString(zdata.toHex(' ').toUpper())));
emit data_send("zigbee_recv_data_view",object); emit data_send("zigbee_recv_data_view",object);