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

MRE: tle8888 ls2 fix and friends (#4409) 

* tle8888: ups IGN1

* tle8888: more BIT() macro

* tle8888: fix typos

* tle8888: fix LS2 output on MRE when stepper is enabled

Default settings casue one (or few) not used direct driver inputs
to be mapped to OUT5 (LS2 on MRE)

* smart_gpio: comments for TLE8888 on MicroRusEFI

* smart_gpio: typo

* tle8888: more comments
This commit is contained in:
Andrey G 2022-08-02 00:50:56 +03:00 committed by GitHub
parent 2096a22319
commit ce7fc8e69d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
firmware/hw_layer/drivers/gpio/tle8888.cpp
View File

@ -132,7 +132,7 @@ typedef enum {
* Default open window time is 0b0011 * 3.2 = 12.8 mS */ * Default open window time is 0b0011 * 3.2 = 12.8 mS */
#define WWD_PERIOD_MS (100.8 + (12.8 / 2)) #define WWD_PERIOD_MS (100.8 + (12.8 / 2))
/* DOTO: add irq support */ /* TODO: add irq support */
#define DIAG_PERIOD_MS (7) #define DIAG_PERIOD_MS (7)
const uint8_t tle8888_fwd_responses[16][4] = { const uint8_t tle8888_fwd_responses[16][4] = {
@ -553,7 +553,7 @@ int Tle8888::update_direct_output(size_t pin, int value)
if (pin < 4) { if (pin < 4) {
/* OUT1..4 */ /* OUT1..4 */
index = pin; index = pin;
} else if (pin > 24) { } else if (pin >= 24) {
/* IGN1..4 */ /* IGN1..4 */
index = (pin - 24) + 4; index = (pin - 24) + 4;
} else { } else {
@ -956,14 +956,14 @@ int Tle8888::writePad(unsigned int pin, int value) {
chibios_rt::CriticalSectionLocker csl; chibios_rt::CriticalSectionLocker csl;
if (value) { if (value) {
o_state |= (1 << pin); o_state |= BIT(pin);
} else { } else {
o_state &= ~(1 << pin); o_state &= ~BIT(pin);
} }
} }
/* direct driven? */ /* direct driven? */
if (o_direct_mask & (1 << pin)) { if (o_direct_mask & BIT(pin)) {
return update_direct_output(pin, value); return update_direct_output(pin, value);
} else { } else {
return wake_driver(); return wake_driver();
@ -977,7 +977,7 @@ int Tle8888::readPad(size_t pin) {
if (pin < TLE8888_OUTPUTS_REGULAR) { if (pin < TLE8888_OUTPUTS_REGULAR) {
/* return output state */ /* return output state */
/* DOTO: check that pins is disabled by diagnostic? */ /* TODO: check that pins is disabled by diagnostic? */
return !!(o_data_cached & BIT(pin)); return !!(o_data_cached & BIT(pin));
} else if (pin == TLE8888_OUTPUT_MR) { } else if (pin == TLE8888_OUTPUT_MR) {
/* Main relay can be enabled by KEY input, so report real state */ /* Main relay can be enabled by KEY input, so report real state */
@ -1097,6 +1097,17 @@ int Tle8888::chip_init_data() {
palClearPort(cfg->inj_en.port, PAL_PORT_BIT(cfg->inj_en.pad)); palClearPort(cfg->inj_en.port, PAL_PORT_BIT(cfg->inj_en.pad));
} }
for (i = 0; i < TLE8888_DIRECT_MISC; i++) {
/* Set some invalid default OUT number...
* Keeping this register default (0) will map one of input signals
* to OUT5 and no control over SPI for this pin will be possible.
* If some other pin is also mapped to OUT5 both inputs should be
* high (logical AND) to enable OUT5.
* Set non-exist output in case no override is provided in config.
* See code below */
InConfig[i] = 25 - 1 - 4;
}
for (i = 0; i < TLE8888_DIRECT_OUTPUTS; i++) { for (i = 0; i < TLE8888_DIRECT_OUTPUTS; i++) {
int out = -1; int out = -1;
uint32_t mask; uint32_t mask;
@ -1113,12 +1124,16 @@ int Tle8888::chip_init_data() {
out = cfg->direct_maps[i - 8].output - 1; out = cfg->direct_maps[i - 8].output - 1;
} }
if ((out < 0) || (cfg->direct_gpio[i].port == NULL)) if ((out < 0) || (cfg->direct_gpio[i].port == NULL)) {
/* now this is safe, InConfig[] is inited with some non-exist output */
continue; continue;
}
/* TODO: implement PP pin driving throught direct gpio */ /* TODO: implement PP pin driving throught direct gpio */
if ((cfg->stepper) && (out >= 20) && (out <= 23)) if ((cfg->stepper) && (out >= 20) && (out <= 23)) {
/* now this is safe, InConfig[] is inited with some non-exist output */
continue; continue;
}
/* calculate mask */ /* calculate mask */
mask = BIT(out); mask = BIT(out);

10
firmware/hw_layer/smart_gpio.cpp
View File

@ -163,7 +163,7 @@ struct tle8888_config tle8888_cfg = {
[1] = {.port = GPIOE, .pad = 13}, [1] = {.port = GPIOE, .pad = 13},
[2] = {.port = GPIOE, .pad = 12}, [2] = {.port = GPIOE, .pad = 12},
[3] = {.port = GPIOE, .pad = 11}, [3] = {.port = GPIOE, .pad = 11},
/* IN5..8 -> IGN1..IGN4 (Ignotors) */ /* IN5..8 -> IGN1..IGN4 (Ignitors) */
/* Not used */ /* Not used */
[4] = {.port = NULL, .pad = 0}, [4] = {.port = NULL, .pad = 0},
[5] = {.port = NULL, .pad = 0}, [5] = {.port = NULL, .pad = 0},
@ -176,10 +176,10 @@ struct tle8888_config tle8888_cfg = {
[11] = {.port = GPIOE, .pad = 7}, [11] = {.port = GPIOE, .pad = 7},
}, },
.direct_maps = { .direct_maps = {
[0] = {.output = 5}, [0] = {.output = 5}, /* MRE: LS2 */
[1] = {.output = 6}, [1] = {.output = 6}, /* MRE: LS1 */
[2] = {.output = 21}, [2] = {.output = 21}, /* MRE: GP1 - not used when stepper = true */
[3] = {.output = 22}, [3] = {.output = 22}, /* MRE: GP2 - not used when stepper = true */
}, },
.ign_en = {.port = GPIOD, .pad = 10}, .ign_en = {.port = GPIOD, .pad = 10},
.inj_en = {.port = GPIOD, .pad = 11}, .inj_en = {.port = GPIOD, .pad = 11},