sem/5g_drone_ROS2
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

change floats to ints

Browse Source
This commit is contained in:
Sem van der Hoeven
2023-06-05 21:21:03 +02:00
parent 56b8f147c4
commit 096cee40be
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/index.js
View File

@@ -18,7 +18,7 @@ var ws;
var api_connected = false; var api_connected = false;
function send_events_to_clients(data) { function send_events_to_clients(data) {
console.log("sending events to clients"); // console.log("sending events to clients");
sse_clients.forEach((client) => { sse_clients.forEach((client) => {
client.response.write("event: message\n"); client.response.write("event: message\n");
client.response.write("data:" + JSON.stringify(data) + "\n\n"); client.response.write("data:" + JSON.stringify(data) + "\n\n");

2
api/views/index.ejs
View File

@@ -55,7 +55,7 @@
<p id="control_mode"></p> <p id="control_mode"></p>
<p id="speed">Current speed</p> <p id="speed">Current speed</p>
<p id="position">Current position</p> <p id="position">Current position</p>
<p id="failsafe">Failsafe status</p> <p id="failsafe">Failsafe not enabled</p>
</div> </div>
<!-- </div> --> <!-- </div> -->
</body> </body>

8
src/api_communication/api_communication/api_listener.py
View File

@@ -138,8 +138,8 @@ class ApiListener(Node):
self.armed = msg.armed self.armed = msg.armed
self.status_data['control_mode'] = msg.control_mode self.status_data['control_mode'] = msg.control_mode
self.status_data['route_setpoint'] = msg.route_setpoint self.status_data['route_setpoint'] = msg.route_setpoint
self.status_data['velocity'] = [float(msg.velocity[0]), float(msg.velocity[1]), float(msg.velocity[2])] self.status_data['velocity'] = [int(msg.velocity[0]), int(msg.velocity[1]), int(msg.velocity[2])]
self.status_data['position'] = [float(msg.position[0]), float(msg.position[1]), float(msg.position[2])] self.status_data['position'] = [int(msg.position[0]), int(msg.position[1]), int(msg.position[2])]
self.status_data['failsafe'] = msg.failsafe self.status_data['failsafe'] = msg.failsafe
except Exception as e: except Exception as e:
self.get_logger().error( self.get_logger().error(
@@ -166,7 +166,7 @@ class ApiListener(Node):
Args: Args:
message (JSON object): the message to send message (JSON object): the message to send
""" """
self.get_logger().info(f'Publishing message: {message}') # self.get_logger().info(f'Publishing message: {message}')
if self.websocket is not None: if self.websocket is not None:
try: try:
await self.websocket.send(message) await self.websocket.send(message)
@@ -193,7 +193,7 @@ class ApiListener(Node):
""" """
while True: while True:
if len(self.message_queue) > 0 and self.websocket is not None: if len(self.message_queue) > 0 and self.websocket is not None:
self.get_logger().info("sending message") # self.get_logger().info("sending message")
asyncio.run(self.publish_message(self.message_queue.pop(0))) asyncio.run(self.publish_message(self.message_queue.pop(0)))
def start_api_thread(self): def start_api_thread(self):