Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ros2_build_and_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ env:
apt-get install -y python3-ipython
dpkg -i fcat/.github/python3-cogapp_3.3.0-3_all.deb
cp fcat/.github/cog /usr/local/bin/
git clone --depth 1 --branch update-msgs https://github.com/nasa-jpl/fcat_msgs.git
git clone --depth 1 --branch v0.10.0 https://github.com/nasa-jpl/fcat_msgs.git

jobs:
# ============================================================================
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ endif()
include(FetchContent)
FetchContent_Declare(fastcat
GIT_REPOSITORY https://github.com/nasa-jpl/fastcat.git
GIT_TAG v0.13.13
GIT_TAG v0.13.15
)
FetchContent_MakeAvailable(fastcat)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ An optional ROS2 node called `fcat_srvs` is provided in this package. The purpos

## Quickstart

Due to a potential issue in the default RMW implementation, the cyclone vendor is recommended for use as of the Feb 2021 ROS2 Foxy release.
Due to a potential issue in the default RMW implementation, the cyclone vendor is recommended for use:

``` bash
sudo apt install ros-${ROS_DISTRO}-rmw-cyclonedds-cpp
Expand Down
8 changes: 6 additions & 2 deletions src/fcat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Fcat::Fcat(const rclcpp::NodeOptions& options)
RCLCPP_INFO(this->get_logger(), "loading Yaml from %s", fastcat_config_path.c_str());
YAML::Node node = YAML::LoadFile(fastcat_config_path);

if (!fcat_manager_.ConfigFromYaml(node)) {
if (!fcat_manager_.CreateConfigFromYaml(node)) {
throw std::invalid_argument("Fastcat Manager failed to process bus configuration YAML file.");
}

Expand Down Expand Up @@ -240,7 +240,11 @@ Fcat::Fcat(const rclcpp::NodeOptions& options)
loop_period_sec_ = 1.0 / fcat_manager_.GetTargetLoopRate();
last_time_ = this->now().seconds();
module_state_msg_.faulted = false;


if (!fcat_manager_.InitHardware()) {
throw std::invalid_argument("Fastcat Manager failed to initialize EtherCAT hardware.");
}

fcat_state_ = FcatState::INACTIVE;
StartProcessTimer();
fcat_state_ = FcatState::ACTIVE;
Expand Down
Loading