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

fix bat perc

Browse Source
This commit is contained in:
Sem van der Hoeven
2023-06-06 17:46:27 +02:00
parent 60d2aeaa7f
commit 3dea3e6d5d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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 not enabled</p> <p id="failsafe">Failsafe not activated</p>
</div> </div>
<!-- </div> --> <!-- </div> -->
</body> </body>
@@ -118,7 +118,7 @@
document.getElementById("speed").innerHTML = "Current speed (m/s): x: " + data.data.velocity[0] + " y: " + data.data.velocity[1] + " z: " + data.data.velocity[2]; document.getElementById("speed").innerHTML = "Current speed (m/s): x: " + data.data.velocity[0] + " y: " + data.data.velocity[1] + " z: " + data.data.velocity[2];
document.getElementById("position").innerHTML = "Current position (m): x: " + data.data.position[0] + " y: " + data.data.position[1] + " z: " + data.data.position[2]; document.getElementById("position").innerHTML = "Current position (m): x: " + data.data.position[0] + " y: " + data.data.position[1] + " z: " + data.data.position[2];
} else if (data.type == "FAILSAFE") { } else if (data.type == "FAILSAFE") {
document.getElementById("failsafe").innerHTML = "Failsafe: ENABLED"; document.getElementById("failsafe").innerHTML = "Failsafe: ACTIVATED";
document.getElementById("failsafe").style.backgroundColor = "red"; document.getElementById("failsafe").style.backgroundColor = "red";
document.getElementById("failsafe").style.color = "white"; document.getElementById("failsafe").style.color = "white";
document.getElementById("failsafe").style.textDecoration = "bold"; document.getElementById("failsafe").style.textDecoration = "bold";

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

@@ -143,7 +143,7 @@ class ApiListener(Node):
try: try:
self.status_data_received = True self.status_data_received = True
self.status_data['battery_percentage'] = msg.battery_percentage self.status_data['battery_percentage'] = msg.battery_percentage
if msg.battery_percentage < 0.15: if msg.battery_percentage < 15:
self.enable_failsafe( self.enable_failsafe(
"Battery level too low! Failsafe enabled to prevent damage to battery (" + str(msg.battery_percentage * 10) + "%)") "Battery level too low! Failsafe enabled to prevent damage to battery (" + str(msg.battery_percentage * 10) + "%)")
self.status_data['cpu_usage'] = msg.cpu_usage self.status_data['cpu_usage'] = msg.cpu_usage