mirror of
https://github.com/SHC-ASTRA/rover-ros2.git
synced 2026-04-20 11:51:16 -05:00
Compare commits
10 Commits
4c3a741589
...
fix-oversi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
333249677f | ||
|
|
fc2ba5f8d1 | ||
|
|
77d35949e9 | ||
|
|
be4fbf124d | ||
|
|
bfeae04e64 | ||
|
|
7d80ad1ab5 | ||
|
|
dfabd6c330 | ||
|
|
b892bfc631 | ||
|
|
caf61f61a8 | ||
|
|
a96aa6a409 |
8
flake.lock
generated
8
flake.lock
generated
@@ -24,16 +24,16 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1770108954,
|
"lastModified": 1775216071,
|
||||||
"narHash": "sha256-VBj6bd4LPPSfsZJPa/UPPA92dOs6tmQo0XZKqfz/3W4=",
|
"narHash": "sha256-PrPW70Fh1uLx3JxNV/NLeXjUhgfrZmi7ac8LJOlS0q4=",
|
||||||
"owner": "lopsided98",
|
"owner": "lopsided98",
|
||||||
"repo": "nix-ros-overlay",
|
"repo": "nix-ros-overlay",
|
||||||
"rev": "3d05d46451b376e128a1553e78b8870c75d7753a",
|
"rev": "197a2b55c4ed24f8b885a5b20b65f426fb6d57ca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "lopsided98",
|
"owner": "lopsided98",
|
||||||
"ref": "develop",
|
"ref": "master",
|
||||||
"repo": "nix-ros-overlay",
|
"repo": "nix-ros-overlay",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
description = "Development environment for ASTRA Anchor";
|
description = "Development environment for ASTRA Anchor";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nix-ros-overlay.url = "github:lopsided98/nix-ros-overlay/develop";
|
nix-ros-overlay.url = "github:lopsided98/nix-ros-overlay/master";
|
||||||
nixpkgs.follows = "nix-ros-overlay/nixpkgs"; # IMPORTANT!!!
|
nixpkgs.follows = "nix-ros-overlay/nixpkgs"; # IMPORTANT!!!
|
||||||
|
|
||||||
treefmt-nix = {
|
treefmt-nix = {
|
||||||
@@ -98,7 +98,8 @@
|
|||||||
);
|
);
|
||||||
|
|
||||||
nixConfig = {
|
nixConfig = {
|
||||||
extra-substituters = [ "https://ros.cachix.org" ];
|
# Cache to pull ros packages from
|
||||||
extra-trusted-public-keys = [ "ros.cachix.org-1:dSyZxI8geDCJrwgvCOHDoAfOm5sV1wCPjBkKL+38Rvo=" ];
|
extra-substituters = [ "https://ros.cachix.org" "https://attic.iid.ciirc.cvut.cz/ros" ];
|
||||||
|
extra-trusted-public-keys = [ "ros.cachix.org-1:dSyZxI8geDCJrwgvCOHDoAfOm5sV1wCPjBkKL+38Rvo=" "ros:JR95vUYsShSqfA1VTYoFt1Nz6uXasm5QrcOsGry9f6Q=" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
repo_root="$(git rev-parse --show-toplevel)"
|
repo_root="$(git rev-parse --show-toplevel)"
|
||||||
|
|
||||||
if [[ -z $repo_root ]]; then
|
if [[ -z $repo_root ]]; then
|
||||||
echo "script must be run from within the rover-ros2 repo" >&2
|
echo "script must be run from within a git repo" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -22,15 +22,15 @@ class Anchor(Node):
|
|||||||
"""
|
"""
|
||||||
Publishers:
|
Publishers:
|
||||||
* /anchor/from_vic/debug
|
* /anchor/from_vic/debug
|
||||||
- Every string received from the MCU is published here for debugging (String)
|
- Every string received from the MCU is published here for debugging
|
||||||
* /anchor/from_vic/core
|
* /anchor/from_vic/core
|
||||||
- VicCAN messages for Core node
|
- VicCAN messages for Core node
|
||||||
* /anchor/from_vic/arm
|
* /anchor/from_vic/arm
|
||||||
- VicCAN messages for Arm node (also receives digit messages)
|
- VicCAN messages for Arm node
|
||||||
* /anchor/from_vic/bio
|
* /anchor/from_vic/bio
|
||||||
- VicCAN messages for Bio node (also receives digit messages)
|
- VicCAN messages for Bio node
|
||||||
* /anchor/to_vic/debug
|
* /anchor/to_vic/debug
|
||||||
- String copy of all messages sent to the connector
|
- A string copy of the messages published to ./relay are published here
|
||||||
|
|
||||||
Subscribers:
|
Subscribers:
|
||||||
* /anchor/from_vic/mock_mcu
|
* /anchor/from_vic/mock_mcu
|
||||||
@@ -38,9 +38,10 @@ class Anchor(Node):
|
|||||||
* /anchor/to_vic/relay
|
* /anchor/to_vic/relay
|
||||||
- Core, Arm, and Bio publish VicCAN messages to this topic to send to the MCU
|
- Core, Arm, and Bio publish VicCAN messages to this topic to send to the MCU
|
||||||
* /anchor/to_vic/relay_string
|
* /anchor/to_vic/relay_string
|
||||||
- Send raw strings to connectors. Does not work for CANConnector
|
- Send raw strings to connectors. Does not work for connectors that require conversion (like CANConnector)
|
||||||
* /anchor/relay
|
* /anchor/relay
|
||||||
- (Deprecated) Legacy topic. Takes String, converts to VicCAN, then sends to connector
|
- Legacy method for talking to connectors. Takes String as input, but does not send the raw strings to connectors.
|
||||||
|
Instead, it converts them to VicCAN messages first.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
connector: Connector
|
connector: Connector
|
||||||
@@ -50,7 +51,7 @@ class Anchor(Node):
|
|||||||
|
|
||||||
logger = self.get_logger()
|
logger = self.get_logger()
|
||||||
|
|
||||||
# ROS2 parameter setup
|
# ROS2 Parameter Setup
|
||||||
|
|
||||||
self.declare_parameter(
|
self.declare_parameter(
|
||||||
"connector",
|
"connector",
|
||||||
@@ -85,7 +86,7 @@ class Anchor(Node):
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
# determine which connector to use. options are Mock, Serial, and CAN
|
# Determine which connector to use. Options are Mock, Serial, and CAN
|
||||||
connector_select = (
|
connector_select = (
|
||||||
self.get_parameter("connector").get_parameter_value().string_value
|
self.get_parameter("connector").get_parameter_value().string_value
|
||||||
)
|
)
|
||||||
@@ -125,9 +126,9 @@ class Anchor(Node):
|
|||||||
)
|
)
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
# ROS2 topic setup
|
# ROS2 Topic Setup
|
||||||
|
|
||||||
# publishers
|
# Publishers
|
||||||
self.fromvic_debug_pub_ = self.create_publisher( # only used by serial
|
self.fromvic_debug_pub_ = self.create_publisher( # only used by serial
|
||||||
String,
|
String,
|
||||||
"/anchor/from_vic/debug",
|
"/anchor/from_vic/debug",
|
||||||
@@ -148,14 +149,14 @@ class Anchor(Node):
|
|||||||
"/anchor/from_vic/bio",
|
"/anchor/from_vic/bio",
|
||||||
20,
|
20,
|
||||||
)
|
)
|
||||||
# debug publisher for outgoing messages
|
# Debug publisher
|
||||||
self.tovic_debug_pub_ = self.create_publisher(
|
self.tovic_debug_pub_ = self.create_publisher(
|
||||||
String,
|
String,
|
||||||
"/anchor/to_vic/debug",
|
"/anchor/to_vic/debug",
|
||||||
20,
|
20,
|
||||||
)
|
)
|
||||||
|
|
||||||
# subscribers
|
# Subscribers
|
||||||
self.tovic_sub_ = self.create_subscription(
|
self.tovic_sub_ = self.create_subscription(
|
||||||
VicCAN,
|
VicCAN,
|
||||||
"/anchor/to_vic/relay",
|
"/anchor/to_vic/relay",
|
||||||
|
|||||||
@@ -429,7 +429,7 @@ class CANConnector(Connector):
|
|||||||
class MockConnector(Connector):
|
class MockConnector(Connector):
|
||||||
def __init__(self, logger: RcutilsLogger, clock: Clock):
|
def __init__(self, logger: RcutilsLogger, clock: Clock):
|
||||||
super().__init__(logger, clock)
|
super().__init__(logger, clock)
|
||||||
# no hardware interface for MockConnector. publish to `/anchor/from_vic/mock_mcu` instead
|
# No hardware interface for MockConnector. Publish to `/anchor/from_vic/mock_mcu` instead.
|
||||||
|
|
||||||
def read(self) -> tuple[VicCAN | None, str | None]:
|
def read(self) -> tuple[VicCAN | None, str | None]:
|
||||||
return (None, None)
|
return (None, None)
|
||||||
|
|||||||
Reference in New Issue
Block a user