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

auto-sync

This commit is contained in:
rusEfi 2015-07-10 23:01:24 -04:00
parent 260b98d803
commit 5bf5c70c11
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
firmware/hw_layer/HIP9011.cpp
View File

@ -112,8 +112,9 @@ static void checkResponse(void) {
spiUnselect(driver); \ spiUnselect(driver); \
checkResponse(); checkResponse();
// todo: make this configurable spi_device_e spiDevice = SPI_DEVICE_2;
static SPIDriver *driver = &SPID2;
static SPIDriver *driver;
EXTERN_ENGINE EXTERN_ENGINE
; ;
@ -141,7 +142,9 @@ static void showHipInfo(void) {
currentIntergratorIndex, engineConfiguration->knockVThreshold, currentIntergratorIndex, engineConfiguration->knockVThreshold,
engine->knockCount, engineConfiguration->maxKnockSubDeg); engine->knockCount, engineConfiguration->maxKnockSubDeg);
scheduleMsg(logger, "spi= IntHold@%s response count=%d incorrect response=%d", hwPortname(boardConfiguration->hip9011IntHoldPin), scheduleMsg(logger, "spi=%s IntHold@%s response count=%d incorrect response=%d",
getSpi_device_e(spiDevice),
hwPortname(boardConfiguration->hip9011IntHoldPin),
correctResponse, invalidResponse); correctResponse, invalidResponse);
scheduleMsg(logger, "CS@%s updateCount=%d", hwPortname(boardConfiguration->hip9011CsPin), settingUpdateCount); scheduleMsg(logger, "CS@%s updateCount=%d", hwPortname(boardConfiguration->hip9011CsPin), settingUpdateCount);
@ -151,6 +154,9 @@ static void showHipInfo(void) {
getPinNameByAdcChannel(engineConfiguration->hipOutputChannel, pinNameBuffer), getPinNameByAdcChannel(engineConfiguration->hipOutputChannel, pinNameBuffer),
hipValueMax, hipValueMax,
spiCount, boardConfiguration->useTpicAdvancedMode); spiCount, boardConfiguration->useTpicAdvancedMode);
scheduleMsg(logger, "mosi=%s", hwPortname(getMosiPin(spiDevice)));
scheduleMsg(logger, "miso=%s", hwPortname(getMisoPin(spiDevice)));
scheduleMsg(logger, "sck=%s", hwPortname(getSckPin(spiDevice)));
scheduleMsg(logger, "start %f end %f", engineConfiguration->knockDetectionWindowStart, scheduleMsg(logger, "start %f end %f", engineConfiguration->knockDetectionWindowStart,
engineConfiguration->knockDetectionWindowEnd); engineConfiguration->knockDetectionWindowEnd);
@ -348,6 +354,10 @@ static void hipStartupCode(void) {
chThdSleepMilliseconds(10); chThdSleepMilliseconds(10);
if (correctResponse == 0) {
warning(OBD_PCM_Processor_Fault, "TPIC/HIP does not respond");
}
if (boardConfiguration->useTpicAdvancedMode) { if (boardConfiguration->useTpicAdvancedMode) {
// enable advanced mode for digital integrator output // enable advanced mode for digital integrator output
SPI_SYNCHRONOUS(SET_ADVANCED_MODE); SPI_SYNCHRONOUS(SET_ADVANCED_MODE);
@ -381,6 +391,7 @@ static msg_t hipThread(void *arg) {
} }
void initHip9011(Logging *sharedLogger) { void initHip9011(Logging *sharedLogger) {
driver = getSpiDevice(spiDevice);
logger = sharedLogger; logger = sharedLogger;
addConsoleAction("hipinfo", showHipInfo); addConsoleAction("hipinfo", showHipInfo);
if (!boardConfiguration->isHip9011Enabled) if (!boardConfiguration->isHip9011Enabled)