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

auto-sync

This commit is contained in:
rusEfi 2014-09-07 17:04:23 -05:00
parent d2abfea5fb
commit f7835b3df1
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/config/engines/mazda_miata.cpp
View File

@ -12,6 +12,7 @@
#include "mazda_miata.h"
#include "engine_math.h"
#include "advance_map.h"
// setFrankenso_01_LCD
#include "honda_accord.h"
@ -259,7 +260,7 @@ void setMiata1994(engine_configuration_s *engineConfiguration, board_configurati
boardConfiguration->fuelPumpPin = GPIOE_4;
boardConfiguration->injectionPins[0] = GPIO_NONE;
boardConfiguration->injectionPins[0] = GPIOD_7;
boardConfiguration->injectionPins[1] = GPIOE_2;
boardConfiguration->injectionPins[2] = GPIOB_8;
boardConfiguration->injectionPins[3] = GPIOB_7;

9
firmware/controllers/algo/advance_map.h
View File

@ -8,19 +8,10 @@
#ifndef ADVANCE_H_
#define ADVANCE_H_
#ifdef __cplusplus
extern "C"
{
#endif /* __cplusplus */
#define AD_LOAD_COUNT 16
#define AD_RPM_COUNT 16
float getAdvance(int rpm, float engineLoad);
void prepareTimingMap(void);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* ADVANCE_H_ */

4
firmware/controllers/algo/engine_configuration.h
View File

@ -28,6 +28,8 @@ typedef struct {
short int crankingRpm;
} cranking_parameters_s;
#define INJECTION_PIN_COUNT 12
#define FUEL_RPM_COUNT 16
#define FUEL_LOAD_COUNT 16
#define VE_RPM_COUNT 16
@ -115,7 +117,7 @@ typedef struct {
brain_pin_e fuelPumpPin;
pin_output_mode_e fuelPumpPinMode;
brain_pin_e injectionPins[12];
brain_pin_e injectionPins[INJECTION_PIN_COUNT];
pin_output_mode_e injectionPinMode;
brain_pin_e ignitionPins[12];

15
firmware/controllers/settings.cpp
View File

@ -428,6 +428,20 @@ static void setPotSpi(int spi) {
boardConfiguration->digitalPotentiometerSpiDevice = (spi_device_e) spi;
}
static void setInjectionPin(const char *indexStr, const char *pinName) {
int index = atoi(indexStr);
if (index < 0 || index > INJECTION_PIN_COUNT)
return;
brain_pin_e pin = parseBrainPin(pinName);
// todo: extract method - code duplication with other 'set_xxx_pin' methods?
if (pin == GPIO_INVALID) {
scheduleMsg(&logger, "invalid pin name [%s]", pinName);
return;
}
scheduleMsg(&logger, "setting injection pin[%d] to %s please save&restart", index, hwPortname(pin));
boardConfiguration->injectionPins[index] = pin;
}
static void setTriggerInputPin(const char *indexStr, const char *pinName) {
int index = atoi(indexStr);
if (index < 0 || index > 2)
@ -673,6 +687,7 @@ void initSettings(void) {
addConsoleActionF("set_vbatt_divider", setVBattDivider);
#if EFI_PROD_CODE
addConsoleActionSS("set_injection_pin", setInjectionPin);
addConsoleActionSS("set_trigger_input_pin", setTriggerInputPin);
addConsoleActionSS("set_trigger_simulator_pin", setTriggerSimulatorPin);
addConsoleActionSS("set_trigger_simulator_mode", setTriggerSimulatorMode);