From bc884c2929ba03bad854650e5bd6be8b2fd35d93 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 17 Feb 2015 00:04:26 -0600 Subject: [PATCH] auto-sync --- firmware/console/tunerstudio/tunerstudio.cpp | 26 ++++++++++++-------- firmware/rusefi_config.ini | 2 +- firmware/tunerstudio/rusefi.ini | 10 ++++---- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/firmware/console/tunerstudio/tunerstudio.cpp b/firmware/console/tunerstudio/tunerstudio.cpp index c50d74d4a4..423f82d1ca 100644 --- a/firmware/console/tunerstudio/tunerstudio.cpp +++ b/firmware/console/tunerstudio/tunerstudio.cpp @@ -112,9 +112,15 @@ void printTsStats(void) { portname(TS_SERIAL_TX_PORT), TS_SERIAL_TX_PIN, boardConfiguration->tunerStudioSerialSpeed); } #endif /* EFI_PROD_CODE */ - scheduleMsg(tsLogger, "TunerStudio total/error counter=%d/%d H=%d / O counter=%d size=%d / P=%d / B=%d", tsCounter, tsState.errorCounter, tsState.queryCommandCounter, tsState.outputChannelsCommandCounter, - sizeof(tsOutputChannels), tsState.readPageCommandsCounter, tsState.burnCommandCounter); - scheduleMsg(tsLogger, "TunerStudio W counter=%d / C = %d / P = %d / current page %d", tsState.writeValueCommandCounter, tsState.writeChunkCommandCounter, + scheduleMsg(tsLogger, "TunerStudio size=%d / total=%d / errors=%d / H=%d / O=%d / P=%d / B=%d", + sizeof(tsOutputChannels), + tsCounter, + tsState.errorCounter, + tsState.queryCommandCounter, + tsState.outputChannelsCommandCounter, + tsState.readPageCommandsCounter, + tsState.burnCommandCounter); + scheduleMsg(tsLogger, "TunerStudio W=%d / C=%d / P=%d / page=%d", tsState.writeValueCommandCounter, tsState.writeChunkCommandCounter, tsState.pageCommandCounter, tsState.currentPageId); scheduleMsg(tsLogger, "page size=%d", sizeof(engine_configuration_s)); @@ -124,14 +130,14 @@ void printTsStats(void) { // int fuelMapOffset = (int) (&engineConfiguration->fuelTable) - (int) engineConfiguration; // scheduleMsg(logger, "fuelTable %d", fuelMapOffset); // - int offset = (int) (&boardConfiguration->hip9011Gain) - (int) engineConfiguration; - scheduleMsg(tsLogger, "hip9011Gain %d", offset); +// int offset = (int) (&boardConfiguration->hip9011Gain) - (int) engineConfiguration; +// scheduleMsg(tsLogger, "hip9011Gain %d", offset); // - offset = (int) (&engineConfiguration->crankingCycleBins) - (int) engineConfiguration; - scheduleMsg(tsLogger, "crankingCycleBins %d", offset); - - offset = (int) (&engineConfiguration->engineCycle) - (int) engineConfiguration; - scheduleMsg(tsLogger, "engineCycle %d", offset); +// offset = (int) (&engineConfiguration->crankingCycleBins) - (int) engineConfiguration; +// scheduleMsg(tsLogger, "crankingCycleBins %d", offset); +// +// offset = (int) (&engineConfiguration->engineCycle) - (int) engineConfiguration; +// scheduleMsg(tsLogger, "engineCycle %d", offset); } static void setTsSpeed(int value) { diff --git a/firmware/rusefi_config.ini b/firmware/rusefi_config.ini index 8bfe7c3f2a..2529fe86ca 100644 --- a/firmware/rusefi_config.ini +++ b/firmware/rusefi_config.ini @@ -39,7 +39,7 @@ struct engine_configuration_s ! please note that 1024 here is 4 * FUEL_RPM_COUNT * FUEL_LOAD_COUNT custom fuel_table_t 1024 array, F32, @OFFSET@, [16x16],"ms", 1, 0, 0.0, 300.0, 2 -custom ve_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, 0, 100.0, 2 +custom ve_table_t 1024 array, F32, @OFFSET@, [16x16],"%", 100, 0, 0, 100.0, 2 custom afr_table_t 1024 array, F32, @OFFSET@, [16x16],"deg", 1, 0, 0, 25.0, 2 ! please note that 1024 here is 4 * IGN_LOAD_COUNT * IGN_RPM_COUNT diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index ee841dcc3e..512f445dd0 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -37,7 +37,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated by ConfigDefinition.jar on Thu Feb 12 22:08:46 EST 2015 +; this section was generated by ConfigDefinition.jar on Tue Feb 17 00:06:52 EST 2015 pageSize = 15160 page = 1 @@ -469,7 +469,7 @@ page = 1 ignitionTable = array, F32, 9400, [16x16],"deg", 1, 0, -360, 360, 2 ignitionLoadBins = array, F32, 10424, [16], "Load", 1, 0.0, 0, 300.0, 2 ignitionRpmBins = array, F32, 10488, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - veTable = array, F32, 10552, [16x16],"deg", 1, 0, 0, 100.0, 2 + veTable = array, F32, 10552, [16x16],"%", 100, 0, 0, 100.0, 2 veLoadBins = array, F32, 11576, [16], "%", 1, 0.0, 0, 300.0, 2 veRpmBins = array, F32, 11640, [16], "RPM", 1, 0.0, 0, 18000.0, 2 afrTable = array, F32, 11704, [16x16],"deg", 1, 0, 0, 25.0, 2 @@ -478,7 +478,7 @@ page = 1 injectionPhase = array, F32, 12856, [16x16],"ms", 1, 0, 0.0, 300.0, 2 injPhaseLoadBins = array, F32, 13880, [16], "Load", 1, 0.0, 0, 300.0, 2 injPhaseRpmBins = array, F32, 13944, [16], "RPM", 1, 0.0, 0, 18000.0, 2 - ve2Table = array, F32, 14008, [16x16],"deg", 1, 0, 0, 100.0, 2 + ve2Table = array, F32, 14008, [16x16],"%", 100, 0, 0, 100.0, 2 ve2LoadBins = array, F32, 15032, [16], "%", 1, 0.0, 0, 300.0, 2 ve2RpmBins = array, F32, 15096, [16], "RPM", 1, 0.0, 0, 18000.0, 2 ; total TS size = 15160 @@ -745,7 +745,7 @@ fileVersion = { 20150216 } vssGauge = vehicleSpeedKph, "Speed", "kmh", 0, 200, 0, 1, 3, 4, 1, 1 rpmAccelerationGa = rpmAcceleration, "rpm d", "dRpm", 0, 3, 0, 1, 3, 4, 1, 1 massAirFlowValueGa = massAirFlowValue,"Air Flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 - veValueGauge = veValue, "ratio", "", 5, 25, 9, 9, 20, 20, 1, 1 + veValueGauge = veValue, "%", "", 0, 120, 10, 10, 100, 100, 1, 1 [FrontPage] ; Gauges are numbered left to right, top to bottom. @@ -1239,4 +1239,4 @@ fileVersion = { 20150216 } dialog = fsioDialog, "FSIO", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East \ No newline at end of file + panel = fsioSetting, East