Skip to content

Commit

Permalink
card fields (#610)
Browse files Browse the repository at this point in the history
* deprecate carOutput, add some fields

* Revert "deprecate carOutput, add some fields"

This reverts commit 247a1c5.

* add fields back

* canRcvTimeout is bool

* add vCruise

* enableRequested

* rm

* rm init, deprecate
  • Loading branch information
sshane authored May 21, 2024
1 parent 0a9b426 commit 5812f2c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions car.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ struct CarState {
# CAN health
canValid @26 :Bool; # invalid counter/checksums
canTimeout @40 :Bool; # CAN bus dropped out
canErrorCounter @48 :UInt32;
canRcvTimeout @49 :Bool;

# car speed
vEgo @1 :Float32; # best estimate of speed
Expand Down Expand Up @@ -220,6 +222,9 @@ struct CarState {
fuelGauge @41 :Float32; # battery or fuel tank level from 0.0 to 1.0
charging @43 :Bool;

# process meta
cumLagMs @50 :Float32;

struct WheelSpeeds {
# optional wheel speeds
fl @0 :Float32;
Expand Down
2 changes: 1 addition & 1 deletion log.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,6 @@ struct ControlsState @0x97ff69c53601abf1 {
engageable @41 :Bool; # can OP be engaged?

cumLagMs @15 :Float32;
canErrorCounter @57 :UInt32;

lateralControlState :union {
indiState @52 :LateralINDIState;
Expand Down Expand Up @@ -865,6 +864,7 @@ struct ControlsState @0x97ff69c53601abf1 {
steeringAngleDesiredDegDEPRECATED @29 :Float32;
canMonoTimesDEPRECATED @21 :List(UInt64);
desiredCurvatureRateDEPRECATED @62 :Float32;
canErrorCounterDEPRECATED @57 :UInt32;
}

# All SI units and in device frame
Expand Down

0 comments on commit 5812f2c

Please sign in to comment.