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

auto-sync

This commit is contained in:
rusEfi 2014-11-26 22:03:05 -06:00
parent 73572657dc
commit 8b197451ed
5 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/controllers/core/le_functions.cpp
View File

@ -22,6 +22,7 @@ static LENameOrdinalPair leMaf(LE_METHOD_MAF, "maf");
static LENameOrdinalPair leVBatt(LE_METHOD_VBATT, "vbatt"); static LENameOrdinalPair leVBatt(LE_METHOD_VBATT, "vbatt");
static LENameOrdinalPair leFan(LE_METHOD_FAN, "fan"); static LENameOrdinalPair leFan(LE_METHOD_FAN, "fan");
static LENameOrdinalPair leCoolant(LE_METHOD_COOLANT, "coolant"); static LENameOrdinalPair leCoolant(LE_METHOD_COOLANT, "coolant");
static LENameOrdinalPair leAcToggle(LE_METHOD_AC_TOGGLE, "ac_toggle");
static LENameOrdinalPair leFanOnSetting(LE_METHOD_FAN_ON_SETTING, "fan_on_setting"); static LENameOrdinalPair leFanOnSetting(LE_METHOD_FAN_ON_SETTING, "fan_on_setting");
static LENameOrdinalPair leFanOffSetting(LE_METHOD_FAN_OFF_SETTING, "fan_off_setting"); static LENameOrdinalPair leFanOffSetting(LE_METHOD_FAN_OFF_SETTING, "fan_off_setting");
static LENameOrdinalPair leTimeSinceBoot(LE_METHOD_TIME_SINCE_BOOT, "time_since_boot"); static LENameOrdinalPair leTimeSinceBoot(LE_METHOD_TIME_SINCE_BOOT, "time_since_boot");
@ -32,6 +33,8 @@ float getLEValue(Engine *engine, le_action_e action) {
switch (action) { switch (action) {
case LE_METHOD_FAN: case LE_METHOD_FAN:
return getOutputPinValue(FAN_RELAY); return getOutputPinValue(FAN_RELAY);
case LE_METHOD_AC_TOGGLE:
return getAcToggle(engine);
case LE_METHOD_COOLANT: case LE_METHOD_COOLANT:
return getCoolantTemperature(engine); return getCoolantTemperature(engine);
case LE_METHOD_INTAKE_AIR: case LE_METHOD_INTAKE_AIR:

1
firmware/controllers/core/logic_expression.h
View File

@ -38,6 +38,7 @@ typedef enum {
LE_METHOD_MAF = 107, LE_METHOD_MAF = 107,
LE_METHOD_INTAKE_AIR = 108, LE_METHOD_INTAKE_AIR = 108,
LE_METHOD_VBATT = 109, LE_METHOD_VBATT = 109,
LE_METHOD_AC_TOGGLE = 110,
Force_4b_le_action = ENUM_SIZE_HACK, Force_4b_le_action = ENUM_SIZE_HACK,

5
firmware/controllers/engine_controller.cpp
View File

@ -277,7 +277,9 @@ static void printAnalogChannelInfoExt(const char *name, adc_channel_e hwChannel,
} }
static void printAnalogChannelInfo(const char *name, adc_channel_e hwChannel) { static void printAnalogChannelInfo(const char *name, adc_channel_e hwChannel) {
printAnalogChannelInfoExt(name, hwChannel, getVoltage(hwChannel)); if (hwChannel != EFI_ADC_NONE) {
printAnalogChannelInfoExt(name, hwChannel, getVoltage(hwChannel));
}
} }
static void printAnalogInfo(void) { static void printAnalogInfo(void) {
@ -292,6 +294,7 @@ static void printAnalogInfo(void) {
if (engineConfiguration->hasBaroSensor) { if (engineConfiguration->hasBaroSensor) {
printAnalogChannelInfo("BARO", engineConfiguration->baroSensor.hwChannel); printAnalogChannelInfo("BARO", engineConfiguration->baroSensor.hwChannel);
} }
printAnalogChannelInfo("A/C sw", engineConfiguration->acSwitchAdc);
printAnalogChannelInfoExt("Vbatt", engineConfiguration->vbattAdcChannel, getVBatt(engineConfiguration)); printAnalogChannelInfoExt("Vbatt", engineConfiguration->vbattAdcChannel, getVBatt(engineConfiguration));
} }

12
firmware/controllers/sensors/allsensors.cpp
View File

@ -12,3 +12,15 @@
void initSensors(Engine *engine) { void initSensors(Engine *engine) {
initThermistors(engine); initThermistors(engine);
} }
// todo: move this somewhere else? maybe.
bool getAcToggle(Engine *engine) {
engine_configuration_s *engineConfiguration = engine->engineConfiguration;
/**
* todo: make this flexible
*
* for now we are looking for a pull-up. High level means input switch is floating (which is OFF position)
* low value means input is ground - which means ON.
*/
return getVoltageDivided(engine->engineConfiguration->acSwitchAdc) < 2.5;
}

2
firmware/controllers/sensors/allsensors.h
View File

@ -27,4 +27,6 @@
void initSensors(Engine *engine); void initSensors(Engine *engine);
bool getAcToggle(Engine *engine);
#endif /*SENSORS_H_*/ #endif /*SENSORS_H_*/