Fix params page refreshing params

Author: 1Blademaster

gcs/src/params.jsx

@@ -35,20 +35,19 @@ import { selectConnectedToDrone } from "./redux/slices/droneConnectionSlice.js"
 import { selectIsArmed, selectIsFlying } from "./redux/slices/droneInfoSlice.js"
 import {
   emitExportParamsToFile,
+  emitGetParams,
   emitRefreshParams,
   emitSetMultipleParams,
   resetParamState,
   selectFetchingVars,
   selectFetchingVarsProgress,
-  selectHasFetchedOnce,
   selectModifiedParams,
   selectParams,
   selectParamSearchValue,
   selectShowModifiedParams,
   selectShownParams,
   setFetchingVars,
   setFetchParamsWarningModalOpen,
-  setHasFetchedOnce,
   setLoadedFileName,
   setLoadedParams,
   setLoadParamsFileModalOpen,
@@ -78,7 +77,6 @@ export default function Params() {
   const isFlying = useSelector(selectIsFlying)
 
   // Parameter states
-  const hasFetchedOnce = useSelector(selectHasFetchedOnce)
   const params = useSelector(selectParams)
   const shownParams = useSelector(selectShownParams)
   const modifiedParams = useSelector(selectModifiedParams)
@@ -96,12 +94,13 @@ export default function Params() {
   useEffect(() => {
     if (!connected) {
       dispatch(resetParamState())
+      return
     }
 
-    if (connected && !hasFetchedOnce && !fetchingVars) {
-      fetchParams()
+    if (!fetchingVars && params.length === 0) {
+      dispatch(emitGetParams())
     }
-  }, [connected])
+  }, [connected, dispatch, fetchingVars, params.length])
 
   useEffect(() => {
     if (!params) return
@@ -133,7 +132,6 @@ export default function Params() {
   function fetchParamsForFirstTime() {
     dispatch(setFetchingVars(true))
     dispatch(emitRefreshParams())
-    dispatch(setHasFetchedOnce(true))
     dispatch(setPendingFetchAction(null))
   }
 

gcs/src/redux/middleware/emitters.js

@@ -66,6 +66,7 @@ import {
 } from "../slices/missionSlice"
 import {
   emitExportParamsToFile,
+  emitGetParams,
   emitRebootAutopilot,
   emitRefreshParams,
   emitSetMultipleParams,
@@ -321,6 +322,10 @@ export function handleEmitters(socket, store, action) {
       emitter: emitRebootAutopilot,
       callback: () => socket.socket.emit("reboot_autopilot"),
     },
+    {
+      emitter: emitGetParams,
+      callback: () => socket.socket.emit("get_params"),
+    },
     {
       emitter: emitRefreshParams,
       callback: () => socket.socket.emit("refresh_params"),

gcs/src/redux/middleware/socketMiddleware.js

@@ -173,7 +173,7 @@ const DroneSpecificSocketEvents = Object.freeze({
 
 const ParamSpecificSocketEvents = Object.freeze({
   onRebootAutopilot: "reboot_autopilot",
-  onParamsMessage: "params",
+  onGetParamsResult: "get_params_result",
   onParamRequestUpdate: "param_request_update",
   onParamSetSuccess: "param_set_success",
   onParamError: "params_error",
@@ -470,7 +470,6 @@ const socketMiddleware = (store) => {
           store.dispatch(setConnecting(false))
           store.dispatch(setConnectionModal(false))
 
-          store.dispatch(setHasFetchedOnce(false))
           store.dispatch(setGuidedModePinData({ lat: 0, lon: 0, alt: 0 }))
           store.dispatch(setRebootData({}))
           store.dispatch(setAutoPilotRebootModalOpen(false))
@@ -870,9 +869,12 @@ const socketMiddleware = (store) => {
           },
         )
 
-        socket.socket.on(ParamSpecificSocketEvents.onParamsMessage, (msg) => {
-          store.dispatch(setParams(msg))
-          store.dispatch(setShownParams(msg))
+        socket.socket.on(ParamSpecificSocketEvents.onGetParamsResult, (msg) => {
+          if (msg.success) {
+            store.dispatch(setParams(msg.data))
+            store.dispatch(setShownParams(msg.data))
+          }
+          store.dispatch(setHasFetchedOnce(true))
           store.dispatch(setFetchingVars(false))
           store.dispatch(setFetchingVarsProgress({ progress: 0, param_id: "" }))
           store.dispatch(setParamSearchValue(""))

gcs/src/redux/slices/paramsSlice.js

@@ -177,6 +177,7 @@ const paramsSlice = createSlice({
 
     // Emitters (empty objects to be captured in the middleware)
     emitRebootAutopilot: () => {},
+    emitGetParams: () => {},
     emitRefreshParams: () => {},
     emitSetMultipleParams: () => {},
     emitExportParamsToFile: () => {},
@@ -241,6 +242,7 @@ export const {
   setRebootPromptModalOpen,
   setPendingFetchAction,
   emitRebootAutopilot,
+  emitGetParams,
   emitRefreshParams,
   emitSetMultipleParams,
   emitExportParamsToFile,

radio/app/endpoints/params.py

@@ -27,6 +27,28 @@ def setMultipleParamsProgressUpdateCallback(
     socketio.emit("set_multiple_params_progress", data)
 
 
+@socketio.on("get_params")
+def get_params() -> None:
+    """
+    Get cached parameters from the params controller.
+    """
+    drone = droneStatus.drone
+    if drone is None:
+        return
+
+    if droneStatus.state != "params":
+        socketio.emit(
+            "params_error",
+            {"message": "You must be on the params screen to get parameters."},
+        )
+        logger.debug(f"Current state: {droneStatus.state}")
+        return
+
+    socketio.emit(
+        "get_params_result", {"success": True, "data": drone.paramsController.params}
+    )
+
+
 @socketio.on("set_multiple_params")
 def set_multiple_params(params_list: List[Any]) -> None:
     """
@@ -103,7 +125,9 @@ def send_param_request_update(progress_data: dict) -> None:
         )
         return
 
-    socketio.emit("params", params_controller.params)
+    socketio.emit(
+        "get_params_result", {"success": True, "data": drone.paramsController.params}
+    )
 
 
 @socketio.on("export_params_to_file")