diff --git a/reference/speeduino.ini b/reference/speeduino.ini index f3c8f935..a9bc41bb 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -1093,7 +1093,7 @@ page = 11 defaultValue = dutyLim, 80 defaultValue = mapMin, 10 defaultValue = mapMax, 260 - defaultValue = baroMin 10 + defaultValue = baroMin, 10 defaultValue = baroMax, 260 defaultValue = useEMAP, 0 defaultValue = EMAPMin, 10 @@ -1148,13 +1148,13 @@ page = 11 defaultValue = resetControlPin, 0 ;Default ADC filter values - defaultValue = ADCFILTER_TPS 50 - defaultValue = ADCFILTER_CLT 180 - defaultValue = ADCFILTER_IAT 180 - defaultValue = ADCFILTER_O2 100 - defaultValue = ADCFILTER_BAT 128 - defaultValue = ADCFILTER_MAP 20 ;This is only used on Instantaneous MAP readings and is intentionally very weak to allow for faster response - defaultValue = ADCFILTER_BARO 64 + defaultValue = ADCFILTER_TPS, 50 + defaultValue = ADCFILTER_CLT, 180 + defaultValue = ADCFILTER_IAT, 180 + defaultValue = ADCFILTER_O2, 100 + defaultValue = ADCFILTER_BAT, 128 + defaultValue = ADCFILTER_MAP, 20 ;This is only used on Instantaneous MAP readings and is intentionally very weak to allow for faster response + defaultValue = ADCFILTER_BARO, 64 ;Force the controller priority for the filters (Controller knows best here when in doubt) controllerPriority = ADCFILTER_TPS controllerPriority = ADCFILTER_CLT @@ -1177,22 +1177,22 @@ page = 11 controllerPriority = bootloaderCaps - defaultValue = AUXin00Alias Aux0 - defaultValue = AUXin01Alias Aux1 - defaultValue = AUXin02Alias Aux2 - defaultValue = AUXin03Alias Aux3 - defaultValue = AUXin04Alias Aux4 - defaultValue = AUXin05Alias Aux5 - defaultValue = AUXin06Alias Aux6 - defaultValue = AUXin07Alias Aux7 - defaultValue = AUXin08Alias Aux8 - defaultValue = AUXin09Alias Aux9 - defaultValue = AUXin10Alias Aux10 - defaultValue = AUXin11Alias Aux11 - defaultValue = AUXin12Alias Aux12 - defaultValue = AUXin13Alias Aux13 - defaultValue = AUXin14Alias Aux14 - defaultValue = AUXin15Alias Aux15 + defaultValue = AUXin00Alias, Aux0 + defaultValue = AUXin01Alias, Aux1 + defaultValue = AUXin02Alias, Aux2 + defaultValue = AUXin03Alias, Aux3 + defaultValue = AUXin04Alias, Aux4 + defaultValue = AUXin05Alias, Aux5 + defaultValue = AUXin06Alias, Aux6 + defaultValue = AUXin07Alias, Aux7 + defaultValue = AUXin08Alias, Aux8 + defaultValue = AUXin09Alias, Aux9 + defaultValue = AUXin10Alias, Aux10 + defaultValue = AUXin11Alias, Aux11 + defaultValue = AUXin12Alias, Aux12 + defaultValue = AUXin13Alias, Aux13 + defaultValue = AUXin14Alias, Aux14 + defaultValue = AUXin15Alias, Aux15 [Menu] diff --git a/speeduino/corrections.ino b/speeduino/corrections.ino index 030d13d8..568079c3 100644 --- a/speeduino/corrections.ino +++ b/speeduino/corrections.ino @@ -108,7 +108,7 @@ static inline byte correctionWUE() //This prevents us doing the 2D lookup if we're already up to temp BIT_CLEAR(currentStatus.engine, BIT_ENGINE_WARMUP); //WUEValue = WUETable.values[9]; //Set the current value to be whatever the final value on the curve is. - WUEValue = table2D_getAxisValue(&WUETable, 9); + WUEValue = table2D_getRawValue(&WUETable, 9); } else { diff --git a/speeduino/table.h b/speeduino/table.h index 787967d2..52ffabac 100644 --- a/speeduino/table.h +++ b/speeduino/table.h @@ -34,9 +34,9 @@ struct table2D { }; //void table2D_setSize(struct table2D targetTable, byte newSize); -void table2D_setSize(struct table2D, byte); -int16_t table2D_getAxisValue(struct table2D, byte); -int16_t table2D_getRawValue(struct table2D, byte); +void table2D_setSize(struct table2D*, byte); +int16_t table2D_getAxisValue(struct table2D*, byte); +int16_t table2D_getRawValue(struct table2D*, byte); struct table3D {