diff --git a/launch/jetson_erd.launch b/launch/jetson_erd.launch
index 78e236599..086fb79be 100644
--- a/launch/jetson_erd.launch
+++ b/launch/jetson_erd.launch
@@ -2,6 +2,13 @@
+
+
+
+
+
+
diff --git a/launch/jetson_science.launch b/launch/jetson_science.launch
index 87fe3576d..162e681c4 100644
--- a/launch/jetson_science.launch
+++ b/launch/jetson_science.launch
@@ -24,6 +24,13 @@
+
+
+
+
+
+
diff --git a/src/teleoperation/backend/consumers.py b/src/teleoperation/backend/consumers.py
index 21a060f53..724408d0e 100644
--- a/src/teleoperation/backend/consumers.py
+++ b/src/teleoperation/backend/consumers.py
@@ -16,7 +16,8 @@
from backend.ra_controls import send_ra_controls
from backend.sa_controls import send_sa_controls
from geometry_msgs.msg import Twist
-from mrover.msg import CalibrationStatus, ControllerState, StateMachineStateUpdate, LED, GPSWaypoint, WaypointType, NetworkBandwidth
+from mrover.msg import ( CalibrationStatus, ControllerState, StateMachineStateUpdate, LED, GPSWaypoint, WaypointType,
+ NetworkBandwidth, ScienceThermistors, Spectral, HeaterData )
from mrover.srv import EnableAuton
from sensor_msgs.msg import JointState, NavSatFix, RelativeHumidity, Temperature
from std_srvs.srv import SetBool
@@ -84,6 +85,13 @@ def connect(self) -> None:
self.forward_ros_topic("/sa_joint_data", JointState, "sa_joint")
self.forward_ros_topic("/corer_joint_data", JointState, "plunger")
self.forward_ros_topic("/network_bandwidth", NetworkBandwidth, "network")
+ self.forward_ros_topic("/science_thermistors", ScienceThermistors, "thermistor")
+ self.forward_ros_topic("science_spectral", Spectral, "spectral_data")
+ self.forward_ros_topic("/science_heater_state", HeaterData, "heater_states")
+
+ # eaterDataPublisher = std::make_unique(nh.advertise("science_heater_state", 1));
+ # spectralDataPublisher = std::make_unique(nh.advertise("science_spectral", 1));
+ # thermistorDataPublisher = std::make_unique(nh.advertise("science_thermistors", 1));
self.enable_auton = rospy.ServiceProxy("enable_auton", EnableAuton)
self.enable_teleop = rospy.ServiceProxy("enable_teleop", SetBool)
diff --git a/src/teleoperation/backend/sa_controls.py b/src/teleoperation/backend/sa_controls.py
index aad82a7e2..9b84bb886 100644
--- a/src/teleoperation/backend/sa_controls.py
+++ b/src/teleoperation/backend/sa_controls.py
@@ -33,7 +33,7 @@ class Joint(Enum):
JOINT_SCALES = [
-1.0,
- 1.0,
+ -1.0,
1.0,
1.0,
1.0,
diff --git a/src/teleoperation/frontend/src/components/AminoBenedict.vue b/src/teleoperation/frontend/src/components/AminoBenedict.vue
index 3b5a193ac..783586d68 100644
--- a/src/teleoperation/frontend/src/components/AminoBenedict.vue
+++ b/src/teleoperation/frontend/src/components/AminoBenedict.vue
@@ -101,19 +101,21 @@ export default {
}
}
else if (msg.type == 'thermistor') {
+ if(this.site == 0) return;
if (this.isAmino) {
- this.heaters[this.site].temp = msg.temps[this.site*2+1];
+ this.heaters[this.site].temp = msg.temps[this.site*2+1].temperature;
}
else {
- this.heaters[this.site].temp = msg.temps[this.site*2];
+ this.heaters[this.site].temp = msg.temps[this.site*2].temperature;
}
}
else if(msg.type == 'heater_states') {
+ if(this.site == 0) return;
if (this.isAmino) {
- this.heaters[this.site].state = msg.states[this.site*2+1];
+ this.heaters[this.site].state = msg.state[this.site*2+1];
}
else {
- this.heaters[this.site].state = msg.states[this.site*2];
+ this.heaters[this.site].state = msg.state[this.site*2];
}
}
},