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

pin_repository: fix for boards with gapes in brain_pin_e 

Some additional math should be done to convert brain_pin_e to index
and back in case board do not have all chips exist in enum.

ifdef hell is for Kinetis board that uses its own brain_pin_e enum
This commit is contained in:
Andrey Gusakov 2020-02-13 02:55:09 -05:00 committed by rusefi
parent 30ccaa4c24
commit dae398d6cd
1 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
firmware/hw_layer/pin_repository.cpp
View File

@ -32,6 +32,25 @@ static int brainPin_to_index(brain_pin_e brainPin)
index = brainPin - GPIOA_0;
if ((unsigned)index < getNumBrainPins())
return index;
/* gpiochips magic: skip gates for absent chips */
#ifdef TLE8888_PIN_1
if ((brainPin >= TLE8888_PIN_1) && (BOARD_TLE8888_COUNT == 0))
index -= (TLE8888_PIN_28 -TLE8888_PIN_1 + 1);
#endif
#ifdef MC33972_PIN_1
if ((brainPin >= MC33972_PIN_1) && (BOARD_MC33972_COUNT == 0))
index -= (MC33972_PIN_22 - MC33972_PIN_1 + 1);
#endif
#ifdef TLE6240_PIN_1
if ((brainPin >= TLE6240_PIN_1) && (BOARD_TLE6240_COUNT == 0))
index -= (TLE6240_PIN_16 - TLE6240_PIN_1 + 1);
#endif
/* if index outside array boundary */
if ((unsigned)index >= getNumBrainPins() + BOARD_EXT_PINREPOPINS)
return -1;
@ -39,9 +58,31 @@ static int brainPin_to_index(brain_pin_e brainPin)
return index;
}
static brain_pin_e index_to_brainPin(int i)
static brain_pin_e index_to_brainPin(unsigned int i)
{
return (brain_pin_e)((int)GPIOA_0 + i);
brain_pin_e brainPin = (brain_pin_e)((int)GPIOA_0 + i);
/* on-chip pins */
if (i < getNumBrainPins())
return brainPin;
/* gpiochips magic: skip absent chips */
#ifdef TLE6240_PIN_1
if (BOARD_TLE6240_COUNT == 0)
brainPin += (TLE6240_PIN_16 - TLE6240_PIN_1 + 1);
#endif
#ifdef MC33972_PIN_1
if (BOARD_MC33972_COUNT == 0)
brainPin += (MC33972_PIN_22 - MC33972_PIN_1 + 1);
#endif
#ifdef TLE8888_PIN_1
if (BOARD_TLE8888_COUNT == 0)
brainPin += (TLE8888_PIN_28 -TLE8888_PIN_1 + 1);
#endif
return brainPin;
}
PinRepository::PinRepository() {