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 2015-01-12 07:04:11 -06:00
parent 84b127f6d4
commit 45901c919e
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/console/console_io.c
View File

@ -120,7 +120,7 @@ bool isSerialOverUart(void) {
return is_serial_over_uart;
}
#if defined(EFI_CONSOLE_UART_DEVICE) || defined(__DOXYGEN__)
#if (defined(EFI_CONSOLE_UART_DEVICE) && ! EFI_SIMULATOR ) || defined(__DOXYGEN__)
static SerialConfig serialConfig = { SERIAL_SPEED, 0, USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0 };
#endif
@ -197,7 +197,7 @@ void consoleOutputBuffer(const uint8_t *buf, int size) {
void startConsole(void (*console_line_callback_p)(char *)) {
console_line_callback = console_line_callback_p;
#if defined(EFI_CONSOLE_UART_DEVICE) || defined(__DOXYGEN__)
#if (defined(EFI_CONSOLE_UART_DEVICE) && ! EFI_SIMULATOR) || defined(__DOXYGEN__)
palSetPadMode(CONSOLE_MODE_SWITCH_PORT, CONSOLE_MODE_SWITCH_PIN, PAL_MODE_INPUT_PULLUP);

4
firmware/console/tunerstudio/tunerstudio_configuration.h
View File

@ -14,9 +14,9 @@
/**
* this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
*/
#define TS_FILE_VERSION 20141225
#define TS_FILE_VERSION 20150112
#define PAGE_0_SIZE 10008
#define PAGE_0_SIZE 11832
#define TS_OUTPUT_SIZE 116
#define EGT_CHANNEL_COUNT 8

1
firmware/controllers/algo/engine_configuration.cpp
View File

@ -184,6 +184,7 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
setWholeFuelMap(engineConfiguration, 3);
setWholeVEMap(engineConfiguration, 0.8);
setMap(engineConfiguration->afrTable, 14.7);
setMap(engineConfiguration->injectionPhase, 0);
setThermistorConfiguration(&engineConfiguration->cltThermistorConf, 0, 9500, 23.8889, 2100, 48.8889, 1000);
engineConfiguration->cltThermistorConf.bias_resistor = 1500;

8
firmware/controllers/algo/engine_configuration.h
View File

@ -608,7 +608,13 @@ typedef struct {
*/
brain_pin_e clutchUpPin;
pin_input_mode_e clutchUpPinMode;
int unused3[82];
int unused3[182];
le_formula_t timingMultiplier;
le_formula_t timingAdditive;
fuel_table_t injectionPhase;
} engine_configuration_s;

6
firmware/rusefi.cpp
View File

@ -259,14 +259,14 @@ void firmwareError(const char *fmt, ...) {
}
}
static char UNUSED_RAM_SIZE[5000];
static char UNUSED_RAM_SIZE[4000];
static char UNUSED_CCM_SIZE[9000] CCM_OPTIONAL;
static char UNUSED_CCM_SIZE[8000] CCM_OPTIONAL;
int getRusEfiVersion(void) {
if (UNUSED_RAM_SIZE == 0)
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 20150111;
return 20150112;
}

4
firmware/tunerstudio/rusefi.ini
View File

@ -13,7 +13,7 @@ enable2ndByteCanID = false
endianness = little
nPages = 1
pageSize = 10008
pageSize = 11832
pageIdentifier = "\x00\x00"
pageReadCommand = "R\x00\x00%2o%2c"
@ -404,7 +404,7 @@ enable2ndByteCanID = false
[OutputChannels]
; see TS_FILE_VERSION in firmware code
fileVersion = { 20141225 }
fileVersion = { 20150112 }
ochGetCommand = "O"