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

auto-sync

This commit is contained in:
rusEfi 2014-12-19 07:03:42 -06:00
parent cdc187f57f
commit 15e9c2c11f
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
firmware/hw_layer/HIP9011.cpp
View File

@ -30,11 +30,13 @@
#if EFI_HIP_9011
extern pin_output_mode_e DEFAULT_OUTPUT;
static int bandIndex;
static scheduling_s startTimer[2];
static scheduling_s endTimer[2];
extern pin_output_mode_e DEFAULT_OUTPUT;
// 0b01000000
#define SET_PRESCALER_CMD 0x40
// 0b11100000
@ -42,8 +44,11 @@ extern pin_output_mode_e DEFAULT_OUTPUT;
// 0b00000000
#define SET_BAND_PASS_CMD 0x0
// 0b10000000
#define SET_GAIN_CMD 0x80
// 0b01110001
//#define HIP_ADVANCED_MODE 0x71
#define SET_ADVANCED_MODE 0x71
static Logging logger;
@ -69,22 +74,28 @@ NULL,
//SPI_CR1_BR_1 // 5MHz
SPI_CR1_BR_0 | SPI_CR1_BR_1 | SPI_CR1_BR_2 };
static unsigned char tx_buff[8];
static unsigned char rx_buff[8];
static unsigned char tx_buff[16];
static unsigned char rx_buff[16];
static SPIDriver *driver = &SPID2;
static msg_t ivThread(int param) {
chRegSetThreadName("HIP");
int counter = 0;
// '0' for 4MHz
tx_buff[0] = SET_PRESCALER_CMD + 0 + 2;
// '0' for channel #1
tx_buff[2] = SET_CHANNEL_CMD + 0;
// 4MHz
tx_buff[0] = SET_PRESCALER_CMD;
// band index depends on cylinder bore
tx_buff[4] = SET_BAND_PASS_CMD + bandIndex;
// channel #1
tx_buff[4] = SET_CHANNEL_CMD;
// todo
tx_buff[8] = SET_GAIN_CMD + 41;
tx_buff[10] = SET_ADVANCED_MODE;
tx_buff[11] = SET_ADVANCED_MODE;
while (true) {
chThdSleepMilliseconds(10);
@ -94,7 +105,7 @@ static msg_t ivThread(int param) {
// todo: make sure spiCallback has been invoked?
spiSelect(driver);
spiStartExchange(driver, 8, tx_buff, rx_buff);
spiStartExchange(driver, 16, tx_buff, rx_buff);
/**
* spiUnselectI takes place in spiCallback
*/
@ -152,8 +163,6 @@ static void prepareRpmLookup(engine_configuration_s *engineConfiguration) {
#define BAND(bore) (900 / (PIF * (bore) / 2))
static int bandIndex;
static void showHipInfo(void) {
printSpiState(&logger, boardConfiguration);
scheduleMsg(&logger, "bore=%f freq=%f", engineConfiguration->cylinderBore, BAND(engineConfiguration->cylinderBore));

4
firmware/rusefi.cpp
View File

@ -256,7 +256,7 @@ void firmwareError(const char *fmt, ...) {
}
}
static char UNUSED_RAM_SIZE[7000];
static char UNUSED_RAM_SIZE[6000];
static char UNUSED_CCM_SIZE[9000] CCM_OPTIONAL;
@ -265,5 +265,5 @@ int getRusEfiVersion(void) {
return 1; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE == 0)
return 1; // this is here to make the compiler happy about the unused array
return 20141218;
return 20141219;
}