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-01-10 18:03:38 -06:00
parent 9d63205164
commit d57dc356c4
4 changed files with 36 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,8 +51,6 @@ case GPIO_8:
return "GPIO_8"; return "GPIO_8";
case GPIO_9: case GPIO_9:
return "GPIO_9"; return "GPIO_9";
case HIP9011_INT_HOLD:
return "HIP9011_INT_HOLD";
case INJECTOR_10_OUTPUT: case INJECTOR_10_OUTPUT:
return "INJECTOR_10_OUTPUT"; return "INJECTOR_10_OUTPUT";
case INJECTOR_11_OUTPUT: case INJECTOR_11_OUTPUT:
@ -157,10 +155,6 @@ case SPI_CS_3:
return "SPI_CS_3"; return "SPI_CS_3";
case SPI_CS_4: case SPI_CS_4:
return "SPI_CS_4"; return "SPI_CS_4";
case SPI_CS_HIP9011:
return "SPI_CS_HIP9011";
case SPI_CS_SD_MODULE:
return "SPI_CS_SD_MODULE";
} }
return NULL; return NULL;
} }

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

@ -107,10 +107,6 @@ typedef enum {
SPI_CS_2, SPI_CS_2,
SPI_CS_3, SPI_CS_3,
SPI_CS_4, SPI_CS_4,
SPI_CS_SD_MODULE,
SPI_CS_HIP9011,
HIP9011_INT_HOLD,
MAIN_RELAY, MAIN_RELAY,

107
firmware/hw_layer/HIP9011.cpp
View File

@ -35,10 +35,8 @@
#if EFI_HIP_9011 || defined(__DOXYGEN__) #if EFI_HIP_9011 || defined(__DOXYGEN__)
#define NEW_CODE TRUE static OutputPin intHold;
static OutputPin hipCs;
#define HIP_DEBUG FALSE
extern OutputPin outputs[IO_PIN_COUNT];
extern pin_output_mode_e DEFAULT_OUTPUT; extern pin_output_mode_e DEFAULT_OUTPUT;
@ -57,12 +55,7 @@ static int settingUpdateCount = 0;
*/ */
static bool_t isIntegrating = false; static bool_t isIntegrating = false;
/** /**
* we cannot afford relatively slow synchronous SPI communication from the scheduler callbacks, thus
* SPI is taken care from a dedicated thread where we care less about how long it would take
* true by default so that we can update the settings before starting to integrate
*/ */
static bool_t needToSendSpiCommand = true;
static bool_t isSendingSpiCommand = false; static bool_t isSendingSpiCommand = false;
static scheduling_s startTimer[2]; static scheduling_s startTimer[2];
@ -70,8 +63,6 @@ static scheduling_s endTimer[2];
static Logging logger; static Logging logger;
static THD_WORKING_AREA(htThreadStack, UTILITY_THREAD_STACK_SIZE);
// SPI_CR1_BR_1 // 5MHz // SPI_CR1_BR_1 // 5MHz
// SPI_CR1_CPHA Clock Phase // SPI_CR1_CPHA Clock Phase
// todo: nicer method which would mention SPI speed explicitly? // todo: nicer method which would mention SPI speed explicitly?
@ -100,59 +91,6 @@ static SPIDriver *driver = &SPID2;
EXTERN_ENGINE EXTERN_ENGINE
; ;
static msg_t ivThread(int param) {
chRegSetThreadName("HIP");
while (true) {
/**
* do we need this configurable? probably not
*/
chThdSleepMilliseconds(HIP_THREAD_PERIOD);
int integratorIndex = getIntegrationIndexByRpm(engine->rpmCalculator.rpmValue);
int gainIndex = getHip9011GainIndex(boardConfiguration->hip9011Gain);
if (currentGainIndex != gainIndex || currentIntergratorIndex != integratorIndex) {
needToSendSpiCommand = true;
}
/**
* Loop if nothing has really changed
*/
if (!needToSendSpiCommand)
continue;
/**
* Loop if the chip is busy. The 'needToSend' flag would prevent next integration, but we
* need to let current integration finish
*/
if (isIntegrating)
continue;
settingUpdateCount++;
SPI_SYNCHRONOUS(SET_GAIN_CMD + gainIndex);
currentGainIndex = gainIndex;
SPI_SYNCHRONOUS(SET_INTEGRATOR_CMD + integratorIndex);
currentIntergratorIndex = integratorIndex;
needToSendSpiCommand = false;
//// BAND_PASS_CMD
// SPI_SYNCHRONOUS(0x0 | (40 & 0x3F));
// // Set the gain 0b10000000
// SPI_SYNCHRONOUS(0x80 | (49 & 0x3F));
// // Set the integration time constant 0b11000000
// SPI_SYNCHRONOUS(0xC0 | (31 & 0x1F));
// // SET_ADVANCED_MODE 0b01110001
// SPI_SYNCHRONOUS(tx_buff[0] = 0x71;)
}
#if defined __GNUC__
return 0;
#endif
}
static void showHipInfo(void) { static void showHipInfo(void) {
printSpiState(&logger, boardConfiguration); printSpiState(&logger, boardConfiguration);
scheduleMsg(&logger, "bore=%f freq=%f", engineConfiguration->cylinderBore, BAND(engineConfiguration->cylinderBore)); scheduleMsg(&logger, "bore=%f freq=%f", engineConfiguration->cylinderBore, BAND(engineConfiguration->cylinderBore));
@ -175,13 +113,13 @@ void setHip9011FrankensoPinout(void) {
} }
static void startIntegration(void) { static void startIntegration(void) {
if (!needToSendSpiCommand) { if (!isSendingSpiCommand) {
/** /**
* SPI communication is only allowed while not integrating, so we postpone the exchange * SPI communication is only allowed while not integrating, so we postpone the exchange
* until we are done integrating * until we are done integrating
*/ */
isIntegrating = true; isIntegrating = true;
turnPinHigh(HIP9011_INT_HOLD); intHold.setValue(true);
} }
} }
@ -191,8 +129,31 @@ static void endIntegration(void) {
* engine cycle * engine cycle
*/ */
if (isIntegrating) { if (isIntegrating) {
turnPinLow(HIP9011_INT_HOLD); intHold.setValue(false);
isIntegrating = false; isIntegrating = false;
int integratorIndex = getIntegrationIndexByRpm(engine->rpmCalculator.rpmValue);
int gainIndex = getHip9011GainIndex(boardConfiguration->hip9011Gain);
if (currentGainIndex != gainIndex) {
tx_buff[0] = gainIndex;
currentGainIndex = gainIndex;
isSendingSpiCommand = true;
spiSelectI(driver);
spiStartExchangeI(driver, 1, tx_buff, rx_buff);
return;
}
if (currentIntergratorIndex != integratorIndex) {
tx_buff[0] = integratorIndex;
currentIntergratorIndex = integratorIndex;
isSendingSpiCommand = true;
spiSelectI(driver);
spiStartExchangeI(driver, 1, tx_buff, rx_buff);
return;
}
} }
} }
@ -243,8 +204,8 @@ void initHip9011(void) {
spicfg.ssport = getHwPort(boardConfiguration->hip9011CsPin); spicfg.ssport = getHwPort(boardConfiguration->hip9011CsPin);
spicfg.sspad = getHwPin(boardConfiguration->hip9011CsPin); spicfg.sspad = getHwPin(boardConfiguration->hip9011CsPin);
outputPinRegisterExt2("hip int/hold", &outputs[(int)HIP9011_INT_HOLD], boardConfiguration->hip9011IntHoldPin, &DEFAULT_OUTPUT); outputPinRegisterExt2("hip int/hold", &intHold, boardConfiguration->hip9011IntHoldPin, &DEFAULT_OUTPUT);
outputPinRegisterExt2("hip CS", &outputs[(int)SPI_CS_HIP9011], boardConfiguration->hip9011CsPin, &DEFAULT_OUTPUT); outputPinRegisterExt2("hip CS", &hipCs, boardConfiguration->hip9011CsPin, &DEFAULT_OUTPUT);
scheduleMsg(&logger, "Starting HIP9011/TPIC8101 driver"); scheduleMsg(&logger, "Starting HIP9011/TPIC8101 driver");
spiStart(driver, &spicfg); spiStart(driver, &spicfg);
@ -277,11 +238,9 @@ void initHip9011(void) {
* Let's restart SPI to switch it from synchronous mode into * Let's restart SPI to switch it from synchronous mode into
* asynchronous mode * asynchronous mode
*/ */
// spiStop(driver); spiStop(driver);
// spicfg.end_cb = endOfSpiCommunication; spicfg.end_cb = endOfSpiCommunication;
// spiStart(driver, &spicfg); spiStart(driver, &spicfg);
chThdCreateStatic(htThreadStack, sizeof(htThreadStack), NORMALPRIO, (tfunc_t) ivThread, NULL);
} }
#endif #endif

4
firmware/hw_layer/io_pins.cpp
View File

@ -25,6 +25,8 @@ extern board_configuration_s *boardConfiguration;
static Logging logger; static Logging logger;
static OutputPin sdCsPin;
extern OutputPin outputs[IO_PIN_COUNT]; extern OutputPin outputs[IO_PIN_COUNT];
#if defined(STM32F4XX) #if defined(STM32F4XX)
@ -126,7 +128,7 @@ void initOutputPins(void) {
// outputPinRegister("spi CS3", SPI_CS_3, SPI_CS3_PORT, SPI_CS3_PIN); // outputPinRegister("spi CS3", SPI_CS_3, SPI_CS3_PORT, SPI_CS3_PIN);
// outputPinRegister("spi CS4", SPI_CS_4, SPI_CS4_PORT, SPI_CS4_PIN); // outputPinRegister("spi CS4", SPI_CS_4, SPI_CS4_PORT, SPI_CS4_PIN);
#if HAL_USE_SPI || defined(__DOXYGEN__) #if HAL_USE_SPI || defined(__DOXYGEN__)
outputPinRegister("spi CS5", &outputs[(int)SPI_CS_SD_MODULE], SPI_SD_MODULE_PORT, SPI_SD_MODULE_PIN); outputPinRegister("spi CS5", &sdCsPin, SPI_SD_MODULE_PORT, SPI_SD_MODULE_PIN);
#endif #endif
// todo: should we move this code closer to the fuel pump logic? // todo: should we move this code closer to the fuel pump logic?