Merge branch 'main' of github.com:hytech-racing/HT_CAN

PCAN_project/hytech.sym

@@ -59,10 +59,7 @@ Sig=pack_charge_critical unsigned 2
 Sig=max_torque unsigned 8
 Sig=torque_mode unsigned 8
 Sig=distance_traveled_m unsigned 16 /f:0.01
-Sig=accel_pedal_1 unsigned 16
-Sig=accel_pedal_2 unsigned 16
-Sig=brake_pedal_1 unsigned 16
-Sig=brake_pedal_2 unsigned 16
+Sig=accel_percent_float unsigned 8 /u:percent /f:0.39215686275 /ln:"acceleration pedal percent travel" // The percentage of accel pedal travel represented by an unsigned float
 Sig=group_id unsigned 4
 Sig=cell_1_balancing_status unsigned 1
 Sig=cell_2_balancing_status unsigned 1
@@ -375,6 +372,8 @@ Sig=rl_motor_torque signed 16 /u:nm
 Sig=potentiometer_rl unsigned 16 /u:lbs /ln:"Rear Left Potentiometer"
 Sig=potentiometer_rr unsigned 16 /u:lbs /ln:"Rear Right Potentiometer"
 Sig=tcu_recording_state unsigned 2 // The current state of TCU data recording (off, requested,on,saving)
+Sig=brake_percent_float unsigned 8 /u:percent /f:0.39215686275 /ln:"acceleration pedal percent travel" // The percentage of accel pedal travel represented by an unsigned float
+Sig=mechanical_brake_percent_float unsigned 8 /u:percent /f:0.39215686275 // The percentage at which mechanical brake activates represented by an unsigned float
 
 {SENDRECEIVE}
 
@@ -762,10 +761,9 @@ Sig=load_cell_fr 16
 [MCU_PEDAL_READINGS]
 ID=0C4h
 Len=8
-Sig=accel_pedal_1 0
-Sig=accel_pedal_2 16
-Sig=brake_pedal_1 32
-Sig=brake_pedal_2 48
+Sig=accel_percent_float 0
+Sig=brake_percent_float 8
+Sig=mechanical_brake_percent_float 16
 
 [MCU_REAR_POTS]
 ID=0C7h
@@ -1109,8 +1107,8 @@ Sig=mc4_system_ready 30
 Sig=mc4_warning 31
 Sig=accel_implausible 32
 Sig=brake_implausible 33
-Sig=brake_percent 41
-Sig=accel_percent 49
+Sig=brake_percent 40
+Sig=accel_percent 48
 
 [SAB_THERMISTORS_1]
 ID=0E5h

default.nix

@@ -5,7 +5,7 @@ pkgs.stdenv.mkDerivation rec {
 
   src = ./PCAN_project;
 
-  buildInputs = [ python311Packages.cantools ]; # Python as a build dependency
+  buildInputs = [ (python311Packages.cantools.overridePythonAttrs (_: { doCheck = false; })) ]; # Python as a build dependency
 
   # Define the build phase to execute the scripts
   buildPhase = ''

flake.nix

@@ -78,7 +78,8 @@
         name = "nix-devshell";
         packages = with arch64-darwin_pkgs; [
           # Development Tools
-          python311Packages.cantools
+          #https://discourse.nixos.org/t/overriding-docheck-doesnt-work-with-python-package/14674
+          (python311Packages.cantools.overridePythonAttrs (_: { doCheck = false; }))
           # ht_can_pkg 
         ];
 
@@ -89,7 +90,7 @@
         name = "nix-devshell";
         packages = with x86-darwin_pkgs; [
           # Development Tools
-          python311Packages.cantools
+          (python311Packages.cantools.overridePythonAttrs (_: { doCheck = false; }))
           # ht_can_pkg 
         ];