Add batteryState to robot

equinor · Dec 16, 2024 · 19dbea3 · 19dbea3
1 parent 885e694
commit 19dbea3
Show file tree

Hide file tree

Showing 8 changed files with 1,433 additions and 0 deletions.
diff --git a/backend/api/Controllers/Models/RobotResponse.cs b/backend/api/Controllers/Models/RobotResponse.cs
@@ -20,6 +20,8 @@ public class RobotResponse
 
         public float BatteryLevel { get; set; }
 
+        public BatteryState? BatteryState { get; set; }
+
         public float? PressureLevel { get; set; }
 
         public IList<DocumentInfo> Documentation { get; set; }
@@ -59,6 +61,7 @@ public RobotResponse(Robot robot)
             CurrentInstallation = robot.CurrentInstallation;
             CurrentArea = robot.CurrentArea != null ? new AreaResponse(robot.CurrentArea) : null;
             BatteryLevel = robot.BatteryLevel;
+            BatteryState = robot.BatteryState;
             PressureLevel = robot.PressureLevel;
             Documentation = robot.Documentation;
             Host = robot.Host;

diff --git a/backend/api/Database/Models/Robot.cs b/backend/api/Database/Models/Robot.cs
@@ -74,6 +74,8 @@ public Robot(CreateRobotQuery createQuery, Installation installation, RobotModel
 
         public float BatteryLevel { get; set; }
 
+        public BatteryState? BatteryState { get; set; }
+
         public float? PressureLevel { get; set; }
 
         public bool IsRobotPressureTooLow()
@@ -176,4 +178,10 @@ public enum RobotCapabilitiesEnum
         docking_procedure,
         return_to_home,
     }
+
+    public enum BatteryState
+    {
+        Normal,
+        Charging,
+    }
 }
diff --git a/backend/api/EventHandlers/MqttEventHandler.cs b/backend/api/EventHandlers/MqttEventHandler.cs
@@ -431,6 +431,10 @@ private async void OnIsarBatteryUpdate(object? sender, MqttReceivedArgs mqttArgs
             _logger.LogDebug("Semaphore acquired for updating battery");
 
             var robot = await BatteryTimeseriesService.AddBatteryEntry(batteryStatus.BatteryLevel, batteryStatus.IsarId);
+            if (robot != null && robot.BatteryState != batteryStatus.BatteryState)
+            {
+                robot = await RobotService.UpdateRobotBatteryState(robot.Id, batteryStatus.BatteryState);
+            }
 
             _updateRobotSemaphore.Release();
             _logger.LogDebug("Semaphore released after updating battery");

diff --git a/backend/api/MQTT/MessageModels/IsarBattery.cs b/backend/api/MQTT/MessageModels/IsarBattery.cs
@@ -1,4 +1,5 @@
 using System.Text.Json.Serialization;
+using Api.Database.Models;
 
 namespace Api.Mqtt.MessageModels
 {
@@ -8,6 +9,9 @@ public class IsarBatteryMessage : MqttMessage
         [JsonPropertyName("battery_level")]
         public float BatteryLevel { get; set; }
 
+        [JsonPropertyName("battery_state")]
+        public BatteryState? BatteryState { get; set; }
+
         [JsonPropertyName("robot_name")]
         public string RobotName { get; set; }