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

auto-sync

This commit is contained in:
rusEfi 2014-09-06 17:02:55 -05:00
parent 71bf0cb0e9
commit b36db23557
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/engine_configuration.cpp
View File

@ -335,6 +335,8 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
boardConfiguration->triggerInputPins[1] = GPIOA_5;
boardConfiguration->logicAnalyzerPins[0] = GPIOA_8;
boardConfiguration->logicAnalyzerPins[1] = GPIOE_7; // todo: E7 is not timer input, that's a bug!
boardConfiguration->logicAnalyzerPins[2] = GPIO_NONE;
boardConfiguration->logicAnalyzerPins[3] = GPIO_NONE;
boardConfiguration->logicAnalyzerMode[0] = false;
boardConfiguration->logicAnalyzerMode[1] = false;

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

@ -159,10 +159,8 @@ typedef struct {
adc_channel_mode_e adcHwChannelEnabled[HW_MAX_ADC_INDEX];
// todo: we should have up to three trigger input channels
brain_pin_e triggerInputPins[2];
// todo: we should have up to four login input channels
brain_pin_e logicAnalyzerPins[LOGIC_ANALYZER_CHANNEL_COUNT];
brain_pin_e triggerInputPins[3];
int unused4;
int idleThreadPeriod;
int consoleLoopPeriod;
@ -189,9 +187,10 @@ typedef struct {
unsigned int is_enabled_spi_3 : 1; // bit 2
unsigned int isSdCardEnabled : 1; // bit 3
int unused2[6];
brain_pin_e logicAnalyzerPins[LOGIC_ANALYZER_CHANNEL_COUNT];
uint8_t logicAnalyzerMode[LOGIC_ANALYZER_CHANNEL_COUNT];
uint8_t logicAnalyzerMode[4];
int unused2[2];
} board_configuration_s;

6
firmware/controllers/algo/fuel_math.cpp
View File

@ -120,12 +120,18 @@ float getIatCorrection(float iat) {
return interpolate2d(iat, engineConfiguration->iatFuelCorrBins, engineConfiguration->iatFuelCorr, IAT_CURVE_SIZE);
}
/**
* @return Fuel injection duration injection as specified in the fuel map, in milliseconds
*/
float getBaseTableFuel(int rpm, float engineLoad) {
efiAssert(!cisnan(engineLoad), "invalid el", NAN);
return fuelMap.getValue(engineLoad, engineConfiguration->fuelLoadBins, rpm,
engineConfiguration->fuelRpmBins);
}
/**
* @return Duration of fuel injection while craning, in milliseconds
*/
float getCrankingFuel(void) {
return getStartingFuel(getCoolantTemperature());
}

2
firmware/controllers/algo/rusefi_enums.h
View File

@ -19,7 +19,7 @@
#define DIGIPOT_COUNT 4
#define LOGIC_ANALYZER_CHANNEL_COUNT 2
#define LOGIC_ANALYZER_CHANNEL_COUNT 4
typedef enum {
AUDI_AAN = 1,

2
firmware/controllers/flash_main.h
View File

@ -11,7 +11,7 @@
#include "engine_configuration.h"
#define FLASH_DATA_VERSION 4480
#define FLASH_DATA_VERSION 4560
#ifdef __cplusplus
extern "C"