mawei/panda-meb
1
0
Fork 0
mirror of https://github.com/infiniteCable2/panda.git synced 2026-02-19 01:33:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge health.h and can_health.h (#1075)

Browse Source 
init
This commit is contained in:
Igor Biletskyy
2022-09-19 16:11:49 -07:00
committed by GitHub
parent a19f12559e
commit b86199244a
4 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
board/can_health.h
View File

@@ -1,24 +0,0 @@
// When changing this struct, python/__init__.py needs to be kept up to date!
#define CAN_HEALTH_PACKET_VERSION 2
typedef struct __attribute__((packed)) {
uint8_t bus_off;
uint32_t bus_off_cnt;
uint8_t error_warning;
uint8_t error_passive;
uint8_t last_error; // real time LEC value
uint8_t last_stored_error; // last LEC positive error code stored
uint8_t last_data_error; // DLEC (for CANFD only)
uint8_t last_data_stored_error; // last DLEC positive error code stored (for CANFD only)
uint8_t receive_error_cnt; // REC
uint8_t transmit_error_cnt; // TEC
uint32_t total_error_cnt; // How many times any error interrupt were invoked
uint32_t total_tx_lost_cnt; // Tx event FIFO element Lost
uint32_t total_rx_lost_cnt; // Rx FIFO 0 message Lost
uint32_t total_tx_cnt;
uint32_t total_rx_cnt;
uint32_t total_fwd_cnt; // Messages forwarded from one bus to another
uint16_t can_speed;
uint16_t can_data_speed;
uint8_t canfd_enabled;
uint8_t brs_enabled;
} can_health_t;

26
board/health.h
View File

@@ -1,4 +1,4 @@
// When changing this struct, python/__init__.py needs to be kept up to date!
// When changing these structs, python/__init__.py needs to be kept up to date!
#define HEALTH_PACKET_VERSION 10
@@ -26,3 +26,27 @@ struct __attribute__((packed)) health_t {
float interrupt_load;
uint8_t fan_power;
};
#define CAN_HEALTH_PACKET_VERSION 2
typedef struct __attribute__((packed)) {
uint8_t bus_off;
uint32_t bus_off_cnt;
uint8_t error_warning;
uint8_t error_passive;
uint8_t last_error; // real time LEC value
uint8_t last_stored_error; // last LEC positive error code stored
uint8_t last_data_error; // DLEC (for CANFD only)
uint8_t last_data_stored_error; // last DLEC positive error code stored (for CANFD only)
uint8_t receive_error_cnt; // REC
uint8_t transmit_error_cnt; // TEC
uint32_t total_error_cnt; // How many times any error interrupt were invoked
uint32_t total_tx_lost_cnt; // Tx event FIFO element Lost
uint32_t total_rx_lost_cnt; // Rx FIFO 0 message Lost
uint32_t total_tx_cnt;
uint32_t total_rx_cnt;
uint32_t total_fwd_cnt; // Messages forwarded from one bus to another
uint16_t can_speed;
uint16_t can_data_speed;
uint8_t canfd_enabled;
uint8_t brs_enabled;
} can_health_t;

3
board/main.c
View File

@@ -12,7 +12,8 @@
#include "power_saving.h"
#include "safety.h"
#include "can_health.h"
#include "health.h"
#include "drivers/can_common.h"
#ifdef STM32H7

2
board/main_comms.h
View File

@@ -1,5 +1,3 @@
#include "health.h"
extern int _app_start[0xc000]; // Only first 3 sectors of size 0x4000 are used
// Prototypes