Merge pull request #99 from oh-dev/cleanedup-ed-install-fixes

Cleaned up ed-install-fixes
openhumanoids · Mar 5, 2016 · c5970b0 · c5970b0
2 parents 5b43f31 + b8a187e
commit c5970b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/software/config/signal_scope/l_arm_nasa.py b/software/config/signal_scope/l_arm_nasa.py
@@ -18,17 +18,17 @@
 
 # position plot
 addPlot(timeWindow=15, yLimits=[-2.75, 2.75])
-addSignals('NASA_COMMAND', msg.utime, msg.joint_position, joints, keyLookup=jn, colors=RGB_tuples)
-addSignals('NASA_STATE', msg.utime, msg.joint_position, joints, keyLookup=jn, colors=RGB_tuples_dark)
+addSignals('VAL_COMMAND', msg.utime, msg.joint_position, joints, keyLookup=jn, colors=RGB_tuples)
+addSignals('VAL_STATE', msg.utime, msg.joint_position, joints, keyLookup=jn, colors=RGB_tuples_dark)
 
 
 # velocity plot
 addPlot(timeWindow=15, yLimits=[-2.75, 2.75])
-addSignals('NASA_COMMAND', msg.utime, msg.joint_velocity, joints, keyLookup=jn, colors=RGB_tuples)
-addSignals('NASA_STATE', msg.utime, msg.joint_velocity, joints, keyLookup=jn, colors=RGB_tuples_dark)
+addSignals('VAL_COMMAND', msg.utime, msg.joint_velocity, joints, keyLookup=jn, colors=RGB_tuples)
+addSignals('VAL_STATE', msg.utime, msg.joint_velocity, joints, keyLookup=jn, colors=RGB_tuples_dark)
 
 
 # effort plot
 addPlot(timeWindow=15, yLimits=[-2.75, 2.75])
-addSignals('NASA_COMMAND', msg.utime, msg.joint_effort, joints, keyLookup=jn, colors=RGB_tuples)
-addSignals('NASA_STATE', msg.utime, msg.joint_effort, joints, keyLookup=jn, colors=RGB_tuples_dark)
+addSignals('VAL_COMMAND', msg.utime, msg.joint_effort, joints, keyLookup=jn, colors=RGB_tuples)
+addSignals('VAL_STATE', msg.utime, msg.joint_effort, joints, keyLookup=jn, colors=RGB_tuples_dark)
diff --git a/software/utils/drc_utils/python/plan_to_scope.py b/software/utils/drc_utils/python/plan_to_scope.py
@@ -9,8 +9,8 @@
 
 from drc.robot_plan_t import robot_plan_t
 from drc.plan_status_t import plan_status_t
-from drc.robot_state_t import robot_state_t
-from ipab.last_received_message_t import last_received_message_t
+from bot_core.robot_state_t import robot_state_t
+from ihmc.last_received_message_t import last_received_message_t
 
 def timestamp_now (): return int (time.time () * 1000000)