Commit 4a6b0d28 authored by bucyril's avatar bucyril
Browse files

Merge branch 'pps_project' of https://gitlab.ethz.ch/D-FaLL/D-FaLL-System into pps_project

parents 63b2a983 d60e3794
......@@ -90,7 +90,9 @@ class PPSRadioClient:
bag.write('stabilizerRoll', stabilizerRoll)
#publish battery voltage for GUI
status_pub.publish(std_msgs.msg.Float32(batteryVolt))
#cfbattery_pub.publish(std_msgs.Float32(batteryVolt.data))
cfbattery_pub.publish(batteryVolt)
def _logging_error(self, logconf, msg):
......@@ -169,8 +171,8 @@ if __name__ == '__main__':
#use this following two lines to connect without data from CentralManager
#radio_address = "radio://0/72/2M"
#rospy.loginfo("manual address loaded")
global status_pub
status_pub = rospy.Publisher("CrazyflieStatus")
global cfbattery_pub
cfbattery_pub = rospy.Publisher('cfbattery', Float32, queue_size=10)
global cf_client
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment