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

Revert "Minor fixes (#1442)" 

This reverts commit 0c095ddd
This commit is contained in:
rusefi 2020-05-16 19:28:49 -04:00
parent 0c095ddd15
commit af8de4c84f
10 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/boards/kinetis/efifeatures.h
View File

@ -339,7 +339,6 @@
#define BOARD_TLE6240_COUNT 1
#define BOARD_MC33972_COUNT 0
#define BOARD_TLE8888_COUNT 0
#define BOARD_MC33810_COUNT 0
#define TLE6240_SS_PORT GPIOB
#define TLE6240_SS_PAD 0U

3
firmware/config/boards/prometheus/efifeatures.h
View File

@ -70,9 +70,6 @@
#define BOARD_TLE8888_COUNT 0
#endif
#ifndef BOARD_MC33810_COUNT
#define BOARD_MC33810_COUNT 0
#endif
#undef EFI_CONSOLE_TX_BRAIN_PIN
#define EFI_CONSOLE_TX_BRAIN_PIN GPIOA_0

1
firmware/config/boards/skeleton/efifeatures.h
View File

@ -85,7 +85,6 @@
#define BOARD_TLE6240_COUNT 0
#define BOARD_MC33972_COUNT 0
#define BOARD_TLE8888_COUNT 0
#define BOARD_MC33810_COUNT 0
/**
* if you have a 60-2 trigger, or if you just want better performance, you

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

@ -146,10 +146,6 @@
#define BOARD_TLE8888_COUNT 1
#endif
#ifndef BOARD_MC33810_COUNT
#define BOARD_MC33810_COUNT 0
#endif
#define EFI_ANALOG_SENSORS TRUE
#ifndef EFI_MAX_31855

4
firmware/config/stm32f7ems/efifeatures.h
View File

@ -50,10 +50,6 @@
#define BOARD_TLE8888_COUNT 1
#endif
#ifndef BOARD_MC33810_COUNT
#define BOARD_MC33810_COUNT 0
#endif
#undef EFI_CAN_SUPPORT
#define EFI_CAN_SUPPORT TRUE

13
firmware/hw_layer/digital_input_exti.cpp
View File

@ -11,7 +11,6 @@
#include "digital_input_exti.h"
#include "efi_gpio.h"
#include "error_handling.h"
#include "pin_repository.h"
/**
* EXTI is a funny thing: you can only use same pin on one port. For example, you can use
@ -24,23 +23,23 @@
static ioportmask_t ext_used = 0;
// EXT is not able to give you the front direction but you could read the pin in the callback.
int efiExtiEnablePin(const char *msg, brain_pin_e brainPin, uint32_t mode, palcallback_t cb, void *cb_data) {
void efiExtiEnablePin(const char *msg, brain_pin_e brainPin, uint32_t mode, palcallback_t cb, void *cb_data) {
/* paranoid check, in case of GPIO_UNASSIGNED getHwPort will return NULL
* and we will fail on next check */
if (brainPin == GPIO_UNASSIGNED)
return -1;
return;
ioportid_t port = getHwPort(msg, brainPin);
if (port == NULL)
return -1;
return;
int index = getHwPin(msg, brainPin);
/* is this index already used? */
if (ext_used & PAL_PORT_BIT(index)) {
firmwareError(CUSTOM_ERR_PIN_ALREADY_USED_2, "%s: pin %d: exti index already used", msg, brainPin);
return -1;
return;
}
ioline_t line = PAL_LINE(port, index);
@ -49,9 +48,6 @@ int efiExtiEnablePin(const char *msg, brain_pin_e brainPin, uint32_t mode, palca
/* mark used */
ext_used |= PAL_PORT_BIT(index);
brain_pin_markUsed(brainPin, msg);
return 0;
}
void efiExtiDisablePin(brain_pin_e brainPin)
@ -77,7 +73,6 @@ void efiExtiDisablePin(brain_pin_e brainPin)
/* mark unused */
ext_used &= ~PAL_PORT_BIT(index);
brain_pin_markUnused(brainPin);
}
#endif /* HAL_USE_PAL && EFI_PROD_CODE */

2
firmware/hw_layer/digital_input_exti.h
View File

@ -10,6 +10,6 @@
#include "digital_input.h"
#if HAL_USE_PAL
int efiExtiEnablePin(const char *msg, brain_pin_e pin, uint32_t mode, palcallback_t cb, void *cb_data);
void efiExtiEnablePin(const char *msg, brain_pin_e pin, uint32_t mode, palcallback_t cb, void *cb_data);
void efiExtiDisablePin(brain_pin_e brainPin);
#endif /* HAL_USE_PAL */

1
firmware/hw_layer/digital_input_icu.cpp
View File

@ -221,6 +221,7 @@ void stopDigitalCapture(const char *msg, brain_pin_e brainPin) {
if (brainPin == GPIO_UNASSIGNED) {
return;
}
brain_pin_markUnused(brainPin);
ICUDriver *driver = getInputCaptureDriver(msg, brainPin);
if (driver == NULL) {

12
firmware/hw_layer/smart_gpio.h
View File

@ -12,11 +12,7 @@
#include "drivers/gpio/tle6240.h"
#include "drivers/gpio/mc33972.h"
#include "drivers/gpio/tle8888.h"
#define BOARD_EXT_PINREPOPINS \
(BOARD_TLE6240_COUNT * TLE6240_OUTPUTS + \
BOARD_MC33972_COUNT * MC33972_INPUTS + \
BOARD_TLE8888_COUNT * TLE8888_OUTPUTS + \
BOARD_MC33810_COUNT * MC33810_OUTPUTS)
#define BOARD_EXT_PINREPOPINS (BOARD_TLE6240_COUNT * TLE6240_OUTPUTS + BOARD_MC33972_COUNT * MC33972_INPUTS + BOARD_TLE8888_COUNT * TLE8888_OUTPUTS)
#else /* EFI_PROD_CODE */
#define BOARD_EXT_PINREPOPINS 0
@ -25,11 +21,7 @@
#if EFI_UNIT_TEST
#define BOARD_EXT_GPIOCHIPS 3
#else
#define BOARD_EXT_GPIOCHIPS \
(BOARD_TLE6240_COUNT + \
BOARD_MC33972_COUNT + \
BOARD_TLE8888_COUNT + \
BOARD_MC33810_COUNT)
#define BOARD_EXT_GPIOCHIPS (BOARD_TLE6240_COUNT + BOARD_MC33972_COUNT + BOARD_TLE8888_COUNT)
#endif
void initSmartGpio(void);

7
firmware/hw_layer/trigger_input_exti.cpp
View File

@ -76,7 +76,6 @@ static void cam_callback(void *arg) {
/*==========================================================================*/
int extiTriggerTurnOnInputPin(const char *msg, int index, bool isTriggerShaft) {
int ret;
brain_pin_e brainPin = isTriggerShaft ? CONFIG(triggerInputPins)[index] : engineConfiguration->camInputs[index];
scheduleMsg(logger, "extiTriggerTurnOnInputPin %s %s", msg, hwPortname(brainPin));
@ -84,10 +83,8 @@ int extiTriggerTurnOnInputPin(const char *msg, int index, bool isTriggerShaft) {
/* TODO:
* * do not set to both edges if we need only one
* * simplify callback in case of one edge */
ioline_t pal_line = PAL_LINE(getHwPort(msg, brainPin), getHwPin(msg, brainPin));
ret = efiExtiEnablePin(msg, brainPin, PAL_EVENT_MODE_BOTH_EDGES, isTriggerShaft ? shaft_callback : cam_callback, (void *)pal_line);
if (ret)
return ret;
ioline_t pal_line = PAL_LINE(getHwPort("trg", brainPin), getHwPin("trg", brainPin));
efiExtiEnablePin(msg, brainPin, PAL_EVENT_MODE_BOTH_EDGES, isTriggerShaft ? shaft_callback : cam_callback, (void *)pal_line);
return 0;
}