Attempt to fix in relation to #2, release 25.0.1

GrappleRobotics · Jan 13, 2025 · aec1b4d · aec1b4d
1 parent 1ca5f04
commit aec1b4d
Show file tree

Hide file tree

Showing 14 changed files with 752 additions and 20 deletions.
diff --git a/grapple-hook/package.json b/grapple-hook/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grapple-hook",
   "private": true,
-  "version": "25.0.0",
+  "version": "25.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -22,8 +22,10 @@
     "immutability-helper": "^3.1.1",
     "json-schema-to-typescript": "^13.0.1",
     "node-sass": "^8.0.0",
+    "prism-react-renderer": "^2.4.1",
     "react": "^18.2.0",
     "react-bootstrap": "^2.7.2",
+    "react-code-blocks": "^0.1.6",
     "react-confirm": "^0.3.0-2",
     "react-dom": "^18.2.0",
     "react-slider": "^2.0.5",

diff --git a/grapple-hook/schema.json b/grapple-hook/schema.json
@@ -14,7 +14,9 @@
     "old_version_req",
     "old_version_rsp",
     "provider_manager_req",
-    "provider_manager_rsp"
+    "provider_manager_rsp",
+    "roborio_req",
+    "roborio_rsp"
   ],
   "properties": {
     "firmware_req": {
@@ -52,6 +54,12 @@
     },
     "provider_manager_rsp": {
       "$ref": "#/definitions/ProviderManagerResponse"
+    },
+    "roborio_req": {
+      "$ref": "#/definitions/RoboRioDaemonRequest"
+    },
+    "roborio_rsp": {
+      "$ref": "#/definitions/RoboRioDaemonResponse"
     }
   },
   "definitions": {
@@ -1581,7 +1589,8 @@
       "required": [
         "address",
         "connected",
-        "description"
+        "description",
+        "ty"
       ],
       "properties": {
         "address": {
@@ -1592,6 +1601,9 @@
         },
         "description": {
           "type": "string"
+        },
+        "ty": {
+          "type": "string"
         }
       }
     },
@@ -1734,6 +1746,149 @@
         }
       ]
     },
+    "RoboRIOStatus": {
+      "type": "object",
+      "required": [
+        "using_daemon"
+      ],
+      "properties": {
+        "using_daemon": {
+          "type": "boolean"
+        }
+      }
+    },
+    "RoboRioDaemonRequest": {
+      "oneOf": [
+        {
+          "type": "object",
+          "required": [
+            "data",
+            "method"
+          ],
+          "properties": {
+            "data": {
+              "type": "object"
+            },
+            "method": {
+              "type": "string",
+              "enum": [
+                "status"
+              ]
+            }
+          }
+        },
+        {
+          "type": "object",
+          "required": [
+            "data",
+            "method"
+          ],
+          "properties": {
+            "data": {
+              "type": "object",
+              "required": [
+                "use_daemon"
+              ],
+              "properties": {
+                "use_daemon": {
+                  "type": "boolean"
+                }
+              }
+            },
+            "method": {
+              "type": "string",
+              "enum": [
+                "set_use_daemon"
+              ]
+            }
+          }
+        },
+        {
+          "type": "object",
+          "required": [
+            "data",
+            "method"
+          ],
+          "properties": {
+            "data": {
+              "type": "object",
+              "required": [
+                "address"
+              ],
+              "properties": {
+                "address": {
+                  "type": "string"
+                }
+              }
+            },
+            "method": {
+              "type": "string",
+              "enum": [
+                "set_address"
+              ]
+            }
+          }
+        }
+      ]
+    },
+    "RoboRioDaemonResponse": {
+      "oneOf": [
+        {
+          "type": "object",
+          "required": [
+            "data",
+            "method"
+          ],
+          "properties": {
+            "data": {
+              "$ref": "#/definitions/RoboRIOStatus"
+            },
+            "method": {
+              "type": "string",
+              "enum": [
+                "status"
+              ]
+            }
+          }
+        },
+        {
+          "type": "object",
+          "required": [
+            "data",
+            "method"
+          ],
+          "properties": {
+            "data": {
+              "type": "null"
+            },
+            "method": {
+              "type": "string",
+              "enum": [
+                "set_use_daemon"
+              ]
+            }
+          }
+        },
+        {
+          "type": "object",
+          "required": [
+            "data",
+            "method"
+          ],
+          "properties": {
+            "data": {
+              "type": "null"
+            },
+            "method": {
+              "type": "string",
+              "enum": [
+                "set_address"
+              ]
+            }
+          }
+        }
+      ]
+    },
     "WrappedDeviceProviderRequest": {
       "oneOf": [
         {
@@ -1815,6 +1970,30 @@
               ]
             }
           }
+        },
+        {
+          "type": "object",
+          "required": [
+            "data",
+            "method"
+          ],
+          "properties": {
+            "data": {
+              "type": "object",
+              "required": [
+                "req"
+              ],
+              "properties": {
+                "req": true
+              }
+            },
+            "method": {
+              "type": "string",
+              "enum": [
+                "call"
+              ]
+            }
+          }
         }
       ]
     },
@@ -1891,6 +2070,22 @@
               ]
             }
           }
+        },
+        {
+          "type": "object",
+          "required": [
+            "data",
+            "method"
+          ],
+          "properties": {
+            "data": true,
+            "method": {
+              "type": "string",
+              "enum": [
+                "call"
+              ]
+            }
+          }
         }
       ]
     }

diff --git a/grapple-hook/src-tauri/Cargo.lock b/grapple-hook/src-tauri/Cargo.lock
diff --git a/grapple-hook/src-tauri/Cargo.toml b/grapple-hook/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grapple-hook"
-version = "25.0.0"
+version = "25.0.1"
 description = "Configuration Tool for Grapple Hardware"
 authors = ["Jaci Brunning <[email protected]>"]
 license = "GPLv3"

diff --git a/grapple-hook/src-tauri/src/bin/gen-schema.rs b/grapple-hook/src-tauri/src/bin/gen-schema.rs
@@ -1,6 +1,6 @@
 use std::{path::Path, fs, env};
 
-use grapple_hook::devices::{flexican::{FlexiCanRequest, FlexiCanResponse}, lasercan::{LaserCanRequest, LaserCanResponse}, mitocandria::{MitocandriaRequest, MitocandriaResponse}, provider_manager::{ProviderManagerRequest, ProviderManagerResponse}, FirmwareUpgradeDeviceRequest, FirmwareUpgradeDeviceResponse, OldVersionDeviceRequest, OldVersionDeviceResponse};
+use grapple_hook::devices::{flexican::{FlexiCanRequest, FlexiCanResponse}, lasercan::{LaserCanRequest, LaserCanResponse}, mitocandria::{MitocandriaRequest, MitocandriaResponse}, provider_manager::{ProviderManagerRequest, ProviderManagerResponse}, roborio::daemon::{RoboRioDaemonRequest, RoboRioDaemonResponse}, FirmwareUpgradeDeviceRequest, FirmwareUpgradeDeviceResponse, OldVersionDeviceRequest, OldVersionDeviceResponse};
 
 #[derive(schemars::JsonSchema)]
 #[allow(unused)]
@@ -22,6 +22,9 @@ struct MegaSchema {
 
   mitocandria_req: MitocandriaRequest,
   mitocandria_rsp: MitocandriaResponse,
+
+  roborio_req: RoboRioDaemonRequest,
+  roborio_rsp: RoboRioDaemonResponse,
 }
 
 fn main() -> anyhow::Result<()> {

diff --git a/grapple-hook/src-tauri/src/devices/generic_usb.rs b/grapple-hook/src-tauri/src/devices/generic_usb.rs
@@ -4,6 +4,7 @@ use bounded_static::ToBoundedStatic;
 use futures::{SinkExt, StreamExt};
 use grapple_frc_msgs::{binmarshal::{AsymmetricCow, BitView, BitWriter, BufferBitWriter, Demarshal, Marshal, MarshalUpdate}, bridge::BridgedCANMessage, grapple::{fragments::FragmentReassembler, GrappleMessageId, TaggedGrappleMessage}, ManufacturerMessage};
 use log::{info, warn};
+use serde_json::json;
 use tokio::sync::{mpsc, Mutex};
 use tokio_serial::{SerialPort, SerialStream, UsbPortInfo};
 use tokio_util::codec::Framed;
@@ -149,12 +150,17 @@ impl DeviceProvider for GenericUSB {
 
   async fn info(&self) -> anyhow::Result<ProviderInfo> {
     Ok(ProviderInfo {
+      ty: "Generic-USB".to_owned(),
       description: "Grapple USB Device".to_owned(),
       address: self.inner.address.clone(),
       connected: self.inner.running.load(std::sync::atomic::Ordering::Relaxed)
     })
   }
 
+  async fn call(&self, _req: serde_json::Value) -> anyhow::Result<serde_json::Value> {
+    Ok(json!({}))
+  }
+
   async fn device_manager_call(&self, req: DeviceManagerRequest) -> anyhow::Result<DeviceManagerResponse> {
     self.inner.device_manager.rpc_process(req).await
   }

diff --git a/grapple-hook/src-tauri/src/devices/provider.rs b/grapple-hook/src-tauri/src/devices/provider.rs
@@ -6,6 +6,7 @@ use super::device_manager::{DeviceManagerRequest, DeviceManagerResponse};
 
 #[derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
 pub struct ProviderInfo {
+  pub ty: String,
   pub description: String,
   pub address: String,
   pub connected: bool,
@@ -17,6 +18,7 @@ pub trait DeviceProvider {
   async fn disconnect(&self) -> anyhow::Result<()>;
   async fn info(&self) -> anyhow::Result<ProviderInfo>;
 
+  async fn call(&self, req: serde_json::Value) -> anyhow::Result<serde_json::Value>;
   async fn device_manager_call(&self, req: DeviceManagerRequest) -> anyhow::Result<DeviceManagerResponse>;
 }
 
@@ -47,4 +49,8 @@ impl WrappedDeviceProvider {
   pub async fn device_manager_call(&self, req: DeviceManagerRequest) -> anyhow::Result<DeviceManagerResponse> {
     self.inner.device_manager_call(req).await
   }
+
+  async fn call(&self, req: serde_json::Value) -> anyhow::Result<serde_json::Value> {
+    self.inner.call(req).await
+  }
 }