diff --git a/src/bio_pkg/bio_pkg/bio_node.py b/src/bio_pkg/bio_pkg/bio_node.py index 26f50ad..8a11510 100644 --- a/src/bio_pkg/bio_pkg/bio_node.py +++ b/src/bio_pkg/bio_pkg/bio_node.py @@ -118,6 +118,10 @@ class SerialRelay(Node): def send_control(self, msg): + # CITADEL Control Commands + ################ + + # Chem Pumps, only send if not zero if msg.pumpID != 0: command = "can_relay_tovic,citadel,27," + str(msg.pumpID) + "," + str(msg.pumpAmount) + "\n" @@ -130,23 +134,32 @@ class SerialRelay(Node): if msg.servoID != 0: command = "can_relay_tovic,citadel,25," + str(msg.servoID) + "," + str(msg.servoPosition) + "\n" self.send_cmd(command) - #Always update for turning on/off + # LSS - command = "can_relay_tovic,citadel,26," + str(msg.lssDirection) + "\n" - self.send_cmd(command) - # Drill - command = "can_relay_tovic,citadel,19," + str(msg.drillDuty) + "\n" + command = "can_relay_tovic,citadel,24," + str(msg.lssDirection) + "\n" self.send_cmd(command) # Vibration Motor - command = "can_relay_tovic,citadel,37," + str(msg.vibrationMotor) + "\n" - self.send_cmd(command) - # Laser - command = "can_relay_tovic,citadel,28," + str(msg.laser) + "\n" - self.send_cmd(command) - # UV Light - command = "can_relay_tovic,citadel,38," + str(msg.uvLight) + "\n" + command = "can_relay_tovic,citadel,26," + str(msg.vibrationMotor) + "\n" self.send_cmd(command) + + + # FAERIE Control Commands + ################ + + # To be reviewed before use# + + # # Laser + # command = "can_relay_tovic,faerie,28," + str(msg.laser) + "\n" + # self.send_cmd(command) + + # # UV Light + # command = "can_relay_tovic,faerie,38," + str(msg.uvLight) + "\n" + # self.send_cmd(command) + + # # Drill + # command = "can_relay_tovic,faerie,19," + str(msg.drillDuty) + "\n" + # self.send_cmd(command) diff --git a/src/ros2_interfaces_pkg b/src/ros2_interfaces_pkg index 9c62a20..d2bdbed 160000 --- a/src/ros2_interfaces_pkg +++ b/src/ros2_interfaces_pkg @@ -1 +1 @@ -Subproject commit 9c62a208b2f001f39beaf326439a0cdc0b389d89 +Subproject commit d2bdbedb2685644fbf6588cd4ad0bd6112777a4a