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-11-03 07:03:17 -06:00
parent 236b805463
commit 1140ee7cb2
7 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/efifeatures.h
View File

@ -120,10 +120,10 @@
#if defined __GNUC__ #if defined __GNUC__
#define EFI_PERF_METRICS TRUE #define EFI_PERF_METRICS TRUE
#define DL_OUTPUT_BUFFER 7000 #define DL_OUTPUT_BUFFER 6500
#else #else
#define EFI_PERF_METRICS FALSE #define EFI_PERF_METRICS FALSE
#define DL_OUTPUT_BUFFER 9000 #define DL_OUTPUT_BUFFER 8000
#endif #endif
/** /**

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 * this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
*/ */
#define TS_FILE_VERSION 20141008 #define TS_FILE_VERSION 20141103
#define PAGE_0_SIZE 9608 #define PAGE_0_SIZE 10008
#define TS_OUTPUT_SIZE 116 #define TS_OUTPUT_SIZE 116
#define EGT_CHANNEL_COUNT 8 #define EGT_CHANNEL_COUNT 8

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

@ -101,6 +101,8 @@ typedef struct {
#define DWELL_COUNT 8 #define DWELL_COUNT 8
#define CRANKING_CURVE_SIZE 8
/** /**
* @brief Trigger wheel(s) configuration * @brief Trigger wheel(s) configuration
*/ */
@ -472,7 +474,13 @@ typedef struct {
float primingSquirtDurationMs; float primingSquirtDurationMs;
int unused3[23]; float crankingFuelCoef[CRANKING_CURVE_SIZE];
float crankingFuelBins[CRANKING_CURVE_SIZE];
float crankingCycleCoef[CRANKING_CURVE_SIZE];
float crankingCycleBins[CRANKING_CURVE_SIZE];
int unused3[91];
} engine_configuration_s; } engine_configuration_s;

2
firmware/controllers/flash_main.h
View File

@ -12,7 +12,7 @@
#include "engine_configuration.h" #include "engine_configuration.h"
#include "engine.h" #include "engine.h"
#define FLASH_DATA_VERSION 5014 #define FLASH_DATA_VERSION 5056
void readFromFlash(void); void readFromFlash(void);
void initFlash(Engine *engine); void initFlash(Engine *engine);

3
firmware/controllers/ignition_central.c
View File

@ -26,13 +26,10 @@
#include "main_trigger_callback.h" #include "main_trigger_callback.h"
#include "engine_configuration.h" #include "engine_configuration.h"
static Logging logger;
extern engine_configuration_s *engineConfiguration; extern engine_configuration_s *engineConfiguration;
extern board_configuration_s *boardConfiguration; extern board_configuration_s *boardConfiguration;
void initIgnitionCentral(void) { void initIgnitionCentral(void) {
initLogging(&logger, "IgnitionCentral");
for (int i = 0; i < engineConfiguration->cylindersCount; i++) { for (int i = 0; i < engineConfiguration->cylindersCount; i++) {
io_pin_e pin = (io_pin_e)((int)SPARKOUT_1_OUTPUT + i); io_pin_e pin = (io_pin_e)((int)SPARKOUT_1_OUTPUT + i);

2
firmware/rusefi.cpp
View File

@ -249,5 +249,5 @@ void firmwareError(const char *fmt, ...) {
} }
int getRusEfiVersion(void) { int getRusEfiVersion(void) {
return 20141102; return 20141103;
} }

4
firmware/tunerstudio/rusefi.ini
View File

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