Skip to content

Commit 87cfbca

Browse files
committed
v1.5 first release
1 parent 011c5cf commit 87cfbca

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/control/master_slave.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,8 @@ namespace aris::control
343343
Master::~Master() = default;
344344
Master::Master(const std::string &name) :imp_(new Imp), Object(name)
345345
{
346+
this->registerType<aris::core::ObjectPool<Slave, aris::core::Object> >();
347+
346348
imp_->slave_pool_ = &add<aris::core::ObjectPool<Slave> >("slave_pool");
347349
imp_->mout_pipe_ = &add<aris::core::Pipe>("mout_pipe");
348350
imp_->lout_pipe_ = &add<aris::core::Pipe>("lout_pipe");

src/core/command.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ namespace aris::core
386386
CommandParser::~CommandParser() = default;
387387
CommandParser::CommandParser(const std::string &name) :Object(name)
388388
{
389+
this->registerType<aris::core::ObjectPool<Command> >();
389390
imp_->command_pool_ = &add<aris::core::ObjectPool<Command> >("command_pool");
390391
}
391392
ARIS_DEFINE_BIG_FOUR_CPP(CommandParser);

test/test_control/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
int main(int argc, char *argv[])
99
{
10-
//test_control_master_slave();
10+
test_control_master_slave();
1111
test_control_ethercat();
12-
//test_control_motion();
12+
test_control_motion();
1313

1414
std::cout << "test_control finished, press any key to continue" << std::endl;
1515
std::cin.get();

0 commit comments

Comments
 (0)