Add fields to allow custom MAP sensors being entered

This commit is contained in:
Josh Stewart 2017-07-03 12:14:07 +10:00
parent 086d705561
commit 7f86b91198
3 changed files with 17 additions and 13 deletions

View File

@ -622,7 +622,7 @@ page = 10
caninput_param_num_bytes15 = bits, U16, 51, [15:15], "1", "2"
unused10_53 = scalar, U08, 53, "", 1, 0, 0, 255, 0
unused10_54 = scalar, U08, 54, "", 1, 0, 0, 255, 0
unused10_54 = scalar, U08, 54, "", 1, 0, 0, 255, 0
enable_candata_out = bits, U08, 55, [0:0], "Off", "On"
canoutput_sel0 = bits, U08, 56, [0:0], "Off", "On"
canoutput_sel1 = bits, U08, 57, [0:0], "Off", "On"
@ -649,7 +649,7 @@ page = 10
canoutput_param_num_bytes5 = bits, U08, 94, [0:1], "INVALID", "1", "2", "INVALID"
canoutput_param_num_bytes6 = bits, U08, 95, [0:1], "INVALID", "1", "2", "INVALID"
canoutput_param_num_bytes7 = bits, U08, 96, [0:1], "INVALID", "1", "2", "INVALID"
unused10_97 = scalar, U08, 97, "", 1, 0, 0, 255, 0
unused10_98 = scalar, U08, 98, "", 1, 0, 0, 255, 0
unused10_99 = scalar, U08, 99, "", 1, 0, 0, 255, 0
@ -1351,6 +1351,9 @@ menuDialog = main
settingOption = "Denso 079800", mapMin=0, mapMax=173 ; http://speeduino.com/forum/viewtopic.php?f=18&t=510&p=7023#p7021
settingOption = "VW/Audi/Porsche 250kPa", mapMin=26, mapMax=250 ; http://speeduino.com/forum/viewtopic.php?p=17502#p17502
field = "Value At 0.0 Volts", mapMin
field = "Value At 5.0 Volts", mapMax
dialog = boostSettings, "Boost Control"
topicHelp = "http://speeduino.com/wiki/index.php/Boost_Control"
field = "Boost Control Enabled", boostEnabled
@ -1495,7 +1498,7 @@ menuDialog = main
field = "CAN Input 13", caninput_sel13, { enable_candata_in }
field = "CAN Input 14", caninput_sel14, { enable_candata_in }
field = "CAN Input 15", caninput_sel15, { enable_candata_in }
dialog = caninput_parameter_group, "", yAxis
field = "Input Parameter Group"
field = "", caninput_param_group0, { caninput_sel0 && enable_candata_in }
@ -1514,7 +1517,7 @@ menuDialog = main
field = "", caninput_param_group13, { caninput_sel13 && enable_candata_in }
field = "", caninput_param_group14, { caninput_sel14 && enable_candata_in }
field = "", caninput_param_group15, { caninput_sel15 && enable_candata_in }
dialog = caninput_parameter_start_byte, "", yAxis
field = "Input Parameter Start Byte"
field = "", caninput_param_start_byte0, { caninput_sel0 && enable_candata_in }
@ -1533,7 +1536,7 @@ menuDialog = main
field = "", caninput_param_start_byte13, { caninput_sel13 && enable_candata_in }
field = "", caninput_param_start_byte14, { caninput_sel14 && enable_candata_in }
field = "", caninput_param_start_byte15, { caninput_sel15 && enable_candata_in }
dialog = caninput_parameter_num_byte, "", yAxis
field = "Input Parameter Number of Bytes"
field = "", caninput_param_num_bytes0, { caninput_sel0 && enable_candata_in }
@ -1552,7 +1555,7 @@ menuDialog = main
field = "", caninput_param_num_bytes13, { caninput_sel13 && enable_candata_in }
field = "", caninput_param_num_bytes14, { caninput_sel14 && enable_candata_in }
field = "", caninput_param_num_bytes15, { caninput_sel15 && enable_candata_in }
dialog = caninconfig_blank1,""
field = ""
@ -1592,7 +1595,7 @@ menuDialog = main
; field = "CAN Output 13", canoutput_sel13, { enable_candata_out }
; field = "CAN Output 14", canoutput_sel14, { enable_candata_out }
; field = "CAN Output 15", canoutput_sel15, { enable_candata_out }
dialog = canoutput_parameter_group, "", yAxis
field = "Output Parameter Group"
field = "", canoutput_param_group[0], { canoutput_sel0 && enable_candata_out }
@ -1611,7 +1614,7 @@ menuDialog = main
; field = "", canoutput_param_group[13], { canoutput_sel4 && enable_candata_out }
; field = "", canoutput_param_group[14], { canoutput_sel5 && enable_candata_out }
; field = "", canoutput_param_group[15], { canoutput_sel6 && enable_candata_out }
dialog = canoutput_parameter_start_byte, "", yAxis
field = "Output Parameter Start Byte"
field = "", canoutput_param_start_byte0, { canoutput_sel0 && enable_candata_out }
@ -1630,7 +1633,7 @@ menuDialog = main
; field = "", canoutput_param_start_byte13, { canoutput_sel13 && enable_candata_out }
; field = "", canoutput_param_start_byte14, { canoutput_sel14 && enable_candata_out }
; field = "", canoutput_param_start_byte15, { canoutput_sel15 && enable_candata_out }
dialog = canoutput_parameter_num_byte, "", yAxis
field = "Output Parameter Number of Bytes"
field = "", canoutput_param_num_bytes0, { canoutput_sel0 && enable_candata_out }
@ -1649,7 +1652,7 @@ menuDialog = main
; field = "", canoutput_param_num_bytes13, { canoutput_sel13 && enable_candata_out }
; field = "", canoutput_param_num_bytes14, { canoutput_sel14 && enable_candata_out }
; field = "", canoutput_param_num_bytes15, { canoutput_sel15 && enable_candata_out }
dialog = canoutconfig_blank1,""
field = ""
@ -2264,7 +2267,7 @@ cmdtestspk450dc = "E\x03\x0C"
canin_gauge13 = scalar, U16, 67, "", 1.000, 0.000
canin_gauge14 = scalar, U16, 69, "", 1.000, 0.000
canin_gauge15 = scalar, U16, 71, "", 1.000, 0.000
; Computed output channels. See "megatuneExamples.ini" for all the
; pre-defined variables, search for "???" and you'll see them.

View File

@ -169,7 +169,7 @@ static inline byte correctionAccel()
{
int8_t TPS_change = (currentStatus.TPS - currentStatus.TPSlast);
//Check for deceleration (Deceleration adjustment not yet supported)
//Also check for only very small movement (Movement less than or equal to 2 is ignored)
//Also check for only very small movement (Movement less than or equal to 2% is ignored). This not only means we can skip the lookup, but helps reduce false triggering around 0-2% throttle openings
if (TPS_change <= 2)
{
accelValue = 100;

View File

@ -23,7 +23,8 @@ struct table2D {
int *axisX16;
//Store the last X and Y coordinates in the table. This is used to make the next check faster
int lastXMax, lastXMin;
int lastXMax;
int lastXMin;
};
void table2D_setSize(struct table2D targetTable, byte newSize);