完善了显示,修改了复合管控的通信协议

This commit is contained in:
zjk
2025-06-03 20:05:08 +08:00
parent 2be7ce203e
commit 8fab3bdf06
21 changed files with 543 additions and 116 deletions
+7 -12
View File
@@ -2,17 +2,12 @@
Driver::Driver()
{
currentDriverTable = new DriverTable();
nextDriverTable = new DriverTable();
currentDriverTable.reset(new DriverTable());
nextDriverTable.reset(new DriverTable());
debug = false;
}
Driver::~Driver()
{
delete currentDriverTable;
delete nextDriverTable;
}
Driver::~Driver() = default;
void Driver::setDebug(bool debug)
{
@@ -734,17 +729,17 @@ std::string Driver::saveDriverTableToJson(const DriverTable* driverTable)
}
std::string Driver::getDriverTableJson()
{
return saveDriverTableToJson(currentDriverTable);
return saveDriverTableToJson(currentDriverTable.get());
}
std::string Driver::getSubDisCmdJson(const DriverTable* driverTable)
{
return saveDriverTableToJson(currentDriverTable);
return saveDriverTableToJson(currentDriverTable.get());
}
std::string Driver::getDriveStateJson(const DriverTable* driverTable)
{
return saveDriverTableToJson(currentDriverTable);
return saveDriverTableToJson(currentDriverTable.get());
}
@@ -960,4 +955,4 @@ int Driver::loadDriverTableFromJson(const std::string &strJson, DriverTable& tab
error_code = SafeReadUInt(root, "buoyage_uint8", table.buoyage);
return 0; // 返回0表示所有数据成功读取
}
}