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-04-04 17:05:11 -05:00
parent fbdddc9503
commit 75e6233eaf
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/console/binary/tunerstudio.cpp
View File

@ -180,8 +180,8 @@ char *getWorkingPageAddr(int pageIndex) {
switch (pageIndex) { switch (pageIndex) {
case 0: case 0:
return (char*) &configWorkingCopy.engineConfiguration; return (char*) &configWorkingCopy.engineConfiguration;
case 1: // case 1:
return (char*) &configWorkingCopy.ve2Table; // return (char*) &configWorkingCopy.ve2Table;
// case 2: // case 2:
// return (char*) &configWorkingCopy.fuelTable; // return (char*) &configWorkingCopy.fuelTable;
// case 3: // case 3:

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

@ -38,21 +38,6 @@
float getRpmMultiplier(operation_mode_e mode); float getRpmMultiplier(operation_mode_e mode);
void setOperationMode(engine_configuration_s *engineConfiguration, operation_mode_e mode); void setOperationMode(engine_configuration_s *engineConfiguration, operation_mode_e mode);
typedef struct {
engine_configuration_s engineConfiguration;
ve_table_t ve2Table;
/**
* offset 15032
*/
float ve2LoadBins[FUEL_LOAD_COUNT];
/**
* offset 15096
*/
float ve2RpmBins[FUEL_RPM_COUNT];
} persistent_config_s;
typedef struct { typedef struct {
int version; int version;
int size; int size;

12
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated by config_definition.jar on Sat Apr 04 14:18:42 EDT 2015 // this section was generated by config_definition.jar on Sat Apr 04 17:10:30 EDT 2015
// begin // begin
#include "rusefi_types.h" #include "rusefi_types.h"
typedef struct { typedef struct {
@ -1242,5 +1242,13 @@ typedef struct {
/** total size 15288*/ /** total size 15288*/
} engine_configuration_s; } engine_configuration_s;
typedef struct {
/**
* offset 0
*/
engine_configuration_s engineConfiguration;
/** total size 15288*/
} persistent_config_s;
// end // end
// this section was generated by config_definition.jar on Sat Apr 04 14:18:42 EDT 2015 // this section was generated by config_definition.jar on Sat Apr 04 17:10:30 EDT 2015

10
firmware/integration/rusefi_config.txt
View File

@ -9,7 +9,10 @@
! all the sub-structures are going to be nested withint the primary structure, that's ! all the sub-structures are going to be nested withint the primary structure, that's
! needed to get a proper TunerStudio file ! needed to get a proper TunerStudio file
struct engine_configuration_s
struct persistent_config_s
struct_no_prefix engine_configuration_s
#define MAP_ANGLE_SIZE 8 #define MAP_ANGLE_SIZE 8
#define MAP_WINDOW_SIZE 8 #define MAP_WINDOW_SIZE 8
@ -534,6 +537,11 @@ ignition_table_t ignitionIatCorrTable;
float[IGN_LOAD_COUNT] ignitionIatCorrLoadBins;;"Load", 1, 0.0, 0, 300.0, 2 float[IGN_LOAD_COUNT] ignitionIatCorrLoadBins;;"Load", 1, 0.0, 0, 300.0, 2
float[IGN_RPM_COUNT] ignitionIatCorrRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2 float[IGN_RPM_COUNT] ignitionIatCorrRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2
end_struct
engine_configuration_s engineConfiguration;
! ve_table_t ve2Table; ! ve_table_t ve2Table;
! float[FUEL_LOAD_COUNT] ve2LoadBins;;"%", 1, 0.0, 0, 300.0, 2 ! float[FUEL_LOAD_COUNT] ve2LoadBins;;"%", 1, 0.0, 0, 300.0, 2
! float[FUEL_RPM_COUNT] ve2RpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2 ! float[FUEL_RPM_COUNT] ve2RpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2