Sync params between config page and params page (#1115)

Author: 1Blademaster

gcs/src/redux/middleware/socketMiddleware.js

@@ -247,6 +247,32 @@ const socketMiddleware = (store) => {
     store.dispatch(setServoPwmOutputs(outputs))
   }
 
+  function syncSingleParamInParamsSlice(paramId, value) {
+    if (!paramId || value === undefined) {
+      return
+    }
+
+    store.dispatch(
+      updateParamValue({
+        param_id: paramId,
+        param_value: value,
+      }),
+    )
+  }
+
+  function syncBatchParamsInParamsSlice(paramsList) {
+    if (!Array.isArray(paramsList) || paramsList.length === 0) {
+      return
+    }
+
+    for (const param of paramsList) {
+      const paramId = param?.param_id
+      const paramValue =
+        param?.param_value !== undefined ? param.param_value : param?.value
+      syncSingleParamInParamsSlice(paramId, paramValue)
+    }
+  }
+
   const incomingMessageHandler = (msg) => {
     switch (msg.mavpackettype) {
       case "VFR_HUD":
@@ -1235,6 +1261,7 @@ const socketMiddleware = (store) => {
                   value: msg.value,
                 }),
               )
+              syncSingleParamInParamsSlice(msg.param_id, msg.value)
             } else {
               showErrorNotification(msg.message)
             }
@@ -1266,6 +1293,7 @@ const socketMiddleware = (store) => {
           (msg) => {
             if (msg.success) {
               showSuccessNotification(msg.message)
+              syncSingleParamInParamsSlice(msg.data?.param_id, msg.data?.value)
             } else {
               showErrorNotification(msg.message)
             }
@@ -1279,6 +1307,7 @@ const socketMiddleware = (store) => {
           (msg) => {
             if (msg.success) {
               showSuccessNotification(msg.message)
+              syncSingleParamInParamsSlice(msg.data?.param_id, msg.data?.value)
             } else {
               showErrorNotification(msg.message)
             }
@@ -1348,6 +1377,7 @@ const socketMiddleware = (store) => {
                   value: msg.value,
                 }),
               )
+              syncSingleParamInParamsSlice(msg.param_id, msg.value)
             } else {
               showErrorNotification(msg.message)
             }
@@ -1374,6 +1404,7 @@ const socketMiddleware = (store) => {
                   }),
                 )
               }
+              syncBatchParamsInParamsSlice(msg.data)
             }
             store.dispatch(setRadioCalibrationModalOpen(false))
           },
@@ -1400,6 +1431,7 @@ const socketMiddleware = (store) => {
                   value: msg.value,
                 }),
               )
+              syncSingleParamInParamsSlice(msg.param_id, msg.value)
             } else {
               showErrorNotification(msg.message)
             }
@@ -1424,6 +1456,7 @@ const socketMiddleware = (store) => {
                   }),
                 )
               }
+              syncBatchParamsInParamsSlice(msg.data)
             }
           },
         )
@@ -1457,6 +1490,7 @@ const socketMiddleware = (store) => {
                   value: msg.value,
                 }),
               )
+              syncSingleParamInParamsSlice(msg.param_id, msg.value)
             } else {
               showErrorNotification(msg.message)
             }
@@ -1481,6 +1515,7 @@ const socketMiddleware = (store) => {
                   }),
                 )
               }
+              syncBatchParamsInParamsSlice(msg.data)
             }
           },
         )

radio/app/controllers/flightModesController.py

@@ -114,6 +114,7 @@ def setFlightMode(self, mode_number: int, flight_mode: int) -> Response:
             return {
                 "success": True,
                 "message": f"Flight mode {mode_number} set to {mode_name}",
+                "data": {"param_id": f"FLTMODE{mode_number}", "value": flight_mode},
             }
         else:
             return {
@@ -149,6 +150,7 @@ def setFlightModeChannel(self, channel: int) -> Response:
             return {
                 "success": True,
                 "message": f"Flight mode channel set to {channel}",
+                "data": {"param_id": "FLTMODE_CH", "value": channel},
             }
         else:
             return {

radio/app/endpoints/flightMode.py

@@ -67,6 +67,7 @@ def setFlightMode(data: SetFlightModeValueAndNumber) -> None:
     result = droneStatus.drone.flightModesController.setFlightMode(
         mode_number, flight_mode
     )
+
     socketio.emit("set_flight_mode_result", result)
 
 
@@ -102,6 +103,7 @@ def setFlightModeChannel(data: SetFlightModeChannelType) -> None:
         return
 
     result = droneStatus.drone.flightModesController.setFlightModeChannel(channel_int)
+
     socketio.emit("set_flight_mode_channel_result", result)
 
 

radio/tests/test_FlightModesController.py

@@ -181,6 +181,7 @@ def test_setFlightMode_success_copter(droneStatus):
     assert response == {
         "success": True,
         "message": "Flight mode 1 set to COPTER_MODE_ALT_HOLD",
+        "data": {"param_id": "FLTMODE1", "value": 2},
     }
     assert droneStatus.drone.flightModesController.flight_modes[0] == 2
 
@@ -213,6 +214,7 @@ def test_setFlightMode_success_plane(droneStatus):
     assert response == {
         "success": True,
         "message": "Flight mode 1 set to PLANE_MODE_FLY_BY_WIRE_A",
+        "data": {"param_id": "FLTMODE1", "value": 5},
     }
     assert droneStatus.drone.flightModesController.flight_modes[0] == 5
 

radio/tests/test_flightMode.py

@@ -142,6 +142,7 @@ def test_setFlightMode_successfullySet(
     assert socketio_result["args"][0] == {
         "success": True,
         "message": "Flight mode 1 set to COPTER_MODE_CIRCLE",
+        "data": {"param_id": "FLTMODE1", "value": 7},
     }
     assert droneStatus.drone.flightModesController.flight_modes == [7, 9, 6, 3, 5, 0]
 
@@ -198,6 +199,7 @@ def test_setFlightModeChannel_successfullySet(
     assert socketio_result["args"][0] == {
         "success": True,
         "message": "Flight mode channel set to 5",
+        "data": {"param_id": "FLTMODE_CH", "value": 5},
     }
     assert droneStatus.drone.flightModesController.flight_mode_channel == 5