Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/fome-tech/fome-fw
Browse files Browse the repository at this point in the history
  • Loading branch information
mck1117 committed Sep 18, 2023
2 parents 9652598 + dd28a2b commit bbe74d3
Show file tree
Hide file tree
Showing 72 changed files with 334 additions and 210 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2357,9 +2357,15 @@ struct engine_configuration_s {
// ms
// offset 3602
scaled_channel<uint8_t, 1, 5> ignTestOffTime;
// units
// offset 3603
uint8_t mainUnusedEnd[93];
uint8_t alignmentFill_at_3603[1];
// Scale the reported vehicle speed value from CAN. Example: Parameter set to 1.1, CAN VSS reports 50kph, ECU will report 55kph instead.
// ratio
// offset 3604
scaled_channel<uint16_t, 10000, 1> canVssScaling;
// units
// offset 3606
uint8_t mainUnusedEnd[90];
};
static_assert(sizeof(engine_configuration_s) == 3696);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@
#define ETB_BIAS_CURVE_LENGTH 8
#define ETB_COUNT 2
#define ETB_HW_MAX_FREQUENCY 3000
#define FLASH_DATA_VERSION 20011
#define FLASH_DATA_VERSION 20012
#define FUEL_LEVEL_TABLE_COUNT 8
#define FUEL_LOAD_COUNT 16
#define fuel_pressure_sensor_mode_e_auto_enum 0="FPM_Absolute",2="FPM_Differential",1="FPM_Gauge"
Expand Down Expand Up @@ -979,7 +979,7 @@
#define show_Frankenso_presets false
#define show_Proteus_presets false
#define show_test_presets false
#define SIGNATURE_HASH 2399658188
#define SIGNATURE_HASH 2135111452
#define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
#define spi_device_e_SPI_DEVICE_1 1
#define spi_device_e_SPI_DEVICE_2 2
Expand Down Expand Up @@ -1244,7 +1244,7 @@
#define ts_show_vbatt true
#define ts_show_vr_threshold_2 true
#define ts_show_vr_threshold_all true
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.subaru_eg33_f7.2399658188"
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.subaru_eg33_f7.2135111452"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2357,9 +2357,15 @@ struct engine_configuration_s {
// ms
// offset 3602
scaled_channel<uint8_t, 1, 5> ignTestOffTime;
// units
// offset 3603
uint8_t mainUnusedEnd[93];
uint8_t alignmentFill_at_3603[1];
// Scale the reported vehicle speed value from CAN. Example: Parameter set to 1.1, CAN VSS reports 50kph, ECU will report 55kph instead.
// ratio
// offset 3604
scaled_channel<uint16_t, 10000, 1> canVssScaling;
// units
// offset 3606
uint8_t mainUnusedEnd[90];
};
static_assert(sizeof(engine_configuration_s) == 3696);

Expand Down
6 changes: 3 additions & 3 deletions firmware/controllers/generated/rusefi_generated.h
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
#define ETB_BIAS_CURVE_LENGTH 8
#define ETB_COUNT 2
#define ETB_HW_MAX_FREQUENCY 3000
#define FLASH_DATA_VERSION 20011
#define FLASH_DATA_VERSION 20012
#define FUEL_LEVEL_TABLE_COUNT 8
#define FUEL_LOAD_COUNT 16
#define fuel_pressure_sensor_mode_e_auto_enum 0="FPM_Absolute",2="FPM_Differential",1="FPM_Gauge"
Expand Down Expand Up @@ -1029,7 +1029,7 @@
#define SentEtbType_NONE 0
#define show_Frankenso_presets true
#define show_test_presets true
#define SIGNATURE_HASH 1443760822
#define SIGNATURE_HASH 2789924198
#define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4"
#define spi_device_e_SPI_DEVICE_1 1
#define spi_device_e_SPI_DEVICE_2 2
Expand Down Expand Up @@ -1293,7 +1293,7 @@
#define ts_show_vbatt true
#define ts_show_vr_threshold_2 true
#define ts_show_vr_threshold_all true
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.f407-discovery.1443760822"
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.f407-discovery.2789924198"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't'
Expand Down
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_48way.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 1324777209
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.48way.1324777209"
#define SIGNATURE_HASH 3199379753
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.48way.3199379753"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_alphax-2chan.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 796127620
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.alphax-2chan.796127620"
#define SIGNATURE_HASH 3744933460
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.alphax-2chan.3744933460"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_alphax-4chan.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 2780558309
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.alphax-4chan.2780558309"
#define SIGNATURE_HASH 1442784309
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.alphax-4chan.1442784309"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_alphax-8chan.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 3707827484
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.alphax-8chan.3707827484"
#define SIGNATURE_HASH 759440076
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.alphax-8chan.759440076"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_atlas.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 384172900
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.atlas.384172900"
#define SIGNATURE_HASH 3869430964
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.atlas.3869430964"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_core8.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 839646197
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.core8.839646197"
#define SIGNATURE_HASH 3259968549
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.core8.3259968549"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_f407-discovery.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 1443760822
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.f407-discovery.1443760822"
#define SIGNATURE_HASH 2789924198
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.f407-discovery.2789924198"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_f429-discovery.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 170718787
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.f429-discovery.170718787"
#define SIGNATURE_HASH 4201128339
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.f429-discovery.4201128339"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_frankenso_na6.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 679351945
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.frankenso_na6.679351945"
#define SIGNATURE_HASH 3627729241
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.frankenso_na6.3627729241"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_harley81.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 2209992249
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.harley81.2209992249"
#define SIGNATURE_HASH 1945967081
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.harley81.1945967081"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_hellen-gm-e67.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 1665521808
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen-gm-e67.1665521808"
#define SIGNATURE_HASH 2466320192
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen-gm-e67.2466320192"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_hellen-honda-k.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 4174649041
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen-honda-k.4174649041"
#define SIGNATURE_HASH 143704321
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen-honda-k.143704321"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_hellen-nb1.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 4245415935
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen-nb1.4245415935"
#define SIGNATURE_HASH 223293487
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen-nb1.223293487"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_hellen121nissan.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 2379238325
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen121nissan.2379238325"
#define SIGNATURE_HASH 2106891365
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen121nissan.2106891365"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_hellen121vag.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 567493734
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen121vag.567493734"
#define SIGNATURE_HASH 3516371894
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen121vag.3516371894"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_hellen128.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 2327746532
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen128.2327746532"
#define SIGNATURE_HASH 2063220788
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen128.2063220788"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_hellen154hyundai.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 508147461
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen154hyundai.508147461"
#define SIGNATURE_HASH 3993854165
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen154hyundai.3993854165"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_hellen72.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 4221071348
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen72.4221071348"
#define SIGNATURE_HASH 199014436
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen72.199014436"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_hellen81.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 1460802934
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen81.1460802934"
#define SIGNATURE_HASH 2807480998
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen81.2807480998"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_hellen88bmw.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 1361707589
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen88bmw.1361707589"
#define SIGNATURE_HASH 2708395413
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellen88bmw.2708395413"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_hellenNA6.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 429701060
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellenNA6.429701060"
#define SIGNATURE_HASH 3923271700
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellenNA6.3923271700"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_hellenNA8_96.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 2771959924
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellenNA8_96.2771959924"
#define SIGNATURE_HASH 1434195876
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.hellenNA8_96.1434195876"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_mre_f4.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 3986854907
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.mre_f4.3986854907"
#define SIGNATURE_HASH 501629995
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.mre_f4.501629995"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_mre_f7.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 3986854907
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.mre_f7.3986854907"
#define SIGNATURE_HASH 501629995
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.mre_f7.501629995"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_prometheus_405.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 985152467
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.prometheus_405.985152467"
#define SIGNATURE_HASH 3405573123
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.prometheus_405.3405573123"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_prometheus_469.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 985152467
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.prometheus_469.985152467"
#define SIGNATURE_HASH 3405573123
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.prometheus_469.3405573123"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_proteus_f4.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 2601661864
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.proteus_f4.2601661864"
#define SIGNATURE_HASH 1800856184
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.proteus_f4.1800856184"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_proteus_f7.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 2601661864
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.proteus_f7.2601661864"
#define SIGNATURE_HASH 1800856184
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.proteus_f7.1800856184"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_proteus_h7.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 2601661864
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.proteus_h7.2601661864"
#define SIGNATURE_HASH 1800856184
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.proteus_h7.1800856184"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_small-can-board.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 3795902941
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.small-can-board.3795902941"
#define SIGNATURE_HASH 302265869
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.small-can-board.302265869"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_subaru_eg33_f7.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 2399658188
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.subaru_eg33_f7.2399658188"
#define SIGNATURE_HASH 2135111452
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.subaru_eg33_f7.2135111452"
4 changes: 2 additions & 2 deletions firmware/controllers/generated/signature_tdg-pdm8.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#define SIGNATURE_HASH 2156059233
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.tdg-pdm8.2156059233"
#define SIGNATURE_HASH 1892027825
#define TS_SIGNATURE "rusEFI (FOME) master.2023.09.18.tdg-pdm8.1892027825"
7 changes: 7 additions & 0 deletions firmware/controllers/lua/generated/value_lookup_generated.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,8 @@ float getConfigValueByName(const char *name) {
return engineConfiguration->ignTestCount;
case 257613965:
return engineConfiguration->ignTestOffTime;
case -846143628:
return engineConfiguration->canVssScaling;
}
return EFI_ERROR_CODE;
}
Expand Down Expand Up @@ -3529,6 +3531,11 @@ void setConfigValueByName(const char *name, float value) {
{
engineConfiguration->ignTestOffTime = (int)value;
return;
}
case -846143628:
{
engineConfiguration->canVssScaling = (int)value;
return;
}
}
}
3 changes: 3 additions & 0 deletions firmware/controllers/lua/generated/value_lookup_generated.md
Original file line number Diff line number Diff line change
Expand Up @@ -1507,3 +1507,6 @@ How many test bench pulses do you want
### ignTestOffTime
Time between bench test pulses

### canVssScaling
Scale the reported vehicle speed value from CAN. Example: Parameter set to 1.1, CAN VSS reports 50kph, ECU will report 55kph instead.

11 changes: 7 additions & 4 deletions firmware/tunerstudio/generated/fome.ini
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ enable2ndByteCanID = false

[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI (FOME) master.2023.09.18.f407-discovery.1443760822"
signature = "rusEFI (FOME) master.2023.09.18.f407-discovery.2789924198"

[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmware version for title bar.
signature= "rusEFI (FOME) master.2023.09.18.f407-discovery.1443760822" ; signature is expected to be 7 or more characters.
signature= "rusEFI (FOME) master.2023.09.18.f407-discovery.2789924198" ; signature is expected to be 7 or more characters.

; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
useLegacyFTempUnits = false
Expand Down Expand Up @@ -1154,7 +1154,8 @@ luaDigitalInputPinModes8 = bits, U08, 3599, [0:1], "DEFAULT", "PULLUP", "PULLDOW
rpmHardLimitHyst = scalar, U08, 3600, "RPM", 10.0, 0, 0, 2500, 0
ignTestCount = scalar, U08, 3601, "", 1, 0, 0, 50, 0
ignTestOffTime = scalar, U08, 3602, "ms", 5.0, 0, 0, 2000, 0
mainUnusedEnd = array, U08, 3603, [93], "units", 1, 0, 0, 1, 0
canVssScaling = scalar, U16, 3604, "ratio", 1.0E-4, 0, 0.5, 1.5, 4
mainUnusedEnd = array, U08, 3606, [90], "units", 1, 0, 0, 1, 0
etbBiasBins = array, F32, 3696, [8], "target TPS position", 1, 0, 0, 100, 0
etbBiasValues = array, F32, 3728, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2
iacPidMultTable = array, U08, 3760, [8x8], "%", 0.05, 0, 0, 10, 2
Expand Down Expand Up @@ -2016,6 +2017,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0
rpmHardLimitHyst = "If the hard limit is 7200rpm and hysteresis is 200rpm, then when the ECU sees 7200rpm, fuel/ign will cut, and stay cut until 7000rpm (7200-200) is reached"
ignTestCount = "How many test bench pulses do you want"
ignTestOffTime = "Time between bench test pulses"
canVssScaling = "Scale the reported vehicle speed value from CAN. Example: Parameter set to 1.1, CAN VSS reports 50kph, ECU will report 55kph instead."
etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method"
etbBiasValues = "PWM bias, 0 to 100%"
sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM"
Expand Down Expand Up @@ -7235,7 +7237,8 @@ dialog = lambda_monitorDialog, "lambda_monitor"

dialog = speedSensorCan, "CAN Vehicle Speed"
field = "Enable CAN VSS", enableCanVss, { canReadEnabled }
field = "VSS CAN message type", canVssNbcType, { enableCanVss }
field = "CAN VSS type", canVssNbcType, { enableCanVss }
field = "CAN VSS scaling", canVssScaling, { canReadEnabled }

dialog = speedSensorLeft, "", yAxis
panel = speedSensorAnalog, { enableCanVss == 0 }
Expand Down
11 changes: 7 additions & 4 deletions firmware/tunerstudio/generated/fome_48way.ini
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ enable2ndByteCanID = false

[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI (FOME) master.2023.09.18.48way.1324777209"
signature = "rusEFI (FOME) master.2023.09.18.48way.3199379753"

[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmware version for title bar.
signature= "rusEFI (FOME) master.2023.09.18.48way.1324777209" ; signature is expected to be 7 or more characters.
signature= "rusEFI (FOME) master.2023.09.18.48way.3199379753" ; signature is expected to be 7 or more characters.

; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
useLegacyFTempUnits = false
Expand Down Expand Up @@ -1154,7 +1154,8 @@ luaDigitalInputPinModes8 = bits, U08, 3599, [0:1], "DEFAULT", "PULLUP", "PULLDOW
rpmHardLimitHyst = scalar, U08, 3600, "RPM", 10.0, 0, 0, 2500, 0
ignTestCount = scalar, U08, 3601, "", 1, 0, 0, 50, 0
ignTestOffTime = scalar, U08, 3602, "ms", 5.0, 0, 0, 2000, 0
mainUnusedEnd = array, U08, 3603, [93], "units", 1, 0, 0, 1, 0
canVssScaling = scalar, U16, 3604, "ratio", 1.0E-4, 0, 0.5, 1.5, 4
mainUnusedEnd = array, U08, 3606, [90], "units", 1, 0, 0, 1, 0
etbBiasBins = array, F32, 3696, [8], "target TPS position", 1, 0, 0, 100, 0
etbBiasValues = array, F32, 3728, [8], "ETB duty cycle bias", 1, 0, -100, 100, 2
iacPidMultTable = array, U08, 3760, [8x8], "%", 0.05, 0, 0, 10, 2
Expand Down Expand Up @@ -2016,6 +2017,7 @@ lambdaMaxDeviationRpmBins = array, U16, 22812, [4], "RPM", 1, 0, 0, 18000, 0
rpmHardLimitHyst = "If the hard limit is 7200rpm and hysteresis is 200rpm, then when the ECU sees 7200rpm, fuel/ign will cut, and stay cut until 7000rpm (7200-200) is reached"
ignTestCount = "How many test bench pulses do you want"
ignTestOffTime = "Time between bench test pulses"
canVssScaling = "Scale the reported vehicle speed value from CAN. Example: Parameter set to 1.1, CAN VSS reports 50kph, ECU will report 55kph instead."
etbBiasBins = "target TPS value, 0 to 100%\nTODO: use int8 data date once we template interpolation method"
etbBiasValues = "PWM bias, 0 to 100%"
sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM"
Expand Down Expand Up @@ -7235,7 +7237,8 @@ dialog = lambda_monitorDialog, "lambda_monitor"

dialog = speedSensorCan, "CAN Vehicle Speed"
field = "Enable CAN VSS", enableCanVss, { canReadEnabled }
field = "VSS CAN message type", canVssNbcType, { enableCanVss }
field = "CAN VSS type", canVssNbcType, { enableCanVss }
field = "CAN VSS scaling", canVssScaling, { canReadEnabled }

dialog = speedSensorLeft, "", yAxis
panel = speedSensorAnalog, { enableCanVss == 0 }
Expand Down
Loading

0 comments on commit bbe74d3

Please sign in to comment.