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

refactoring - reducing GPIO complexity

This commit is contained in:
rusEfi 2017-04-21 20:07:17 -04:00
parent cd5b6ec7d8
commit f1801746f4
4 changed files with 60 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/config/stm32f4ems/efifeatures.h
View File

@ -209,10 +209,9 @@
// todo: finish migration to sdCardSpiDevice one day
#define MMC_CARD_SPI SPID3
#define EFI_I2C_SCL_PORT GPIOB
#define EFI_I2C_SCL_PIN 6
#define EFI_I2C_SDA_PORT GPIOB
#define EFI_I2C_SDA_PIN 7
#define EFI_I2C_SCL_BRAIN_PIN GPIOB_6
#define EFI_I2C_SDA_BRAIN_PIN GPIOB_7
#define EFI_I2C_AF 4
/**

53
firmware/hw_layer/adc_inputs.cpp
View File

@ -253,9 +253,51 @@ PWM_OUTPUT_DISABLED, NULL }, { PWM_OUTPUT_DISABLED, NULL } },
/* HW dependent part.*/
0, 0 };
static void initAdcPin(ioportid_t port, int pin, const char *msg) {
print("adc %s\r\n", msg);
mySetPadMode("adc input", port, pin, PAL_MODE_INPUT_ANALOG);
static void initAdcPin(brain_pin_e pin, const char *msg) {
// todo: migrate to scheduleMsg if we want this back print("adc %s\r\n", msg);
mySetPadMode2("adc input", pin, PAL_MODE_INPUT_ANALOG);
}
brain_pin_e getAdcChannelBrainPin(const char *msg, adc_channel_e hwChannel) {
// todo: replace this with an array :)
switch (hwChannel) {
case ADC_CHANNEL_IN0:
return GPIOA_0;
case ADC_CHANNEL_IN1:
return GPIOA_1;
case ADC_CHANNEL_IN2:
return GPIOA_2;
case ADC_CHANNEL_IN3:
return GPIOA_3;
case ADC_CHANNEL_IN4:
return GPIOA_4;
case ADC_CHANNEL_IN5:
return GPIOA_5;
case ADC_CHANNEL_IN6:
return GPIOA_6;
case ADC_CHANNEL_IN7:
return GPIOA_7;
case ADC_CHANNEL_IN8:
return GPIOB_0;
case ADC_CHANNEL_IN9:
return GPIOB_1;
case ADC_CHANNEL_IN10:
return GPIOC_0;
case ADC_CHANNEL_IN11:
return GPIOC_1;
case ADC_CHANNEL_IN12:
return GPIOC_2;
case ADC_CHANNEL_IN13:
return GPIOC_3;
case ADC_CHANNEL_IN14:
return GPIOC_4;
case ADC_CHANNEL_IN15:
return GPIOC_5;
default:
firmwareError(CUSTOM_ERR_6516, "Unknown hw channel %d [%s]", hwChannel, msg);
return GPIO_INVALID;
}
}
adc_channel_e getAdcChannel(brain_pin_e pin) {
@ -297,6 +339,7 @@ adc_channel_e getAdcChannel(brain_pin_e pin) {
}
}
// deprecated - migrate to 'getAdcChannelBrainPin'
ioportid_t getAdcChannelPort(const char *msg, adc_channel_e hwChannel) {
// todo: replace this with an array :)
switch (hwChannel) {
@ -348,6 +391,7 @@ const char * getAdcMode(adc_channel_e hwChannel) {
return "INACTIVE - need restart";
}
// deprecated - migrate to 'getAdcChannelBrainPin'
int getAdcChannelPin(adc_channel_e hwChannel) {
// todo: replace this with an array :)
switch (hwChannel) {
@ -390,8 +434,7 @@ int getAdcChannelPin(adc_channel_e hwChannel) {
}
static void initAdcHwChannel(adc_channel_e hwChannel) {
ioportid_t port = getAdcChannelPort("adc", hwChannel);
int pin = getAdcChannelPin(hwChannel);
brain_pin_e pin = getAdcChannelBrainPin("adc", hwChannel);
initAdcPin(port, pin, "hw");
}

8
firmware/hw_layer/adc_inputs.h
View File

@ -15,11 +15,17 @@
#if HAL_USE_ADC || defined(__DOXYGEN__)
const char * getAdcMode(adc_channel_e hwChannel);
int getAdcChannelPin(adc_channel_e hwChannel);
void initAdcInputs(bool boardTestMode);
void adc_callback_fast(ADCDriver *adcp, adcsample_t *buffer, size_t n);
// deprecated - migrate to 'getAdcChannelBrainPin'
int getAdcChannelPin(adc_channel_e hwChannel);
// deprecated - migrate to 'getAdcChannelBrainPin'
ioportid_t getAdcChannelPort(const char *msg, adc_channel_e hwChannel);
adc_channel_e getAdcChannel(brain_pin_e pin);
brain_pin_e getAdcChannelBrainPin(const char *msg, adc_channel_e hwChannel);
void doSlowAdc(void);
int getAdcHardwareIndexByInternalIndex(int index);

6
firmware/hw_layer/hardware.cpp
View File

@ -120,10 +120,8 @@ void initI2Cmodule(void) {
i2cInit();
i2cStart(&I2CD1, &i2cfg);
mySetPadMode("I2C clock", EFI_I2C_SCL_PORT, EFI_I2C_SCL_PIN,
PAL_MODE_ALTERNATE(EFI_I2C_AF) | PAL_STM32_OTYPE_OPENDRAIN);
mySetPadMode("I2C data", EFI_I2C_SDA_PORT, EFI_I2C_SDA_PIN,
PAL_MODE_ALTERNATE(EFI_I2C_AF) | PAL_STM32_OTYPE_OPENDRAIN);
mySetPadMode2("I2C clock", EFI_I2C_SCL_BRAIN_PIN, PAL_MODE_ALTERNATE(EFI_I2C_AF) | PAL_STM32_OTYPE_OPENDRAIN);
mySetPadMode2("I2C data", EFI_I2C_SDA_BRAIN_PIN, PAL_MODE_ALTERNATE(EFI_I2C_AF) | PAL_STM32_OTYPE_OPENDRAIN);
}
//static char txbuf[1];