From 331b325b86cf0c7d7212082c320f4cd09d0a367f Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 23 May 2020 19:22:48 -0400 Subject: [PATCH] something is broken with auto generation around kinetis :( --- ...ngine_configuration_generated_structures.h | 15 +++++++++++--- .../controllers/algo/rusefi_generated.h | 4 +++- firmware/tunerstudio/rusefi_kinetis.ini | 20 ++++++++++++++++--- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index a30fd66018..1dd2bc27e8 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed May 20 01:18:15 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat May 23 19:22:14 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2557,7 +2557,16 @@ struct engine_configuration_s { /** * offset 2100 */ - uint32_t unused_former_warmup_target_afr[8]; + float throttlePedalSecondaryUpVoltage; + /** + * Pedal in the floor + * offset 2104 + */ + float throttlePedalSecondaryWOTVoltage; + /** + * offset 2108 + */ + uint32_t unused_former_warmup_target_afr[6]; /** * kPa value at which we need to cut fuel and spark, 0 if not enabled * offset 2132 @@ -3514,4 +3523,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed May 20 01:18:15 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat May 23 19:22:14 EDT 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index bad0a994c1..cb510616b6 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1151,6 +1151,8 @@ #define test557pin_offset 3101 #define throttlePedalPositionAdcChannel_offset 580 #define throttlePedalPositionSecondAdcChannel_offset 683 +#define throttlePedalSecondaryUpVoltage_offset 2100 +#define throttlePedalSecondaryWOTVoltage_offset 2104 #define throttlePedalUpPin_offset 583 #define throttlePedalUpPinMode_offset 710 #define throttlePedalUpVoltage_offset 1884 @@ -1305,7 +1307,7 @@ #define unused_1484_bit_29_offset 1476 #define unused_1484_bit_30_offset 1476 #define unused_1484_bit_31_offset 1476 -#define unused_former_warmup_target_afr_offset 2100 +#define unused_former_warmup_target_afr_offset 2108 #define unusedAtOldBoardConfigurationEnd_offset 1200 #define unusedBit4_1476_offset 1476 #define unusedBit_251_11_offset 976 diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 613935c0dd..e43d7cf45e 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -15,6 +15,10 @@ ; Note that '+' sign is required after first semicolon for tooltop to appear in TunerStudio ; ; +; field = "# blue text" +; field = "! red text" +; field = "normal text" +; ; ; this should stop TS from looking for the CAN ID in the 2nd byte location and allow the page reads to work correctly. @@ -85,7 +89,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 22 00:39:59 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat May 23 19:22:14 EDT 2020 pageSize = 20000 page = 1 @@ -826,7 +830,9 @@ page = 1 slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3 debugMode = bits, U32, 2092, [0:7], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "mode16", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "Mode40" auxSerialSpeed = scalar, U32, 2096, "BPs", 1, 0, 0,1000000, 0 -;no TS info - skipping unused_former_warmup_target_afr offset 2100 + throttlePedalSecondaryUpVoltage = scalar, F32, 2100, "voltage", 1, 0, -6, 6, 2 + throttlePedalSecondaryWOTVoltage = scalar, F32, 2104, "voltage", 1, 0, -6, 6, 2 +;no TS info - skipping unused_former_warmup_target_afr offset 2108 boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0 mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0 mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2 @@ -1315,6 +1321,7 @@ page = 1 vvtOffset = "Angle between cam sensor and VVT zero position\nset vvt_offset X" slowAdcAlpha = "ExpAverage alpha coefficient" debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" + throttlePedalSecondaryWOTVoltage = "Pedal in the floor" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" @@ -2808,8 +2815,12 @@ cmd_dfu = "w\x00\xba\x00\x00" ; MRE_MIATA_NB2_MAP = 11 cmd_set_engine_type_microRusEFI_Miata_NB2_MAP = "w\x00\x30\x00\x0B" + +; MRE_MIATA_NA6 12 +cmd_set_engine_type_microRusEFI_Miata_NA6 = "w\x00\x30\x00\x0c" + ; MRE_MIATA_NB2_MAF = 15 -cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "w\x00\x30\x00\x0F" +cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "w\x00\x30\x00\x0f" ; MIATA_NA6_MAP = 41 cmd_set_engine_type_Frankenso_Miata_NA6_MAP = "w\x00\x30\x00\x29" @@ -3109,6 +3120,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Up voltage", throttlePedalUpVoltage field = "Down (WOT) voltage", throttlePedalWOTVoltage field = "Accelerator position 2nd sensor", throttlePedalPositionSecondAdcChannel + field = "Up voltage" throttlePedalSecondaryUpVoltage + field = "Down (WOT) voltage", throttlePedalSecondaryWOTVoltage dialog = pedalGauges gauge = pedalPositionGauge @@ -4234,6 +4247,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "ETB test bench", cmd_set_engine_type_etb_test commandButton = "TLE8888B test bench", cmd_set_engine_type_8888_test commandButton = "Reset firmware settings", cmd_set_engine_type_default + field = "#Please DO NOT hit 'Burn' - just press a command button above and disconnect TunerStudio!" ; Board->ECU stimulator