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 2015-05-09 12:05:55 -04:00
parent 80b6c3321c
commit d6e3610317
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/dodge_ram.cpp
View File

@ -9,11 +9,13 @@
#include "main.h" #include "main.h"
#include "dodge_ram.h" #include "dodge_ram.h"
#include "custom_engine.h"
EXTERN_ENGINE EXTERN_ENGINE
; ;
void setDodgeRam1996(DECLARE_ENGINE_PARAMETER_F) { void setDodgeRam1996(DECLARE_ENGINE_PARAMETER_F) {
setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F);
board_configuration_s * boardConfiguration = &engineConfiguration->bc; board_configuration_s * boardConfiguration = &engineConfiguration->bc;
setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR);

2
firmware/console/status_loop.cpp
View File

@ -332,7 +332,7 @@ void updateDevConsoleState(Engine *engine) {
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE || defined(__DOXYGEN__)
// todo: unify with simulator! // todo: unify with simulator!
if (hasFirmwareError()) { if (hasFirmwareError()) {
scheduleMsg(&logger, "firmware error: %s", errorMessageBuffer); scheduleMsg(&logger, "FATAL error: %s", errorMessageBuffer);
warningEnabled = false; warningEnabled = false;
scheduleLogging(&logger); scheduleLogging(&logger);
return; return;

7
firmware/hw_layer/adc_inputs.cpp
View File

@ -21,6 +21,7 @@
#include "engine_controller.h" #include "engine_controller.h"
static adc_channel_mode_e adcHwChannelEnabled[HW_MAX_ADC_INDEX]; static adc_channel_mode_e adcHwChannelEnabled[HW_MAX_ADC_INDEX];
static const char * adcHwChannelUsage[HW_MAX_ADC_INDEX];
AdcDevice::AdcDevice(ADCConversionGroup* hwConfig) { AdcDevice::AdcDevice(ADCConversionGroup* hwConfig) {
this->hwConfig = hwConfig; this->hwConfig = hwConfig;
@ -297,7 +298,7 @@ GPIO_TypeDef* getAdcChannelPort(adc_channel_e hwChannel) {
case ADC_CHANNEL_IN15: case ADC_CHANNEL_IN15:
return GPIOC; return GPIOC;
default: default:
firmwareError("Unknown hw channel"); firmwareError("Unknown hw channel %d", hwChannel);
return NULL; return NULL;
} }
} }
@ -348,7 +349,7 @@ int getAdcChannelPin(adc_channel_e hwChannel) {
case ADC_CHANNEL_IN15: case ADC_CHANNEL_IN15:
return 5; return 5;
default: default:
firmwareError("Unknown hw channel"); firmwareError("Unknown hw channel %d", hwChannel);
return -1; return -1;
} }
} }
@ -477,11 +478,13 @@ static void addChannel(const char *name, adc_channel_e setting, adc_channel_mode
firmwareError("ADC mapping error: input %s for %s already used?", errorMsgBuff, name); firmwareError("ADC mapping error: input %s for %s already used?", errorMsgBuff, name);
} }
adcHwChannelUsage[setting] = name;
adcHwChannelEnabled[setting] = mode; adcHwChannelEnabled[setting] = mode;
} }
static void configureInputs(void) { static void configureInputs(void) {
memset(adcHwChannelEnabled, 0, sizeof(adcHwChannelEnabled)); memset(adcHwChannelEnabled, 0, sizeof(adcHwChannelEnabled));
memset(adcHwChannelUsage, 0, sizeof(adcHwChannelUsage));
addChannel("TPS", engineConfiguration->tpsAdcChannel, ADC_FAST); addChannel("TPS", engineConfiguration->tpsAdcChannel, ADC_FAST);
addChannel("MAP", engineConfiguration->map.sensor.hwChannel, ADC_FAST); addChannel("MAP", engineConfiguration->map.sensor.hwChannel, ADC_FAST);