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-03-14 19:05:05 -05:00
parent 62b20263c5
commit 9b9da1fca5
6 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/console/binary/tunerstudio_configuration.h
View File

@ -64,7 +64,7 @@ typedef struct {
* water 4 bytes per traffic - I want gauges to work as fast as possible
*/
unsigned int hasSdCard : 1; // bit 0
unsigned int ignition_enabled : 1; // bit 1
unsigned int isIgnitionEnabled : 1; // bit 1
unsigned int injection_enabled : 1; // bit 2
unsigned int cylinder_cleanup_enabled : 1; // bit 3
unsigned int cylinder_cleanup_activated : 1; // bit 4
@ -75,7 +75,9 @@ typedef struct {
unsigned int needBurn : 1; // bit 9
unsigned int secondTriggerChannelEnabled : 1; // bit 10
unsigned int clutchUpState : 1; // bit 11
unsigned int clutchDownState : 1; // bit 11
unsigned int clutchDownState : 1; // bit 12
unsigned int knockEverIndicator : 1; // bit 13
unsigned int knockNowIndicator : 1; // bit 14
float vehicleSpeedKph;
unsigned int isTpsError : 1; // bit 0
unsigned int isCltError : 1; // bit 1

2
firmware/console/status_loop.cpp
View File

@ -575,7 +575,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->isFuelPumpOn = enginePins.fuelPumpRelay.getLogicValue();
tsOutputChannels->isFanOn = enginePins.fanRelay.getLogicValue();
tsOutputChannels->isO2HeaterOn = enginePins.o2heater.getLogicValue();
tsOutputChannels->ignition_enabled = engineConfiguration->isIgnitionEnabled;
tsOutputChannels->isIgnitionEnabled = engineConfiguration->isIgnitionEnabled;
tsOutputChannels->injection_enabled = engineConfiguration->isInjectionEnabled;
tsOutputChannels->cylinder_cleanup_enabled = engineConfiguration->isCylinderCleanupEnabled;
tsOutputChannels->cylinder_cleanup_activated = engine->isCylinderCleanupMode;

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

@ -348,6 +348,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->acSwitchAdc = EFI_ADC_NONE;
engineConfiguration->externalKnockSenseAdc = EFI_ADC_NONE;
#if EFI_PROD_CODE
engineConfiguration->digitalChartSize = 300;
#else

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

@ -1,4 +1,4 @@
// this section was generated by config_definition.jar on Tue Mar 10 21:53:57 EDT 2015
// this section was generated by config_definition.jar on Sat Mar 14 19:07:34 EDT 2015
// begin
#include "rusefi_types.h"
typedef struct {
@ -1074,7 +1074,11 @@ typedef struct {
/**
* offset 5204
*/
int unused3[144];
adc_channel_e externalKnockSenseAdc;
/**
* offset 5208
*/
int unused3[143];
/**
* offset 5780
*/
@ -1178,4 +1182,4 @@ typedef struct {
} engine_configuration_s;
// end
// this section was generated by config_definition.jar on Tue Mar 10 21:53:57 EDT 2015
// this section was generated by config_definition.jar on Sat Mar 14 19:07:34 EDT 2015

3
firmware/integration/rusefi_config.txt
View File

@ -471,7 +471,8 @@ bit hasMapSensor;@see isMapAveragingEnabled
custom pin_input_mode_e 4 scalar, F32, @OFFSET@, "ms", 1, 0, 0, 200, 1
pin_input_mode_e[LE_COMMAND_COUNT iterate] fsioInputModes;
int[144] unused3;
adc_channel_e externalKnockSenseAdc;
int[143] unused3;
int accelLength;;"len", 1, 0, 0, 200, 3

18
firmware/tunerstudio/rusefi.ini
View File

@ -41,7 +41,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated by ConfigDefinition.jar on Wed Mar 11 17:26:18 EDT 2015
; this section was generated by ConfigDefinition.jar on Sat Mar 14 19:07:36 EDT 2015
page = 1
engineType = bits, S32, 0, [0:2], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
@ -463,7 +463,8 @@ page = 1
fsioInputModes14 = scalar, F32, 5192, "ms", 1, 0, 0, 200, 1
fsioInputModes15 = scalar, F32, 5196, "ms", 1, 0, 0, 200, 1
fsioInputModes16 = scalar, F32, 5200, "ms", 1, 0, 0, 200, 1
;skipping unused3 offset 5204
externalKnockSenseAdc = bits, U32, 5204, [0:3] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5"
;skipping unused3 offset 5208
accelLength = scalar, S32, 5780, "len", 1, 0, 0, 200, 3
deaccelEnrichmentThreshold = scalar, F32, 5784, "roc", 1, 0, 0, 200, 3
deaccelEnrichmentMultiplier = scalar, F32, 5788, "coeff", 1, 0, 0, 200, 3
@ -563,7 +564,7 @@ fileVersion = { 20150216 }
warmUpEnrich = scalar, F32, 68, "%", 1, 0.0;
hasSdCard = bits, U32, 72, [0:0], "true", "false";
ind_ignition_enabled=bits, U32, 72, [1:1], "true", "false";
isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false";
ind_injection_enabled=bits,U32, 72, [2:2], "true", "false";
ind_cylinder_cleanup=bits, U32, 72, [4:4], "true", "false";
@ -573,8 +574,10 @@ fileVersion = { 20150216 }
ind_check_engine= bits, U32, 72, [8:8], "true", "false";
needBurn = bits, U32, 72, [9:9], "true", "false";
ind_2nd_trigger_en=bits, U32, 72, [10:10], "true", "false";
clutchUpState =bits, U32, 72, [11:11], "true", "false";
clutchDownState =bits, U32, 72, [12:12], "true", "false";
clutchUpState =bits, U32, 72, [11:11], "true", "false";
clutchDownState =bits, U32, 72, [12:12], "true", "false";
knockEverIndicator=bits, U32, 72, [13:13], "true", "false";
knockNowIndicator=bits, U32, 72, [13:13], "true", "false";
vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0;
ind_tps_error = bits, U32, 80, [0:0], "true", "false";
@ -784,7 +787,7 @@ fileVersion = { 20150216 }
; important status
indicator = { firmwareTsVersion == fileVersion }, "NOT COMPATIBLE", "OK", red, black, green, black
indicator = { ind_check_engine }, "ok", "Check engine", green, black, red, black
indicator = { ind_ignition_enabled}, "no ignition", "ignition", red, black, green, black
indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", red, black, green, black
indicator = { ind_injection_enabled}, "no injection", "injection", red, black, green, black
@ -802,6 +805,9 @@ fileVersion = { 20150216 }
indicator = { ind_clt_error}, "clt", "clt error", white, black, red, black
indicator = { ind_iat_error}, "iat", "iat error", white, black, red, black
indicator = { ind_map_error}, "map", "map error", white, black, red, black
indicator = { knockEverIndicator }, "", "Knock", white, black, red, black
indicator = { knockNowIndicator }, "", "Knock NOW", white, black, red, black
[Datalog]