noisymime
/
speeduino
mirror of https://github.com/noisymime/speeduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve TS ini selection options 

fix bit masking
storage table fix
This commit is contained in:
darren siepka 2018-07-04 00:36:37 +01:00
parent fbfa727f6f
commit 8dd9ed9fbd
5 changed files with 200 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

277
reference/speeduino.ini
View File

@ -162,9 +162,9 @@
#define PIN_OUT16inv = "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
#define PIN_16inv = "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
#define ANALOG_PIN = "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A8", "A10", "A11", "A12", "A13", "A14", "A15"
#define DIGITAL_PIN = "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
#define ANALOG_DIG_PIN_LIST = $DIGITAL_PIN, $ANALOG_PIN, $PIN_16inv
#define ANALOG_PIN = "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A8", "A10", "A11", "A12", "A13", "A14", "A15", $PIN_16inv, $PIN_16inv, $PIN_16inv
#define DIGITAL_PIN = "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
#define ANALOG_DIG_PIN_LIST = $DIGITAL_PIN, $ANALOG_PIN
#define tsCanId_list = "CAN ID 0", "CAN ID 1", "CAN ID 2", "CAN ID 3", "CAN ID 4", "CAN ID 5", "CAN ID 6", "CAN ID 7", "CAN ID 8", "CAN ID 9", "CAN ID 10","CAN ID 11","CAN ID 12","CAN ID 13","CAN ID 14","INVALID"
#define CAN_ADDRESS_HEX_inv255 = $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT16inv, $PIN_OUT10inv, "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
#define CAN_ADDRESS_HEX_00XX = "INVALID", "0x001", "0x002", "0x003", "0x004", "0x005", "0x006", "0x007", "0x008", "0x009", "0x00A", "0x00B", "0x00C", "0x00D", "0x00E", "0x00F", "0x010", "0x011", "0x012", "0x013", "0x014", "0x015", "0x016", "0x017", "0x018", "0x019", "0x01A", "0x01B", "0x01C", "0x01D", "0x01E", "0x01F", "0x020", "0x021", "0x022", "0x023", "0x024", "0x025", "0x026", "0x027", "0x028", "0x029", "0x02A", "0x02B", "0x02C", "0x02D", "0x02E", "0x02F", "0x030", "0x031", "0x032", "0x033", "0x034", "0x035", "0x036", "0x037", "0x038", "0x039", "0x03A", "0x03B", "0x03C", "0x03D", "0x03E", "0x03F", "0x040", "0x041", "0x042", "0x043", "0x044", "0x045", "0x046", "0x047", "0x048", "0x049", "0x04A", "0x04B", "0x04C", "0x04D", "0x04E", "0x04F", "0x050", "0x051", "0x052", "0x053", "0x054", "0x055", "0x056", "0x057", "0x058", "0x059", "0x05A", "0x05B", "0x05C", "0x05D", "0x05E", "0x05F" ,"0x060", "0x061", "0x062", "0x063", "0x064", "0x065", "0x066", "0x067", "0x068", "0x069", "0x06A", "0x06B", "0x06C", "0x06D", "0x06E", "0x06F", "0x070", "0x071", "0x072", "0x073", "0x074", "0x075", "0x076", "0x077", "0x078", "0x079", "0x07A", "0x07B", "0x07C", "0x07D", "0x07E", "0x07F", "0x080", "0x081", "0x082", "0x083", "0x084", "0x085", "0x086", "0x087", "0x088", "0x089", "0x08A", "0x08B", "0x08C", "0x08D", "0x08E", "0x08F" ,"0x090", "0x091", "0x092", "0x093", "0x094", "0x095", "0x096", "0x097", "0x098", "0x099", "0x09A", "0x09B", "0x09C", "0x09D", "0x09E", "0x09F", "0x0A0", "0x0A1", "0x0A2", "0x0A3", "0x0A4", "0x0A5", "0x0A6", "0x0A7", "0x0A8", "0x0A9", "0x0AA", "0x0AB", "0x0AC", "0x0AD", "0x0AE", "0x0AF", "0x0B0", "0x0B1", "0x0B2", "0x0B3", "0x0B4", "0x0B5", "0x0B6", "0x0B7", "0x0B8", "0x0B9", "0x0BA", "0x0BB", "0x0BC", "0x0BD", "0x0BE", "0x0BF" ,"0x0C0", "0x0C1", "0x0C2", "0x0C3", "0x0C4", "0x0C5", "0x0C6", "0x0C7", "0x0C8", "0x0C9", "0x0CA", "0x0CB", "0x0CC", "0x0CD", "0x0CE", "0x0CF", "0x0D0", "0x0D1", "0x0D2", "0x0D3", "0x0D4", "0x0D5", "0x0D6", "0x0D7", "0x0D8", "0x0D9", "0x0DA", "0x0DB", "0x0DC", "0x0DD", "0x0DE", "0x0DF", "0x0E0", "0x0E1", "0x0E2", "0x0E3", "0x0E4", "0x0E5", "0x0E6", "0x0E7", "0x0E8", "0x0E9", "0x0EA", "0x0EB", "0x0EC", "0x0ED", "0x0EE", "0x0EF" ,"0x0F0", "0x0F1", "0x0F2", "0x0F3", "0x0F4", "0x0F5", "0x0F6", "0x0F7", "0x0F8", "0x0F9", "0x0FA", "0x0FB", "0x0FC", "0x0FD", "0x0FE", "0x0FF"
@ -722,39 +722,56 @@ page = 9
;wueAFRRates = array, U08, 107, [10], "%", 1.0, 0.0, 0.0, 255, 0
;wueAFRBins = array, U08, 117, [10], "C", 1.0, -40, -40, 102.0, 0
Auxin0pin = bits, U08, 121, [0:6], $ANALOG_DIG_PIN_LIST
Auxin1pin = bits, U08, 122, [0:6], $ANALOG_DIG_PIN_LIST
Auxin2pin = bits, U08, 123, [0:6], $ANALOG_DIG_PIN_LIST
Auxin3pin = bits, U08, 124, [0:6], $ANALOG_DIG_PIN_LIST
Auxin4pin = bits, U08, 125, [0:6], $ANALOG_DIG_PIN_LIST
Auxin5pin = bits, U08, 126, [0:6], $ANALOG_DIG_PIN_LIST
Auxin6pin = bits, U08, 127, [0:6], $ANALOG_DIG_PIN_LIST
Auxin7pin = bits, U08, 128, [0:6], $ANALOG_DIG_PIN_LIST
Auxin8pin = bits, U08, 129, [0:6], $ANALOG_DIG_PIN_LIST
Auxin9pin = bits, U08, 130, [0:6], $ANALOG_DIG_PIN_LIST
Auxin10pin = bits, U08, 131, [0:6], $ANALOG_DIG_PIN_LIST
Auxin11pin = bits, U08, 132, [0:6], $ANALOG_DIG_PIN_LIST
Auxin12pin = bits, U08, 133, [0:6], $ANALOG_DIG_PIN_LIST
Auxin13pin = bits, U08, 134, [0:6], $ANALOG_DIG_PIN_LIST
Auxin14pin = bits, U08, 135, [0:6], $ANALOG_DIG_PIN_LIST
Auxin15pin = bits, U08, 136, [0:6], $ANALOG_DIG_PIN_LIST
Auxin0pina = bits, U08, 121, [0:6], $ANALOG_PIN
Auxin1pina = bits, U08, 122, [0:6], $ANALOG_PIN
Auxin2pina = bits, U08, 123, [0:6], $ANALOG_PIN
Auxin3pina = bits, U08, 124, [0:6], $ANALOG_PIN
Auxin4pina = bits, U08, 125, [0:6], $ANALOG_PIN
Auxin5pina = bits, U08, 126, [0:6], $ANALOG_PIN
Auxin6pina = bits, U08, 127, [0:6], $ANALOG_PIN
Auxin7pina = bits, U08, 128, [0:6], $ANALOG_PIN
Auxin8pina = bits, U08, 129, [0:6], $ANALOG_PIN
Auxin9pina = bits, U08, 130, [0:6], $ANALOG_PIN
Auxin10pina = bits, U08, 131, [0:6], $ANALOG_PIN
Auxin11pina = bits, U08, 132, [0:6], $ANALOG_PIN
Auxin12pina = bits, U08, 133, [0:6], $ANALOG_PIN
Auxin13pina = bits, U08, 134, [0:6], $ANALOG_PIN
Auxin14pina = bits, U08, 135, [0:6], $ANALOG_PIN
Auxin15pina = bits, U08, 136, [0:6], $ANALOG_PIN
unused10_137 = scalar, U08, 137, "", 1, 0, 0, 255, 0
unused10_138 = scalar, U08, 138, "", 1, 0, 0, 255, 0
unused10_139 = scalar, U08, 139, "", 1, 0, 0, 255, 0
unused10_140 = scalar, U08, 140, "", 1, 0, 0, 255, 0
unused10_141 = scalar, U08, 141, "", 1, 0, 0, 255, 0
unused10_142 = scalar, U08, 142, "", 1, 0, 0, 255, 0
unused10_143 = scalar, U08, 143, "", 1, 0, 0, 255, 0
unused10_144 = scalar, U08, 144, "", 1, 0, 0, 255, 0
unused10_145 = scalar, U08, 145, "", 1, 0, 0, 255, 0
unused10_146 = scalar, U08, 146, "", 1, 0, 0, 255, 0
unused10_147 = scalar, U08, 147, "", 1, 0, 0, 255, 0
unused10_148 = scalar, U08, 148, "", 1, 0, 0, 255, 0
unused10_149 = scalar, U08, 149, "", 1, 0, 0, 255, 0
unused10_150 = scalar, U08, 150, "", 1, 0, 0, 255, 0
unused10_151 = scalar, U08, 151, "", 1, 0, 0, 255, 0
unused10_152 = scalar, U08, 152, "", 1, 0, 0, 255, 0
Auxin0pinb = bits, U08, 137, [0:6], $DIGITAL_PIN
Auxin1pinb = bits, U08, 138, [0:6], $DIGITAL_PIN
Auxin2pinb = bits, U08, 139, [0:6], $DIGITAL_PIN
Auxin3pinb = bits, U08, 140, [0:6], $DIGITAL_PIN
Auxin4pinb = bits, U08, 141, [0:6], $DIGITAL_PIN
Auxin5pinb = bits, U08, 142, [0:6], $DIGITAL_PIN
Auxin6pinb = bits, U08, 143, [0:6], $DIGITAL_PIN
Auxin7pinb = bits, U08, 144, [0:6], $DIGITAL_PIN
Auxin8pinb = bits, U08, 145, [0:6], $DIGITAL_PIN
Auxin9pinb = bits, U08, 146, [0:6], $DIGITAL_PIN
Auxin10pinb = bits, U08, 147, [0:6], $DIGITAL_PIN
Auxin11pinb = bits, U08, 148, [0:6], $DIGITAL_PIN
Auxin12pinb = bits, U08, 149, [0:6], $DIGITAL_PIN
Auxin13pinb = bits, U08, 150, [0:6], $DIGITAL_PIN
Auxin14pinb = bits, U08, 151, [0:6], $DIGITAL_PIN
Auxin15pinb = bits, U08, 152, [0:6], $DIGITAL_PIN
;unused10_137 = scalar, U08, 137, "", 1, 0, 0, 255, 0
;unused10_138 = scalar, U08, 138, "", 1, 0, 0, 255, 0
;unused10_139 = scalar, U08, 139, "", 1, 0, 0, 255, 0
;unused10_140 = scalar, U08, 140, "", 1, 0, 0, 255, 0
;unused10_141 = scalar, U08, 141, "", 1, 0, 0, 255, 0
;unused10_142 = scalar, U08, 142, "", 1, 0, 0, 255, 0
;unused10_143 = scalar, U08, 143, "", 1, 0, 0, 255, 0
;unused10_144 = scalar, U08, 144, "", 1, 0, 0, 255, 0
;unused10_145 = scalar, U08, 145, "", 1, 0, 0, 255, 0
;unused10_146 = scalar, U08, 146, "", 1, 0, 0, 255, 0
;unused10_147 = scalar, U08, 147, "", 1, 0, 0, 255, 0
;unused10_148 = scalar, U08, 148, "", 1, 0, 0, 255, 0
;unused10_149 = scalar, U08, 149, "", 1, 0, 0, 255, 0
;unused10_150 = scalar, U08, 150, "", 1, 0, 0, 255, 0
;unused10_151 = scalar, U08, 151, "", 1, 0, 0, 255, 0
;unused10_152 = scalar, U08, 152, "", 1, 0, 0, 255, 0
unused10_153 = scalar, U08, 153, "", 1, 0, 0, 255, 0
unused10_154 = scalar, U08, 154, "", 1, 0, 0, 255, 0
unused10_155 = scalar, U08, 155, "", 1, 0, 0, 255, 0
@ -793,7 +810,8 @@ page = 9
unused10_188 = scalar, U08, 188, "", 1, 0, 0, 255, 0
unused10_189 = scalar, U08, 189, "", 1, 0, 0, 255, 0
unused10_190 = scalar, U08, 190, "", 1, 0, 0, 255, 0
unused10_191 = scalar, U08, 191, "", 1, 0, 0, 255, 0
blankfield = bits, U08, 191, [0:0], "",""
;unused10_191 = scalar, U08, 191, "", 1, 0, 0, 255, 0
page = 10
#if CELSIUS
@ -979,6 +997,22 @@ page = 10
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
[Menu]
@ -2103,24 +2137,73 @@ menuDialog = main
field = "Control Type", resetControl
field = "Control Pin", resetControlPin
dialog = Auxinput_pin_selection, "Pin", yAxis
field = "", Auxin0pin , {caninput_sel0 == 2 || caninput_sel0 == 3 }
field = "", Auxin1pin , {caninput_sel1 == 2 || caninput_sel0 == 3}
field = "", Auxin2pin , {caninput_sel2 == 2 || caninput_sel0 == 3}
field = "", Auxin3pin , {caninput_sel3 == 2 || caninput_sel0 == 3}
field = "", Auxin4pin , {caninput_sel4 == 2 || caninput_sel0 == 3}
field = "", Auxin5pin , {caninput_sel5 == 2 || caninput_sel0 == 3}
field = "", Auxin6pin , {caninput_sel6 == 2 || caninput_sel0 == 3}
field = "", Auxin7pin , {caninput_sel7 == 2 || caninput_sel0 == 3}
field = "", Auxin8pin , {caninput_sel8 == 2 || caninput_sel0 == 3}
field = "", Auxin9pin , {caninput_sel9 == 2 || caninput_sel0 == 3}
field = "", Auxin10pin , {caninput_sel10 == 2 || caninput_sel0 == 3}
field = "", Auxin11pin , {caninput_sel11 == 2 || caninput_sel0 == 3}
field = "", Auxin12pin , {caninput_sel12 == 2 || caninput_sel0 == 3}
field = "", Auxin13pin , {caninput_sel13 == 2 || caninput_sel0 == 3}
field = "", Auxin14pin , {caninput_sel14 == 2 || caninput_sel0 == 3}
field = "", Auxin15pin , {caninput_sel15 == 2 || caninput_sel0 == 3}
dialog = Auxinput_pin_selection, "", yAxis
field = " PIN"
displayOnlyField = "Off", blankfield, {caninput_sel0 == 0},{caninput_sel0 == 0}
field = "", caninput_source_can_address0, { caninput_sel0 == 1 && enable_candata_in }, {caninput_sel0 == 1}
field = "", Auxin0pina , {caninput_sel0 == 2 || caninput_sel0 == 3 }, {caninput_sel0 == 2}
field = "", Auxin0pinb , {caninput_sel0 == 2 || caninput_sel0 == 3 }, {caninput_sel0 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel1 == 0},{caninput_sel1 == 0}
field = "", caninput_source_can_address1, { caninput_sel1 == 1 && enable_candata_in }, {caninput_sel1 == 1}
field = "", Auxin1pina , {caninput_sel1 == 2 || caninput_sel1 == 3}, {caninput_sel1 == 2}
field = "", Auxin1pinb , {caninput_sel1 == 2 || caninput_sel1 == 3}, {caninput_sel1 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel2 == 0},{caninput_sel2 == 0}
field = "", caninput_source_can_address2, { caninput_sel2 == 1 && enable_candata_in }, {caninput_sel2 == 1}
field = "", Auxin2pina , {caninput_sel2 == 2 || caninput_sel2 == 3}, {caninput_sel2 == 2}
field = "", Auxin2pinb , {caninput_sel2 == 2 || caninput_sel2 == 3}, {caninput_sel2 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel3 == 0},{caninput_sel3 == 0}
field = "", caninput_source_can_address3, { caninput_sel3 == 1 && enable_candata_in }, {caninput_sel3 == 1}
field = "", Auxin3pina , {caninput_sel3 == 2 || caninput_sel3 == 3}, {caninput_sel3 == 2}
field = "", Auxin3pinb , {caninput_sel3 == 2 || caninput_sel3 == 3}, {caninput_sel3 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel4 == 0},{caninput_sel4 == 0}
field = "", caninput_source_can_address4, { caninput_sel4 == 1 && enable_candata_in }, {caninput_sel4 == 1}
field = "", Auxin4pina , {caninput_sel4 == 2 || caninput_sel4 == 3}, {caninput_sel4 == 2}
field = "", Auxin4pinb , {caninput_sel4 == 2 || caninput_sel4 == 3}, {caninput_sel4 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel5 == 0},{caninput_sel5 == 0}
field = "", caninput_source_can_address5, { caninput_sel5 == 1 && enable_candata_in }, {caninput_sel5 == 1}
field = "", Auxin5pina , {caninput_sel5 == 2 || caninput_sel5 == 3}, {caninput_sel5 == 2}
field = "", Auxin5pinb , {caninput_sel5 == 2 || caninput_sel5 == 3}, {caninput_sel5 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel6 == 0},{caninput_sel6 == 0}
field = "", caninput_source_can_address6, { caninput_sel6 == 1 && enable_candata_in }, {caninput_sel6 == 1}
field = "", Auxin6pina , {caninput_sel6 == 2 || caninput_sel6 == 3}, {caninput_sel6 == 2}
field = "", Auxin6pinb , {caninput_sel6 == 2 || caninput_sel6 == 3}, {caninput_sel6 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel7 == 0},{caninput_sel7 == 0}
field = "", caninput_source_can_address7, { caninput_sel7 == 1 && enable_candata_in }, {caninput_sel7 == 1}
field = "", Auxin7pina , {caninput_sel7 == 2 || caninput_sel7 == 3}, {caninput_sel7 == 2}
field = "", Auxin7pinb , {caninput_sel7 == 2 || caninput_sel7 == 3}, {caninput_sel7 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel8 == 8},{caninput_sel8 == 0}
field = "", caninput_source_can_address8, { caninput_sel8 == 1 && enable_candata_in }, {caninput_sel8 == 1}
field = "", Auxin8pina , {caninput_sel8 == 2 || caninput_sel8 == 3}, {caninput_sel8 == 2}
field = "", Auxin8pinb , {caninput_sel8 == 2 || caninput_sel8 == 3}, {caninput_sel8 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel9 == 0},{caninput_sel9 == 0}
field = "", caninput_source_can_address9, { caninput_sel9 == 1 && enable_candata_in }, {caninput_sel9 == 1}
field = "", Auxin9pina , {caninput_sel9 == 2 || caninput_sel9 == 3}, {caninput_sel9 == 2}
field = "", Auxin9pinb , {caninput_sel9 == 2 || caninput_sel9 == 3}, {caninput_sel9 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel10 == 0},{caninput_sel10 == 0}
field = "", caninput_source_can_address10, { caninput_sel10 == 1 && enable_candata_in }, {caninput_sel10 == 1}
field = "", Auxin10pina , {caninput_sel10 == 2 || caninput_sel10 == 3}, {caninput_sel10 == 2}
field = "", Auxin10pinb , {caninput_sel10 == 2 || caninput_sel10 == 3}, {caninput_sel10 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel11 == 0},{caninput_sel11 == 0}
field = "", caninput_source_can_address11, { caninput_sel11 == 1 && enable_candata_in }, {caninput_sel11 == 1}
field = "", Auxin11pina , {caninput_sel11 == 2 || caninput_sel11 == 3}, {caninput_sel11 == 2}
field = "", Auxin11pinb , {caninput_sel11 == 2 || caninput_sel11 == 3}, {caninput_sel11 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel12 == 0},{caninput_sel12 == 0}
field = "", caninput_source_can_address12, { caninput_sel12 == 1 && enable_candata_in }, {caninput_sel12 == 1}
field = "", Auxin12pina , {caninput_sel12 == 2 || caninput_sel12 == 3}, {caninput_sel12 == 2}
field = "", Auxin12pinb , {caninput_sel12 == 2 || caninput_sel12 == 3}, {caninput_sel12 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel13 == 0},{caninput_sel13 == 0}
field = "", caninput_source_can_address13, { caninput_sel13 == 1 && enable_candata_in }, {caninput_sel13 == 1}
field = "", Auxin13pina , {caninput_sel13 == 2 || caninput_sel13 == 3}, {caninput_sel13 == 2}
field = "", Auxin13pinb , {caninput_sel13 == 2 || caninput_sel13 == 3}, {caninput_sel13 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel14 == 0},{caninput_sel14 == 0}
field = "", caninput_source_can_address14, { caninput_sel14 == 1 && enable_candata_in }, {caninput_sel14 == 1}
field = "", Auxin14pina , {caninput_sel14 == 2 || caninput_sel14 == 3}, {caninput_sel14 == 2}
field = "", Auxin14pinb , {caninput_sel14 == 2 || caninput_sel14 == 3}, {caninput_sel14 == 3}
displayOnlyField = "Off", blankfield, {caninput_sel15 == 0},{caninput_sel15 == 0}
field = "", caninput_source_can_address15, { caninput_sel15 == 1 && enable_candata_in }, {caninput_sel15 == 1}
field = "", Auxin15pina , {caninput_sel15 == 2 || caninput_sel15 == 3}, {caninput_sel15 == 2}
field = "", Auxin15pinb , {caninput_sel15 == 2 || caninput_sel15 == 3}, {caninput_sel15 == 3}
dialog = Auxinput_alias, "", yAxis
field = "Input Alias"
field = "", AUXin00Alias , {caninput_sel0}
@ -2557,25 +2640,23 @@ cmdtestspk450dc = "E\x03\x0C"
#endif
flexGauge = flex, "Flex sensor", "%", 0, 100, -1, -1, 999, 999, 0, 0
#if CAN_COMMANDS
gaugeCategory = "CanBus Inputs"
CanGauge0 = canin_gauge0, "Can In0" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge1 = canin_gauge1, "Can In1" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge2 = canin_gauge2, "Can In2" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge3 = canin_gauge3, "Can In3" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge4 = canin_gauge4, "Can In4" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge5 = canin_gauge5, "Can In5" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge6 = canin_gauge6, "Can In6" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge7 = canin_gauge7, "Can In7" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge8 = canin_gauge8, "Can In8" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge9 = canin_gauge9, "Can In9" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge10 = canin_gauge10, "Can In10" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge11 = canin_gauge11, "Can In11" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge12 = canin_gauge12, "Can In12" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge13 = canin_gauge13, "Can In13" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge14 = canin_gauge14, "Can In14" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
CanGauge15 = canin_gauge15, "Can In15" "", 0, 1024, -1, -1, 1025, 1025, 0, 0
#endif
gaugeCategory = "Auxillary Input Channels"
AuxInGauge0 = auxin_gauge0, { stringValue(AUXin00Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge1 = auxin_gauge1, { stringValue(AUXin01Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge2 = auxin_gauge2, { stringValue(AUXin02Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge3 = auxin_gauge3, { stringValue(AUXin03Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge4 = auxin_gauge4, { stringValue(AUXin04Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge5 = auxin_gauge5, { stringValue(AUXin05Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge6 = auxin_gauge6, { stringValue(AUXin06Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge7 = auxin_gauge7, { stringValue(AUXin07Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge8 = auxin_gauge8, { stringValue(AUXin08Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge9 = auxin_gauge9, { stringValue(AUXin09Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge10 = auxin_gauge10, { stringValue(AUXin10Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge11 = auxin_gauge11, { stringValue(AUXin11Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge12 = auxin_gauge12, { stringValue(AUXin12Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge13 = auxin_gauge13, { stringValue(AUXin13Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge14 = auxin_gauge14, { stringValue(AUXin14Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
AuxInGauge15 = auxin_gauge15, { stringValue(AUXin15Alias) }, "", 0, 1024, -1, -1, 1025, 1025, 0, 0
gaugeCategory = "System Data"
clockGauge = secl, "Clock", "Seconds", 0, 255, 10, 10, 245, 245, 0, 0
@ -2701,22 +2782,22 @@ cmdtestspk450dc = "E\x03\x0C"
testactive = bits, U08, 38, [1:1]
afr2 = scalar, U08, 39, "O2", 0.100, 0.000
baro = scalar, U08, 40, "kpa", 1.000, 0.000
canin_gauge0 = scalar, U16, 41, "", 1.000, 0.000
canin_gauge1 = scalar, U16, 43, "", 1.000, 0.000
canin_gauge2 = scalar, U16, 45, "", 1.000, 0.000
canin_gauge3 = scalar, U16, 47, "", 1.000, 0.000
canin_gauge4 = scalar, U16, 49, "", 1.000, 0.000
canin_gauge5 = scalar, U16, 51, "", 1.000, 0.000
canin_gauge6 = scalar, U16, 53, "", 1.000, 0.000
canin_gauge7 = scalar, U16, 55, "", 1.000, 0.000
canin_gauge8 = scalar, U16, 57, "", 1.000, 0.000
canin_gauge9 = scalar, U16, 59, "", 1.000, 0.000
canin_gauge10 = scalar, U16, 61, "", 1.000, 0.000
canin_gauge11 = scalar, U16, 63, "", 1.000, 0.000
canin_gauge12 = scalar, U16, 65, "", 1.000, 0.000
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
auxin_gauge0 = scalar, U16, 41, "", 1.000, 0.000
auxin_gauge1 = scalar, U16, 43, "", 1.000, 0.000
auxin_gauge2 = scalar, U16, 45, "", 1.000, 0.000
auxin_gauge3 = scalar, U16, 47, "", 1.000, 0.000
auxin_gauge4 = scalar, U16, 49, "", 1.000, 0.000
auxin_gauge5 = scalar, U16, 51, "", 1.000, 0.000
auxin_gauge6 = scalar, U16, 53, "", 1.000, 0.000
auxin_gauge7 = scalar, U16, 55, "", 1.000, 0.000
auxin_gauge8 = scalar, U16, 57, "", 1.000, 0.000
auxin_gauge9 = scalar, U16, 59, "", 1.000, 0.000
auxin_gauge10 = scalar, U16, 61, "", 1.000, 0.000
auxin_gauge11 = scalar, U16, 63, "", 1.000, 0.000
auxin_gauge12 = scalar, U16, 65, "", 1.000, 0.000
auxin_gauge13 = scalar, U16, 67, "", 1.000, 0.000
auxin_gauge14 = scalar, U16, 69, "", 1.000, 0.000
auxin_gauge15 = scalar, U16, 71, "", 1.000, 0.000
tpsADC = scalar, U08, 73, "ADC",1.000, 0.000
errors = scalar, U08, 74, "bits", 1.000, 0.000
errorNum = bits, U08, 74, [0:1]
@ -2837,16 +2918,14 @@ cmdtestspk450dc = "E\x03\x0C"
entry = baro, "Baro Pressure",int, "%d"
entry = nitrousOn, "Nitrous On", int, "%d", { n2o_enable > 0 }
#if CAN_COMMANDS
entry = canin_gauge0, "CanIn CH0", int, "%d"
entry = canin_gauge1, "CanIn CH1", int, "%d"
entry = canin_gauge2, "CanIn CH2", int, "%d"
entry = canin_gauge3, "CanIn CH3", int, "%d"
entry = canin_gauge4, "CanIn CH4", int, "%d"
entry = canin_gauge5, "CanIn CH5", int, "%d"
entry = canin_gauge6, "CanIn CH6", int, "%d"
entry = canin_gauge7, "CanIn CH7", int, "%d"
#endif
entry = auxin_gauge0, "AuxIn CH0", int, "%d"
entry = auxin_gauge1, "AuxIn CH1", int, "%d"
entry = auxin_gauge2, "AuxIn CH2", int, "%d"
entry = auxin_gauge3, "AuxIn CH3", int, "%d"
entry = auxin_gauge4, "AuxIn CH4", int, "%d"
entry = auxin_gauge5, "AuxIn CH5", int, "%d"
entry = auxin_gauge6, "AuxIn CH6", int, "%d"
entry = auxin_gauge7, "AuxIn CH7", int, "%d"
[LoggerDefinition]

35
speeduino/globals.h
View File

@ -678,38 +678,9 @@ struct config9 {
uint16_t true_address; //speeduino 11bit can address
uint16_t realtime_base_address; //speeduino 11 bit realtime base address
uint16_t obd_address; //speeduino OBD diagnostic address
uint8_t Auxinpin[16];
byte unused10_121;
byte unused10_122;
byte unused10_123;
byte unused10_124;
byte unused10_125;
byte unused10_126;
byte unused10_127;
byte unused10_128;
byte unused10_129;
byte unused10_130;
byte unused10_131;
byte unused10_132;
byte unused10_133;
byte unused10_134;
byte unused10_135;
byte unused10_136;
byte unused10_137;
byte unused10_138;
byte unused10_139;
byte unused10_140;
byte unused10_141;
byte unused10_142;
byte unused10_143;
byte unused10_144;
byte unused10_145;
byte unused10_146;
byte unused10_147;
byte unused10_148;
byte unused10_149;
byte unused10_150;
byte unused10_151;
uint8_t Auxinpina[16]; //analog pin number when internal aux in use
uint8_t Auxinpinb[16]; // digital pin number when internal aux in use
byte unused10_152;
byte unused10_153;
byte unused10_154;

26
speeduino/speeduino.ino
View File

@ -967,9 +967,9 @@ void loop()
//check through the Aux input channels if enabed for Can or local use
for (byte AuxinChan = 0; AuxinChan <16 ; AuxinChan++)
{
currentStatus.current_caninchannel = AuxinChan;
//currentStatus.canin[14] = currentStatus.current_caninchannel;
//currentStatus.canin[13] = ((configPage9.caninput_source_can_address[currentStatus.current_caninchannel]&2047)+0x100);
currentStatus.current_caninchannel = AuxinChan;
//currentStatus.canin[14] = ((configPage9.Auxinpinb[currentStatus.current_caninchannel]&127)+1);
//currentStatus.canin[13] = (configPage9.caninput_sel[currentStatus.current_caninchannel]&3);
if (configPage9.caninput_sel[currentStatus.current_caninchannel] == 1) //if current input channel is enabled as canbus
{
if (configPage9.enable_candata_in) //if external data input is enabled
@ -981,15 +981,15 @@ void loop()
}
}
}
else if (configPage9.caninput_sel[currentStatus.current_caninchannel] == 2) //if current input channel is enabled as analog local pin
else if ((configPage9.caninput_sel[currentStatus.current_caninchannel]&3) == 2) //if current input channel is enabled as analog local pin
{
//read analog channel specified
currentStatus.canin[currentStatus.current_caninchannel] = readAuxanalog(configPage9.Auxinpin[currentStatus.current_caninchannel]);
currentStatus.canin[currentStatus.current_caninchannel] = readAuxanalog(configPage9.Auxinpina[currentStatus.current_caninchannel]&127);
}
else if (configPage9.caninput_sel[currentStatus.current_caninchannel] == 3) //if current input channel is enabled as digital local pin
else if ((configPage9.caninput_sel[currentStatus.current_caninchannel]&3) == 3) //if current input channel is enabled as digital local pin
{
//read digital channel specified
currentStatus.canin[currentStatus.current_caninchannel] = readAuxdigital(configPage9.Auxinpin[currentStatus.current_caninchannel]);
currentStatus.canin[currentStatus.current_caninchannel] = readAuxdigital((configPage9.Auxinpinb[currentStatus.current_caninchannel]&127)+1);
}
}
@ -998,13 +998,13 @@ void loop()
for (byte AuxinChan = 0; AuxinChan <16 ; AuxinChan++)
{
currentStatus.current_caninchannel = AuxinChan;
if (configPage9.caninput_sel[currentStatus.current_caninchannel] == 1) //if current input channel is enabled as canbus
if ((configPage9.caninput_sel[currentStatus.current_caninchannel]&3) == 1) //if current input channel is enabled as canbus
{
if (configPage9.enable_candata_in)
{
if (configPage9.enable_canbus == 1) //can via secondary serial
{
sendCancommand(2,0,currentStatus.current_caninchannel,0,((configPage9.caninput_source_can_address[currentStatus.current_caninchannel]&2047)+256)); //send an R command for data from paramgroup[currentStatus.current_caninchannel]
sendCancommand(2,0,currentStatus.current_caninchannel,0,((configPage9.caninput_source_can_address[currentStatus.current_caninchannel]&2047)+0x100)); //send an R command for data from paramgroup[currentStatus.current_caninchannel]
}
else if (configPage9.enable_canbus == 2) // can via internal can module
{
@ -1012,15 +1012,15 @@ void loop()
}
}
}
else if (configPage9.caninput_sel[currentStatus.current_caninchannel] == 2) //if current input channel is enabled as analog local pin
else if ((configPage9.caninput_sel[currentStatus.current_caninchannel]&3) == 2) //if current input channel is enabled as analog local pin
{
//read analog channel specified
currentStatus.canin[currentStatus.current_caninchannel] = readAuxanalog(configPage9.Auxinpin[currentStatus.current_caninchannel]);
currentStatus.canin[currentStatus.current_caninchannel] = readAuxanalog(configPage9.Auxinpina[currentStatus.current_caninchannel]&127);
}
else if (configPage9.caninput_sel[currentStatus.current_caninchannel] == 3) //if current input channel is enabled as digital local pin
else if ((configPage9.caninput_sel[currentStatus.current_caninchannel]&3) == 3) //if current input channel is enabled as digital local pin
{
//read digital channel specified
currentStatus.canin[currentStatus.current_caninchannel] = readAuxdigital(configPage9.Auxinpin[currentStatus.current_caninchannel]);
currentStatus.canin[currentStatus.current_caninchannel] = readAuxdigital((configPage9.Auxinpinb[currentStatus.current_caninchannel]&127)+1);
}
}
#endif

10
speeduino/storage.h
View File

@ -56,8 +56,8 @@ Current layout of EEPROM data (Version 3) is as follows (All sizes are in bytes)
| 1441 |2 | X and Y size4 |
| 1443 |36 | PAGE 9 MAP4 |
| 1479 |6 | X and Y Bins4 |
| 1500 |128 | CANBUS config and data (Table 10_) |
| 1628 |192 | Table 11 - General settings |
| 1500 |192 | CANBUS config and data (Table 10_) |
| 1692 |192 | Table 11 - General settings |
| |
| 2559 |512 | Calibration data (O2) |
| 3071 |512 | Calibration data (IAT) |
@ -127,9 +127,9 @@ Current layout of EEPROM data (Version 3) is as follows (All sizes are in bytes)
#define EEPROM_CONFIG8_XBINS4 1689
#define EEPROM_CONFIG8_YBINS4 1695
#define EEPROM_CONFIG9_START 1710
#define EEPROM_CONFIG9_END 1838
#define EEPROM_CONFIG10_START 1838
#define EEPROM_CONFIG10_END 2030
#define EEPROM_CONFIG9_END 1902
#define EEPROM_CONFIG10_START 1902
#define EEPROM_CONFIG10_END 2094
//Calibration data is stored at the end of the EEPROM (This is in case any further calibration tables are needed as they are large blocks)
#define EEPROM_LAST_BARO 2558

2
speeduino/storage.ino
View File

@ -353,7 +353,7 @@ void writeConfig(byte tableNum)
case canbusPage:
/*---------------------------------------------------
| Config page 10 (See storage.h for data layout)
| 128 byte long config table
| 192 byte long config table
-----------------------------------------------------*/
pnt_configPage = (byte *)&configPage9; //Create a pointer to Page 10 in memory
for(int x=EEPROM_CONFIG9_START; x<EEPROM_CONFIG9_END; x++)