andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mc33810: diagnostic for GPGD mode, comments, ops number two

This commit is contained in:
Andrey Gusakov 2024-01-04 19:17:29 +03:00 committed by rusefillc
parent 0a4d330483
commit 63f8755820
1 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
firmware/hw_layer/drivers/gpio/mc33810.cpp
View File

@ -11,6 +11,12 @@
* *
* @date Jan 03, 2020 * @date Jan 03, 2020
* @author Andrey Gusakov <dron0gus@gmail.com>, (c) 2020 * @author Andrey Gusakov <dron0gus@gmail.com>, (c) 2020
*
* Masks bits/inputs numbers:
* 0..3 - OUT1 .. 3 - Low-Side Injector drivers, 4.5A max
* driven through DIN0 .. 3 or SPI (not supported)
* 4..7 - GD0 .. 3 - Gate Driver outputs - IGBT of MOSFET pre-drivers,
* driven throug GIN0 .. 3 or SPI in GPGD mode (not supported)
*/ */
#include "pch.h" #include "pch.h"
@ -126,6 +132,8 @@ struct Mc33810 : public GpioChip {
uint8_t o_state; uint8_t o_state;
/* direct driven output mask */ /* direct driven output mask */
uint8_t o_direct_mask; uint8_t o_direct_mask;
/* IGN/GPGD mode bits: [7:4] - GP3..GP0 */
uint8_t o_gpgd_mask;
/* ALL STATUS RESPONSE value and flags */ /* ALL STATUS RESPONSE value and flags */
bool all_status_updated; bool all_status_updated;
@ -133,8 +141,9 @@ struct Mc33810 : public GpioChip {
/* OUTx fault registers */ /* OUTx fault registers */
uint16_t out_fault[2]; uint16_t out_fault[2];
/* GPGD mode fault register */ /* GP mode fault register */
uint16_t gpgd_fault; /* TODO: check documentation if these faults also applied to GPx outputs in IGN mode */
uint16_t gp_fault;
/* IGN mode fault register */ /* IGN mode fault register */
uint16_t ign_fault; uint16_t ign_fault;
@ -263,7 +272,7 @@ int Mc33810::update_output_and_diag()
} }
/* now we have updated ALL STATUS register in chip data */ /* now we have updated ALL STATUS register in chip data */
/* check OUT (injectors) first */ /* check OUTx (injectors) first */
if (all_status_value & 0x000f) { if (all_status_value & 0x000f) {
/* request diagnostic of OUT0 and OUT1 */ /* request diagnostic of OUT0 and OUT1 */
ret = spi_rw(MC_CMD_READ_REG(REG_OUT10_FAULT), NULL); ret = spi_rw(MC_CMD_READ_REG(REG_OUT10_FAULT), NULL);
@ -277,17 +286,21 @@ int Mc33810::update_output_and_diag()
ret = spi_rw(MC_CMD_READ_REG(REG_ALL_STAT), &out_fault[1]); ret = spi_rw(MC_CMD_READ_REG(REG_ALL_STAT), &out_fault[1]);
if (ret) if (ret)
return ret; return ret;
} else {
out_fault[0] = out_fault[1] = 0;
} }
/* check GPGD - mode not supported yet */ /* check outputs in GPGD mode */
if (all_status_value & 0x00f0) { if (all_status_value & 0x00f0) {
/* request diagnostic of GPGD */ /* request diagnostic of GPGD */
ret = spi_rw(MC_CMD_READ_REG(REG_GPGD_FAULT), NULL); ret = spi_rw(MC_CMD_READ_REG(REG_GPGD_FAULT), NULL);
if (ret) if (ret)
return ret; return ret;
/* get diagnostic for GPGD and request ALL STATUS */ /* get diagnostic for GPGD and request ALL STATUS */
ret = spi_rw(MC_CMD_READ_REG(REG_ALL_STAT), &gpgd_fault); ret = spi_rw(MC_CMD_READ_REG(REG_ALL_STAT), &gp_fault);
if (ret) if (ret)
return ret; return ret;
} else {
gp_fault = 0;
} }
/* check IGN */ /* check IGN */
if (all_status_value & 0x0f00) { if (all_status_value & 0x0f00) {
@ -299,6 +312,8 @@ int Mc33810::update_output_and_diag()
ret = spi_rw(MC_CMD_READ_REG(REG_ALL_STAT), &ign_fault); ret = spi_rw(MC_CMD_READ_REG(REG_ALL_STAT), &ign_fault);
if (ret) if (ret)
return ret; return ret;
} else {
ign_fault = 0;
} }
alive_cnt++; alive_cnt++;
@ -421,12 +436,16 @@ int Mc33810::chip_init()
goto err_exit; goto err_exit;
} }
/* update local configuration mask */
o_gpgd_mask =
(engineConfiguration->mc33810Gpgd0Mode << 4) |
(engineConfiguration->mc33810Gpgd1Mode << 5) |
(engineConfiguration->mc33810Gpgd2Mode << 6) |
(engineConfiguration->mc33810Gpgd3Mode << 7);
uint16_t mode_select_cmd = uint16_t mode_select_cmd =
/* set IGN/GP mode for GPx outputs */ /* set IGN/GP mode for GPx outputs: [7:4] to [11:8] */
(engineConfiguration->mc33810Gpgd0Mode << 8) | ((o_gpgd_mask & 0xf0) << 4) |
(engineConfiguration->mc33810Gpgd1Mode << 9) |
(engineConfiguration->mc33810Gpgd2Mode << 10) |
(engineConfiguration->mc33810Gpgd3Mode << 11) |
/* disable/enable retry after recovering from under/overvoltage */ /* disable/enable retry after recovering from under/overvoltage */
(engineConfiguration->mc33810DisableRecoveryMode << 6) | (engineConfiguration->mc33810DisableRecoveryMode << 6) |
0; 0;
@ -591,7 +610,16 @@ brain_pin_diag_e Mc33810::getDiag(size_t pin)
if (val & BIT(3)) if (val & BIT(3))
diag |= PIN_DRIVER_OVERTEMP; diag |= PIN_DRIVER_OVERTEMP;
} else { } else {
/* INJ drivers, GPGD mode is not supported */ /* Commom GP faults */
val = gp_fault >> (2 * (pin - 4));
if (val & BIT(0))
diag |= PIN_OPEN;
if (val & BIT(1))
diag |= PIN_SHORT_TO_GND;
/* IGN mode faults, only if not in GPGD mode */
if ((o_gpgd_mask & BIT(pin)) == 0) {
val = ign_fault >> (3 * (pin - 4)); val = ign_fault >> (3 * (pin - 4));
/* open load */ /* open load */
@ -604,6 +632,7 @@ brain_pin_diag_e Mc33810::getDiag(size_t pin)
if (val & BIT(2)) if (val & BIT(2))
diag |= PIN_OVERLOAD; diag |= PIN_OVERLOAD;
} }
}
/* convert to some common enum? */ /* convert to some common enum? */
return static_cast<brain_pin_diag_e>(diag); return static_cast<brain_pin_diag_e>(diag);
} }
@ -689,7 +718,7 @@ void mc33810_req_init() {
size_t i; size_t i;
for (i = 0; i < BOARD_MC33810_COUNT; i++) { for (i = 0; i < BOARD_MC33810_COUNT; i++) {
auto& chip = chips[0]; auto& chip = chips[i];
chip.need_init = true; chip.need_init = true;
} }