From 962c53cad52f375bf98b0ed806ea9d8986ef01ad Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Thu, 27 Jan 2022 17:48:24 -0800 Subject: [PATCH] boardd: add blocked msg cnt (#23647) * boardd: add blocked msg cnt * bump panda * bump panda old-commit-hash: 43c6ea8e7319b7ce1defd4a8d7b9e43f62e3f687 --- cereal | 2 +- panda | 2 +- selfdrive/boardd/boardd.cc | 1 + selfdrive/boardd/panda.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cereal b/cereal index 5c64eaab78..03860ae0b2 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit 5c64eaab789dfa67a210deaa2530788843474999 +Subproject commit 03860ae0b2b8128cae7768e4301d889e627c9275 diff --git a/panda b/panda index 64498f0e85..00138a7f66 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 64498f0e8519c80d4caeaba365707e5bc879d8a4 +Subproject commit 00138a7f667ea6152a673764332fe4be756e63fb diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc index 34f3d8f4cb..a0086b278e 100644 --- a/selfdrive/boardd/boardd.cc +++ b/selfdrive/boardd/boardd.cc @@ -342,6 +342,7 @@ bool send_panda_states(PubMaster *pm, const std::vector &pandas, bool s auto ps = pss[i]; ps.setUptime(pandaState.uptime); + ps.setBlockedCnt(pandaState.blocked_msg_cnt); ps.setIgnitionLine(pandaState.ignition_line); ps.setIgnitionCan(pandaState.ignition_can); ps.setControlsAllowed(pandaState.controls_allowed); diff --git a/selfdrive/boardd/panda.h b/selfdrive/boardd/panda.h index fcd9f82c86..2bce2784f7 100644 --- a/selfdrive/boardd/panda.h +++ b/selfdrive/boardd/panda.h @@ -46,6 +46,7 @@ struct __attribute__((packed)) health_t { uint8_t power_save_enabled; uint8_t heartbeat_lost; uint16_t unsafe_mode; + uint32_t blocked_msg_cnt; }; struct __attribute__((packed)) can_header {