womp womp

.gitignore

@@ -4,3 +4,5 @@ __pycache__/
 result
 result/
 .env
+hytech.proto
+dbc_to.proto

README.md

@@ -1,4 +1,11 @@
-usage: 
+# Base person usage:
+1. Download foxglove studio at https://github.com/foxglove/studio/releases 
+2. Connect to the Pi's network 
+3. Open foxglove studio 
+4. Open a connection to the Pi's IP on port 8765 
+5. Look at data
+
+# dev usage: 
 
 to get into a dev environment locally (on linux):
 1. install nix:
@@ -117,4 +124,4 @@ flowchart TD
 
 
 kvaser u100 pinout:
-![Alt text](image.png)
+![Alt text](image.png)

dbc_proto_bin_gen.nix

@@ -1,16 +1,16 @@
-{pkgs, py_dbc_proto_gen_pkg, ht_can_pkg, protobuf}:
+{pkgs, py_dbc_proto_gen_pkg, can_pkg, protobuf}:
 
 pkgs.stdenv.mkDerivation rec {
   name = "ht-proto-gen";
 
   src = builtins.filterSource (path: type: false) ./.;
 
-  buildInputs = [ py_dbc_proto_gen_pkg ht_can_pkg protobuf ]; # Python as a build dependency
+  buildInputs = [ py_dbc_proto_gen_pkg can_pkg protobuf ]; # Python as a build dependency
 
   # Define the build phase to execute the scripts
   buildPhase = ''
     # Run the Python script
-    dbc_to_proto.py ${ht_can_pkg}
+    dbc_to_proto.py ${can_pkg}
     protoc --include_imports --descriptor_set_out=hytech.bin hytech.proto
   '';
 
@@ -22,4 +22,4 @@ pkgs.stdenv.mkDerivation rec {
     cp hytech.proto $out/proto
     cp hytech.bin $out/bin
   '';
-}
+}

default.nix

@@ -18,6 +18,7 @@ python311Packages.buildPythonApplication {
     python311Packages.websockets
     python311Packages.pprintpp
     python311Packages.can
+    python311Packages.pyserial-asyncio
     asyncudp_pkg
     python311Packages.lz4
     python311Packages.zstandard

downv.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Check if vcan0 is already down
+if ! ip link show up | grep -q vcan0; then
+    echo "vcan0 is already down."
+else
+    echo "Bringing down vcan0..."
+
+    # Bring down can0 interface
+    sudo ip link set down vcan0
+
+    echo "vcan0 has been brought down."
+fi

flake.nix

@@ -9,12 +9,12 @@
     mcap.url = "github:RCMast3r/py_mcap_nix";
     foxglove-websocket.url = "github:RCMast3r/py_foxglove_webserver_nix";
     asyncudp.url = "github:RCMast3r/asyncudp_nix";
-    ht_can_pkg_flake.url = "github:hytech-racing/ht_can";
-    nix-proto = { url = "github:notalltim/nix-proto"; };
+    can_pkg_flake.url = "github:KSU-MS/Nix_CAN";
+    nix-proto.url = "github:notalltim/nix-proto";
   };
 
   outputs = { self, nixpkgs, utils, mcap-protobuf, mcap, foxglove-websocket
-    , asyncudp, nix-proto, ht_can_pkg_flake, ... }@inputs:
+    , asyncudp, nix-proto, can_pkg_flake, ... }@inputs:
     let
       makePackageSet = pkgs: {
         py_data_acq_pkg = pkgs.py_data_acq_pkg;
@@ -48,7 +48,7 @@
         py_dbc_proto_gen_overlay
         py_data_acq_overlay
         proto_gen_overlay
-        ht_can_pkg_flake.overlays.default
+        can_pkg_flake.overlays.default
         mcap-protobuf.overlays.default
         mcap.overlays.default
         asyncudp.overlays.default
@@ -90,7 +90,7 @@
           py_data_acq_pkg
           py_dbc_proto_gen_pkg
           proto_gen_pkg
-          ht_can_pkg
+          can_pkg
           cmake
           can-utils
         ];
@@ -100,7 +100,7 @@
         in ''
           path=${x86_pkgs.proto_gen_pkg}
           bin_path=$path"/bin"
-          dbc_path=${x86_pkgs.ht_can_pkg}
+          dbc_path=${x86_pkgs.can_pkg}
           export BIN_PATH=$bin_path
           export DBC_PATH=$dbc_path
 
@@ -115,14 +115,14 @@
           # Development Tools
           py_dbc_proto_gen_pkg
           proto_gen_pkg
-          ht_can_pkg
+          can_pkg
           protobuf
         ];
         shellHook =
         ''
           path=${x86_pkgs.proto_gen_pkg}
           bin_path=$path"/bin"
-          dbc_path=${x86_pkgs.ht_can_pkg}
+          dbc_path=${x86_pkgs.can_pkg}
           export BIN_PATH=$bin_path
           export DBC_PATH=$dbc_path
         '';