Skip to content

Commit 37a57ff

Browse files
authored
added periodic greeting (#71)
* added periodic greeting * bump submodules * bump * bump submodule * format * bump hivemind * Added button topics * bump submodules * bump submodules
1 parent bab1924 commit 37a57ff

7 files changed

Lines changed: 11 additions & 7 deletions

File tree

contrib/HiveConnect

contrib/HiveMind

Submodule HiveMind updated 72 files

src/hive_mind_bridge/cmake/propolis.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function(propolis_fetch_populate)
99
FetchContent_Declare(
1010
${PROJECT_NAME}_propolis
1111
GIT_REPOSITORY https://github.com/SwarmUS/Propolis
12-
GIT_TAG bf4480f87de894bca5ba03bfee3cc9bc63c1369f
12+
GIT_TAG 1a482b8d81fb5c7f0cd571835dd4942d1a2e4488
1313
GIT_PROGRESS TRUE
1414
)
1515
set(PROPOLIS ${PROJECT_NAME}_propolis)

src/hive_mind_bridge/src/main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ int main(int argc, char** argv) {
8080
nodeHandle.advertise<swarmus_ros_navigation::MoveByMessage>(moveByTopic, 1000);
8181
ROS_INFO("Publishing moveBy on %s", moveByPublisher.getTopic().c_str());
8282
Logger logger;
83-
HiveMindBridge bridge(port, logger);
83+
HiveMindBridge bridge(port, logger, 5 * RATE_HZ);
8484

8585
// Register custom actions
8686
CallbackFunction moveByCallback = [&](CallbackArgs args) -> std::optional<CallbackReturn> {
@@ -116,6 +116,7 @@ int main(int argc, char** argv) {
116116
CallbackArgs returnArgs;
117117
returnArgs.push_back(FunctionCallArgumentDTO(isRobotOk));
118118

119+
ROS_INFO("Getting status: %d", isRobotOk);
119120
CallbackReturn cbReturn("getStatusReturn", returnArgs);
120121

121122
return cbReturn;

src/swarmus_ros_simulation/launch/reusable/simulated_agent.launch

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@
4646

4747
<param name="log_level" value="Warn" />
4848

49+
<!-- Buttons topic-->
50+
<param name="button_topic" type="str" value="/agent_$(arg agent_id)/user_interface/button" />
51+
4952
<!-- Interloc refresh rate in Hz -->
5053
<param name="interloc_refresh_rate" value="$(arg interloc_refresh_rate)" />
5154
</node>

src/swarmus_turtlebot/src/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ int main(int argc, char** argv) {
3131
ros::Rate loopRate(RATE_HZ);
3232
std::thread navigationThread(navigationLoop, &navigation, loopRate);
3333

34-
int port = nodeHandle->param("TCP_SERVER_PORT", 55551);
34+
int port = nodeHandle->param("TCP_SERVER_PORT", 7001);
3535
std::string moveByTopic = nodeHandle->param("moveByTopic", std::string("navigation/moveBy"));
3636
ros::Publisher moveByPublisher =
3737
nodeHandle->advertise<swarmus_turtlebot::MoveBy>(moveByTopic, 1000);
3838
Logger logger;
39-
HiveMindBridge bridge(port, logger);
39+
HiveMindBridge bridge(port, logger, 5 * RATE_HZ);
4040

4141
// Register custom actions
4242
CallbackFunction moveByCallback = [&](CallbackArgs args) -> std::optional<CallbackReturn> {

0 commit comments

Comments
 (0)