sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Panda health: names and mixup fix (#25774)

Browse Source 
* init

* naming

* fix names

* bump cereal

* bump panda

* bump panda
pull/25799/head
Igor Biletskyy 3 years ago committed by GitHub
parent c4e63d14ab
commit d5410dfac5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      cereal
  2. 2
      panda
  3. 8
      selfdrive/boardd/boardd.cc

2
cereal

@ -1 +1 @@
Subproject commit bd2f7fa56706bcec3c9906bd57c2ec46f0666ac5 Subproject commit 513dfc7ee001243cd68a57a9d92fe3170fc49c7d

2
panda

@ -1 +1 @@
Subproject commit 38257a93e4733819a109a4ef52efed1bbeb45cc4 Subproject commit 046fd58e8d64c58ed80769fcbec5ac2417a04c71

8
selfdrive/boardd/boardd.cc
Unescape View File

@ -346,14 +346,14 @@ std::optional<bool> send_panda_states(PubMaster *pm, const std::vector<Panda *>
auto ps = pss[i]; auto ps = pss[i];
ps.setUptime(health.uptime_pkt); ps.setUptime(health.uptime_pkt);
ps.setBlockedCnt(health.blocked_msg_cnt_pkt); ps.setSafetyTxBlocked(health.safety_tx_blocked_pkt);
ps.setSafetyRxInvalid(health.safety_rx_invalid_pkt);
ps.setIgnitionLine(health.ignition_line_pkt); ps.setIgnitionLine(health.ignition_line_pkt);
ps.setIgnitionCan(health.ignition_can_pkt); ps.setIgnitionCan(health.ignition_can_pkt);
ps.setControlsAllowed(health.controls_allowed_pkt); ps.setControlsAllowed(health.controls_allowed_pkt);
ps.setGasInterceptorDetected(health.gas_interceptor_detected_pkt); ps.setGasInterceptorDetected(health.gas_interceptor_detected_pkt);
ps.setCanRxErrs(health.can_rx_errs_pkt); ps.setTxBufferOverflow(health.tx_buffer_overflow_pkt);
ps.setCanSendErrs(health.can_send_errs_pkt); ps.setRxBufferOverflow(health.rx_buffer_overflow_pkt);
ps.setCanFwdErrs(health.can_fwd_errs_pkt);
ps.setGmlanSendErrs(health.gmlan_send_errs_pkt); ps.setGmlanSendErrs(health.gmlan_send_errs_pkt);
ps.setPandaType(panda->hw_type); ps.setPandaType(panda->hw_type);
ps.setSafetyModel(cereal::CarParams::SafetyModel(health.safety_mode_pkt)); ps.setSafetyModel(cereal::CarParams::SafetyModel(health.safety_mode_pkt));

Write Preview
Loading…
Cancel
Save