From ba764caca9e5066ffa1bbf311fdeb990c2fb0372 Mon Sep 17 00:00:00 2001 From: Igor Biletksyy Date: Tue, 13 Sep 2022 19:56:06 -0700 Subject: [PATCH 1/6] init --- selfdrive/boardd/boardd.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc index 5ff6d56e690a37..6bb513bc791b47 100644 --- a/selfdrive/boardd/boardd.cc +++ b/selfdrive/boardd/boardd.cc @@ -346,14 +346,14 @@ std::optional send_panda_states(PubMaster *pm, const std::vector auto ps = pss[i]; ps.setUptime(health.uptime_pkt); - ps.setBlockedCnt(health.blocked_msg_cnt_pkt); + ps.setBlockedTxMsgCnt(health.blocked_tx_msg_cnt_pkt); + ps.setBlockedRxMsgCnt(health.blocked_rx_msg_cnt_pkt); ps.setIgnitionLine(health.ignition_line_pkt); ps.setIgnitionCan(health.ignition_can_pkt); ps.setControlsAllowed(health.controls_allowed_pkt); ps.setGasInterceptorDetected(health.gas_interceptor_detected_pkt); - ps.setCanRxErrs(health.can_rx_errs_pkt); - ps.setCanSendErrs(health.can_send_errs_pkt); - ps.setCanFwdErrs(health.can_fwd_errs_pkt); + ps.setTxBufferOverflowCnt(health.tx_buffer_overflow_cnt_pkt); + ps.setRxBufferOverflowCnt(health.rx_buffer_overflow_cnt_pkt); ps.setGmlanSendErrs(health.gmlan_send_errs_pkt); ps.setPandaType(panda->hw_type); ps.setSafetyModel(cereal::CarParams::SafetyModel(health.safety_mode_pkt)); From 8a1aaf3d83810f8f3d2d6739d77fc61d90e8d88f Mon Sep 17 00:00:00 2001 From: Igor Biletksyy Date: Wed, 14 Sep 2022 16:33:52 -0700 Subject: [PATCH 2/6] naming --- selfdrive/boardd/boardd.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc index 6bb513bc791b47..a3f84d3bb8383b 100644 --- a/selfdrive/boardd/boardd.cc +++ b/selfdrive/boardd/boardd.cc @@ -346,14 +346,14 @@ std::optional send_panda_states(PubMaster *pm, const std::vector auto ps = pss[i]; ps.setUptime(health.uptime_pkt); - ps.setBlockedTxMsgCnt(health.blocked_tx_msg_cnt_pkt); - ps.setBlockedRxMsgCnt(health.blocked_rx_msg_cnt_pkt); + ps.setSafetyTxBlocked(health.blocked_tx_msg_cnt_pkt); + ps.setSafetyRxInvalid(health.blocked_rx_msg_cnt_pkt); ps.setIgnitionLine(health.ignition_line_pkt); ps.setIgnitionCan(health.ignition_can_pkt); ps.setControlsAllowed(health.controls_allowed_pkt); ps.setGasInterceptorDetected(health.gas_interceptor_detected_pkt); - ps.setTxBufferOverflowCnt(health.tx_buffer_overflow_cnt_pkt); - ps.setRxBufferOverflowCnt(health.rx_buffer_overflow_cnt_pkt); + ps.setTxBufferOverflow(health.tx_buffer_overflow_cnt_pkt); + ps.setRxBufferOverflow(health.rx_buffer_overflow_cnt_pkt); ps.setGmlanSendErrs(health.gmlan_send_errs_pkt); ps.setPandaType(panda->hw_type); ps.setSafetyModel(cereal::CarParams::SafetyModel(health.safety_mode_pkt)); From 539819230408886b31ee09f5f4be45b27ad1628d Mon Sep 17 00:00:00 2001 From: Igor Biletksyy Date: Thu, 15 Sep 2022 13:13:23 -0700 Subject: [PATCH 3/6] fix names --- selfdrive/boardd/boardd.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc index a3f84d3bb8383b..0872a947124299 100644 --- a/selfdrive/boardd/boardd.cc +++ b/selfdrive/boardd/boardd.cc @@ -346,14 +346,14 @@ std::optional send_panda_states(PubMaster *pm, const std::vector auto ps = pss[i]; ps.setUptime(health.uptime_pkt); - ps.setSafetyTxBlocked(health.blocked_tx_msg_cnt_pkt); - ps.setSafetyRxInvalid(health.blocked_rx_msg_cnt_pkt); + ps.setSafetyTxBlocked(health.safety_tx_blocked_pkt); + ps.setSafetyRxInvalid(health.safety_rx_invalid_pkt); ps.setIgnitionLine(health.ignition_line_pkt); ps.setIgnitionCan(health.ignition_can_pkt); ps.setControlsAllowed(health.controls_allowed_pkt); ps.setGasInterceptorDetected(health.gas_interceptor_detected_pkt); - ps.setTxBufferOverflow(health.tx_buffer_overflow_cnt_pkt); - ps.setRxBufferOverflow(health.rx_buffer_overflow_cnt_pkt); + ps.setTxBufferOverflow(health.tx_buffer_overflow_pkt); + ps.setRxBufferOverflow(health.rx_buffer_overflow_pkt); ps.setGmlanSendErrs(health.gmlan_send_errs_pkt); ps.setPandaType(panda->hw_type); ps.setSafetyModel(cereal::CarParams::SafetyModel(health.safety_mode_pkt)); From b8bb41cb4b2889f9ddc53379dce25d6e12e547c0 Mon Sep 17 00:00:00 2001 From: Igor Biletksyy Date: Thu, 15 Sep 2022 13:36:39 -0700 Subject: [PATCH 4/6] bump cereal --- cereal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cereal b/cereal index bd2f7fa56706bc..513dfc7ee00124 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit bd2f7fa56706bcec3c9906bd57c2ec46f0666ac5 +Subproject commit 513dfc7ee001243cd68a57a9d92fe3170fc49c7d From 543ac7563dec9b7302e33469ad789a2061e4008b Mon Sep 17 00:00:00 2001 From: Igor Biletksyy Date: Thu, 15 Sep 2022 13:36:49 -0700 Subject: [PATCH 5/6] bump panda --- panda | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda b/panda index 38257a93e47338..f029c99440b7a7 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 38257a93e4733819a109a4ef52efed1bbeb45cc4 +Subproject commit f029c99440b7a75c988a87383d57fe0536c013be From bc4e37ebb8cd190651fc6bad11941c412a85b712 Mon Sep 17 00:00:00 2001 From: Igor Biletksyy Date: Thu, 15 Sep 2022 14:55:17 -0700 Subject: [PATCH 6/6] bump panda --- panda | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda b/panda index f029c99440b7a7..046fd58e8d64c5 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit f029c99440b7a75c988a87383d57fe0536c013be +Subproject commit 046fd58e8d64c58ed80769fcbec5ac2417a04c71