lzq
/
deviceAccessLayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复 bug

master
lzq 2025-09-29 15:15:37 +08:00
parent 5534eb5e87
commit 36a25b8205
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/device_holder.cpp
View File

@ -3,7 +3,7 @@
#include "barrier/generic_barrier.h" #include "barrier/generic_barrier.h"
#include "platform_scale/generic_platform_scale.h" #include "platform_scale/generic_platform_scale.h"
#include "sound_column/generic_sound_column.h" #include "sound_column/generic_sound_column.h"
// #include "vidicon/generic_vidicon.h" #include "vidicon/generic_vidicon.h"
#include "vidicon/barrier_vidicon.h" #include "vidicon/barrier_vidicon.h"
namespace zsy namespace zsy
@ -40,8 +40,14 @@ namespace zsy
{ {
for (auto &config: configs) for (auto &config: configs)
{ {
// vidicons.emplace(config.sn, std::make_shared<GenericVidicon>(config)); if (config.type == 0)
vidicons.emplace(config.sn, std::make_shared<BarrierVidicon>(config)); {
vidicons.emplace(config.sn, std::make_shared<GenericVidicon>(config));
}
else
{
vidicons.emplace(config.sn, std::make_shared<BarrierVidicon>(config));
}
} }
} }

2
src/vidicon/vidicon_properties.h
View File

@ -12,6 +12,7 @@ namespace zsy
uint16_t port{8000}; uint16_t port{8000};
std::string username; std::string username;
std::string passwd; std::string passwd;
uint16_t type;
}; };
inline void from_json(const nlohmann::json &j, VidiconProperties &o) inline void from_json(const nlohmann::json &j, VidiconProperties &o)
@ -22,6 +23,7 @@ namespace zsy
PARSE_JSON(port, o.port); PARSE_JSON(port, o.port);
PARSE_JSON(username, o.username); PARSE_JSON(username, o.username);
PARSE_JSON(passwd, o.passwd); PARSE_JSON(passwd, o.passwd);
PARSE_JSON(type, o.type);
} }
} }