Skip to content

Commit

Permalink
gear presets use the correct number of significant digits #358
Browse files Browse the repository at this point in the history
  • Loading branch information
@mck1117
mck1117 committed Aug 26, 2024
1 parent c67c5b3 commit f148e25
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 25 deletions.
10 changes: 5 additions & 5 deletions firmware/config/engines/mazda_miata_1_6.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,11 @@ void miataNAcommonEngineSettings() {

// Vehicle speed/gears
engineConfiguration->totalGearsCount = 5;
engineConfiguration->gearRatio[0] = 3.136;
engineConfiguration->gearRatio[1] = 1.888;
engineConfiguration->gearRatio[2] = 1.330;
engineConfiguration->gearRatio[3] = 1.000;
engineConfiguration->gearRatio[4] = 0.814;
engineConfiguration->gearRatio[0] = 3.14;
engineConfiguration->gearRatio[1] = 1.89;
engineConfiguration->gearRatio[2] = 1.33;
engineConfiguration->gearRatio[3] = 1.00;
engineConfiguration->gearRatio[4] = 0.81;

// These may need to change based on your real car
engineConfiguration->driveWheelRevPerKm = 551;
Expand Down
22 changes: 11 additions & 11 deletions firmware/config/engines/mazda_miata_vvt.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,11 +389,11 @@ static void setMazdaMiataEngineNB1Defaults() {

// Vehicle speed/gears
engineConfiguration->totalGearsCount = 5;
engineConfiguration->gearRatio[0] = 3.136;
engineConfiguration->gearRatio[1] = 1.888;
engineConfiguration->gearRatio[2] = 1.330;
engineConfiguration->gearRatio[3] = 1.000;
engineConfiguration->gearRatio[4] = 0.814;
engineConfiguration->gearRatio[0] = 3.14;
engineConfiguration->gearRatio[1] = 1.89;
engineConfiguration->gearRatio[2] = 1.33;
engineConfiguration->gearRatio[3] = 1.00;
engineConfiguration->gearRatio[4] = 0.81;

// These may need to change based on your real car
engineConfiguration->driveWheelRevPerKm = 551;
Expand Down Expand Up @@ -423,12 +423,12 @@ static void setMazdaMiataEngineNB2Defaults() {

// Vehicle speed/gears
engineConfiguration->totalGearsCount = 6;
engineConfiguration->gearRatio[0] = 3.760;
engineConfiguration->gearRatio[1] = 2.269;
engineConfiguration->gearRatio[2] = 1.646;
engineConfiguration->gearRatio[3] = 1.257;
engineConfiguration->gearRatio[4] = 1.000;
engineConfiguration->gearRatio[5] = 0.843;
engineConfiguration->gearRatio[0] = 3.76;
engineConfiguration->gearRatio[1] = 2.27;
engineConfiguration->gearRatio[2] = 1.65;
engineConfiguration->gearRatio[3] = 1.26;
engineConfiguration->gearRatio[4] = 1.00;
engineConfiguration->gearRatio[5] = 0.84;

// These may need to change based on your real car
engineConfiguration->driveWheelRevPerKm = 538;
Expand Down
20 changes: 11 additions & 9 deletions firmware/tunerstudio/tunerstudio.template.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3700,16 +3700,18 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
field = "Final drive ratio", finalGearRatio
field = ""
settingSelector = "Common transmissions"
settingOption = "Miata NA/NB/NC 5 speed" , totalGearsCount=5,gearRatio1=3.163,gearRatio2=1.888,gearRatio3=1.333,gearRatio4=1.000,gearRatio5=0.814
settingOption = "Miata NB 6 speed" , totalGearsCount=6,gearRatio1=3.760,gearRatio2=2.269,gearRatio3=1.645,gearRatio4=1.257,gearRatio5=1.000,gearRatio6=0.843
settingOption = "Miata NC 6 speed" , totalGearsCount=6,gearRatio1=3.709,gearRatio2=2.190,gearRatio3=1.536,gearRatio4=1.177,gearRatio5=1.000,gearRatio6=0.832
settingOption = "BMW E30 Getrag 240" , totalGearsCount=5,gearRatio1=3.717,gearRatio2=2.019,gearRatio3=1.316,gearRatio4=1.000,gearRatio5=0.805
settingOption = "BMW E30 Getrag 260" , totalGearsCount=5,gearRatio1=3.830,gearRatio2=2.200,gearRatio3=1.400,gearRatio4=1.000,gearRatio5=0.805
settingOption = "BMW E36/E46 Getrag 5 speed" , totalGearsCount=5,gearRatio1=4.230,gearRatio2=2.520,gearRatio3=1.660,gearRatio4=1.220,gearRatio5=1.000
settingOption = "BMW E36/E46 ZF 5 speed" , totalGearsCount=5,gearRatio1=4.210,gearRatio2=2.490,gearRatio3=1.660,gearRatio4=1.240,gearRatio5=1.000
settingOption = "BMW E46 ZF 6 speed" , totalGearsCount=6,gearRatio1=4.350,gearRatio2=2.496,gearRatio3=1.665,gearRatio4=1.234,gearRatio5=1.000,gearRatio6=0.851
settingOption = "Nissan 350z 6 speed" , totalGearsCount=6,gearRatio1=3.794,gearRatio2=2.324,gearRatio3=1.624,gearRatio4=1.271,gearRatio5=1.000,gearRatio6=0.794
settingOption = "Miata NA/NB/NC 5 speed" , totalGearsCount=5,gearRatio1=3.14,gearRatio2=1.89,gearRatio3=1.33,gearRatio4=1.00,gearRatio5=0.81
settingOption = "Miata NB 6 speed" , totalGearsCount=6,gearRatio1=3.76,gearRatio2=2.27,gearRatio3=1.65,gearRatio4=1.26,gearRatio5=1.00,gearRatio6=0.84
settingOption = "Miata NC 6 speed" , totalGearsCount=6,gearRatio1=3.71,gearRatio2=2.19,gearRatio3=1.54,gearRatio4=1.18,gearRatio5=1.00,gearRatio6=0.83
settingOption = "BMW E30 Getrag 240" , totalGearsCount=5,gearRatio1=3.72,gearRatio2=2.02,gearRatio3=1.32,gearRatio4=1.00,gearRatio5=0.81
settingOption = "BMW E30 Getrag 260" , totalGearsCount=5,gearRatio1=3.83,gearRatio2=2.20,gearRatio3=1.40,gearRatio4=1.00,gearRatio5=0.81
settingOption = "BMW E36/E46 Getrag 5 speed" , totalGearsCount=5,gearRatio1=4.23,gearRatio2=2.52,gearRatio3=1.66,gearRatio4=1.22,gearRatio5=1.00
settingOption = "BMW E36/E46 ZF 5 speed" , totalGearsCount=5,gearRatio1=4.21,gearRatio2=2.49,gearRatio3=1.66,gearRatio4=1.24,gearRatio5=1.00
settingOption = "BMW E46 ZF 6 speed" , totalGearsCount=6,gearRatio1=4.35,gearRatio2=2.50,gearRatio3=1.67,gearRatio4=1.23,gearRatio5=1.00,gearRatio6=0.85
settingOption = "Nissan 350z 6 speed" , totalGearsCount=6,gearRatio1=3.80,gearRatio2=2.32,gearRatio3=1.62,gearRatio4=1.27,gearRatio5=1.00,gearRatio6=0.79
field = ""
field = "Forward gear count", totalGearsCount
field = ""
field = "1st gear", gearRatio1, { totalGearsCount >= 1 }
field = "2nd gear", gearRatio2, { totalGearsCount >= 2 }
field = "3rd gear", gearRatio3, { totalGearsCount >= 3 }
Expand Down

0 comments on commit f148e25

Please sign in to comment.