Fix misalignment of CAN address and start bytes
This commit is contained in:
Josh Stewart
parent
329a5278a7
commit
00f15a6336
|
|
@ -88,6 +88,14 @@
|
|||
#define invalid_x32 = $invalid_x16, $invalid_x16
|
||||
#define invalid_x64 = $invalid_x32, $invalid_x32
|
||||
#define invalid_x128 = $invalid_x64, $invalid_x64
|
||||
#define invalid_x256 = $invalid_x128, $invalid_x128
|
||||
#define invalid_x512 = $invalid_x256, $invalid_x256
|
||||
#define invalid_x1024 = $invalid_x512, $invalid_x512
|
||||
#define invalid_x2048 = $invalid_x1024, $invalid_x1024
|
||||
#define invalid_x4096 = $invalid_x2048, $invalid_x2048
|
||||
#define invalid_x8192 = $invalid_x4096, $invalid_x4096
|
||||
#define invalid_x16384 = $invalid_x8192, $invalid_x8192
|
||||
#define invalid_x32768 = $invalid_x16384, $invalid_x16384
|
||||
|
||||
#define loadSourceNames = "MAP", "TPS", "IMAP/EMAP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
|
||||
#define loadSourceUnits = "kPa", "% TPS", "%", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
|
||||
|
|
@ -293,7 +301,7 @@
|
|||
#define CAN_ADDRESS_HEX_05XX = "0x500", "0x501", "0x502", "0x503", "0x504", "0x505", "0x506", "0x507", "0x508", "0x509", "0x50A", "0x50B", "0x50C", "0x50D", "0x50E", "0x50F", "0x510", "0x511", "0x512", "0x513", "0x514", "0x515", "0x516", "0x517", "0x518", "0x519", "0x51A", "0x51B", "0x51C", "0x51D", "0x51E", "0x51F", "0x520", "0x521", "0x522", "0x523", "0x524", "0x525", "0x526", "0x527", "0x528", "0x529", "0x52A", "0x52B", "0x52C", "0x52D", "0x52E", "0x52F", "0x530", "0x531", "0x532", "0x533", "0x534", "0x535", "0x536", "0x537", "0x538", "0x539", "0x53A", "0x53B", "0x53C", "0x53D", "0x53E", "0x53F", "0x540", "0x541", "0x542", "0x543", "0x544", "0x545", "0x546", "0x547", "0x548", "0x549", "0x54A", "0x54B", "0x54C", "0x54D", "0x54E", "0x54F", "0x550", "0x551", "0x552", "0x553", "0x554", "0x555", "0x556", "0x557", "0x558", "0x559", "0x55A", "0x55B", "0x55C", "0x55D", "0x55E", "0x55F" ,"0x560", "0x561", "0x562", "0x563", "0x564", "0x565", "0x566", "0x567", "0x568", "0x569", "0x56A", "0x56B", "0x56C", "0x56D", "0x56E", "0x56F", "0x570", "0x571", "0x572", "0x573", "0x574", "0x575", "0x576", "0x577", "0x578", "0x579", "0x57A", "0x57B", "0x57C", "0x57D", "0x57E", "0x57F", "0x580", "0x581", "0x582", "0x583", "0x584", "0x585", "0x586", "0x587", "0x588", "0x589", "0x58A", "0x58B", "0x58C", "0x58D", "0x58E", "0x58F" ,"0x590", "0x591", "0x592", "0x593", "0x594", "0x595", "0x596", "0x597", "0x598", "0x599", "0x59A", "0x59B", "0x59C", "0x59D", "0x59E", "0x59F", "0x5A0", "0x5A1", "0x5A2", "0x5A3", "0x5A4", "0x5A5", "0x5A6", "0x5A7", "0x5A8", "0x5A9", "0x5AA", "0x5AB", "0x5AC", "0x5AD", "0x5AE", "0x5AF", "0x5B0", "0x5B1", "0x5B2", "0x5B3", "0x5B4", "0x5B5", "0x5B6", "0x5B7", "0x5B8", "0x5B9", "0x5BA", "0x5BB", "0x5BC", "0x5BD", "0x5BE", "0x5BF" ,"0x5C0", "0x5C1", "0x5C2", "0x5C3", "0x5C4", "0x5C5", "0x5C6", "0x5C7", "0x5C8", "0x5C9", "0x5CA", "0x5CB", "0x5CC", "0x5CD", "0x5CE", "0x5CF", "0x5D0", "0x5D1", "0x5D2", "0x5D3", "0x5D4", "0x5D5", "0x5D6", "0x5D7", "0x5D8", "0x5D9", "0x5DA", "0x5DB", "0x5DC", "0x5DD", "0x5DE", "0x5DF", "0x5E0", "0x5E1", "0x5E2", "0x5E3", "0x5E4", "0x5E5", "0x5E6", "0x5E7", "0x5E8", "0x5E9", "0x5EA", "0x5EB", "0x5EC", "0x5ED", "0x5EE", "0x5EF" ,"0x5F0", "0x5F1", "0x5F2", "0x5F3", "0x5F4", "0x5F5", "0x5F6", "0x5F7", "0x5F8", "0x5F9", "0x5FA", "0x5FB", "0x5FC", "0x5FD", "0x5FE", "0x5FF"
|
||||
#define CAN_ADDRESS_HEX_06XX = "0x600", "0x601", "0x602", "0x603", "0x604", "0x605", "0x606", "0x607", "0x608", "0x609", "0x60A", "0x60B", "0x60C", "0x60D", "0x60E", "0x60F", "0x610", "0x611", "0x612", "0x613", "0x614", "0x615", "0x616", "0x617", "0x618", "0x619", "0x61A", "0x61B", "0x61C", "0x61D", "0x61E", "0x61F", "0x620", "0x621", "0x622", "0x623", "0x624", "0x625", "0x626", "0x627", "0x628", "0x629", "0x62A", "0x62B", "0x62C", "0x62D", "0x62E", "0x62F", "0x630", "0x631", "0x632", "0x633", "0x634", "0x635", "0x636", "0x637", "0x638", "0x639", "0x63A", "0x63B", "0x63C", "0x63D", "0x63E", "0x63F", "0x640", "0x641", "0x642", "0x643", "0x644", "0x645", "0x646", "0x647", "0x648", "0x649", "0x64A", "0x64B", "0x64C", "0x64D", "0x64E", "0x64F", "0x650", "0x651", "0x652", "0x653", "0x654", "0x655", "0x656", "0x657", "0x658", "0x659", "0x65A", "0x65B", "0x65C", "0x65D", "0x65E", "0x65F" ,"0x660", "0x661", "0x662", "0x663", "0x664", "0x665", "0x666", "0x667", "0x668", "0x669", "0x66A", "0x66B", "0x66C", "0x66D", "0x66E", "0x66F", "0x670", "0x671", "0x672", "0x673", "0x674", "0x675", "0x676", "0x677", "0x678", "0x679", "0x67A", "0x67B", "0x67C", "0x67D", "0x67E", "0x67F", "0x680", "0x681", "0x682", "0x683", "0x684", "0x685", "0x686", "0x687", "0x688", "0x689", "0x68A", "0x68B", "0x68C", "0x68D", "0x68E", "0x68F" ,"0x690", "0x691", "0x692", "0x693", "0x694", "0x695", "0x696", "0x697", "0x698", "0x699", "0x69A", "0x69B", "0x69C", "0x69D", "0x69E", "0x69F", "0x6A0", "0x6A1", "0x6A2", "0x6A3", "0x6A4", "0x6A5", "0x6A6", "0x6A7", "0x6A8", "0x6A9", "0x6AA", "0x6AB", "0x6AC", "0x6AD", "0x6AE", "0x6AF", "0x6B0", "0x6B1", "0x6B2", "0x6B3", "0x6B4", "0x6B5", "0x6B6", "0x6B7", "0x6B8", "0x6B9", "0x6BA", "0x6BB", "0x6BC", "0x6BD", "0x6BE", "0x6BF" ,"0x6C0", "0x6C1", "0x6C2", "0x6C3", "0x6C4", "0x6C5", "0x6C6", "0x6C7", "0x6C8", "0x6C9", "0x6CA", "0x6CB", "0x6CC", "0x6CD", "0x6CE", "0x6CF", "0x6D0", "0x6D1", "0x6D2", "0x6D3", "0x6D4", "0x6D5", "0x6D6", "0x6D7", "0x6D8", "0x6D9", "0x6DA", "0x6DB", "0x6DC", "0x6DD", "0x6DE", "0x6DF", "0x6E0", "0x6E1", "0x6E2", "0x6E3", "0x6E4", "0x6E5", "0x6E6", "0x6E7", "0x6E8", "0x6E9", "0x6EA", "0x6EB", "0x6EC", "0x6ED", "0x6EE", "0x6EF" ,"0x6F0", "0x6F1", "0x6F2", "0x6F3", "0x6F4", "0x6F5", "0x6F6", "0x6F7", "0x6F8", "0x6F9", "0x6FA", "0x6FB", "0x6FC", "0x6FD", "0x6FE", "0x6FF"
|
||||
#define CAN_ADDRESS_HEX_07XX = "0x700", "0x701", "0x702", "0x703", "0x704", "0x705", "0x706", "0x707", "0x708", "0x709", "0x70A", "0x70B", "0x70C", "0x70D", "0x70E", "0x70F", "0x710", "0x711", "0x712", "0x713", "0x714", "0x715", "0x716", "0x717", "0x718", "0x719", "0x71A", "0x71B", "0x71C", "0x71D", "0x71E", "0x71F", "0x720", "0x721", "0x722", "0x723", "0x724", "0x725", "0x726", "0x727", "0x728", "0x729", "0x72A", "0x72B", "0x72C", "0x72D", "0x72E", "0x72F", "0x730", "0x731", "0x732", "0x733", "0x734", "0x735", "0x736", "0x737", "0x738", "0x739", "0x73A", "0x73B", "0x73C", "0x73D", "0x73E", "0x73F", "0x740", "0x741", "0x742", "0x743", "0x744", "0x745", "0x746", "0x747", "0x748", "0x749", "0x74A", "0x74B", "0x74C", "0x74D", "0x74E", "0x74F", "0x750", "0x751", "0x752", "0x753", "0x754", "0x755", "0x756", "0x757", "0x758", "0x759", "0x75A", "0x75B", "0x75C", "0x75D", "0x75E", "0x75F" ,"0x760", "0x761", "0x762", "0x763", "0x764", "0x765", "0x766", "0x767", "0x768", "0x769", "0x76A", "0x76B", "0x76C", "0x76D", "0x76E", "0x76F", "0x770", "0x771", "0x772", "0x773", "0x774", "0x775", "0x776", "0x777", "0x778", "0x779", "0x77A", "0x77B", "0x77C", "0x77D", "0x77E", "0x77F", "0x780", "0x781", "0x782", "0x783", "0x784", "0x785", "0x786", "0x787", "0x788", "0x789", "0x78A", "0x78B", "0x78C", "0x78D", "0x78E", "0x78F" ,"0x790", "0x791", "0x792", "0x793", "0x794", "0x795", "0x796", "0x797", "0x798", "0x799", "0x79A", "0x79B", "0x79C", "0x79D", "0x79E", "0x79F", "0x7A0", "0x7A1", "0x7A2", "0x7A3", "0x7A4", "0x7A5", "0x7A6", "0x7A7", "0x7A8", "0x7A9", "0x7AA", "0x7AB", "0x7AC", "0x7AD", "0x7AE", "0x7AF", "0x7B0", "0x7B1", "0x7B2", "0x7B3", "0x7B4", "0x7B5", "0x7B6", "0x7B7", "0x7B8", "0x7B9", "0x7BA", "0x7BB", "0x7BC", "0x7BD", "0x7BE", "0x7BF" ,"0x7C0", "0x7C1", "0x7C2", "0x7C3", "0x7C4", "0x7C5", "0x7C6", "0x7C7", "0x7C8", "0x7C9", "0x7CA", "0x7CB", "0x7CC", "0x7CD", "0x7CE", "0x7CF", "0x7D0", "0x7D1", "0x7D2", "0x7D3", "0x7D4", "0x7D5", "0x7D6", "0x7D7", "0x7D8", "0x7D9", "0x7DA", "0x7DB", "0x7DC", "0x7DD", "0x7DE", "0x7DF", "0x7E0", "0x7E1", "0x7E2", "0x7E3", "0x7E4", "0x7E5", "0x7E6", "0x7E7", "0x7E8", "0x7E9", "0x7EA", "0x7EB", "0x7EC", "0x7ED", "0x7EE", "0x7EF" ,"0x7F0", "0x7F1", "0x7F2", "0x7F3", "0x7F4", "0x7F5", "0x7F6", "0x7F7", "0x7F8", "0x7F9", "0x7FA", "0x7FB", "0x7FC", "0x7FD", "0x7FE", "0x7FF"
|
||||
#define CAN_ADDRESS_HEX = $CAN_ADDRESS_HEX_01XX, $CAN_ADDRESS_HEX_02XX, $CAN_ADDRESS_HEX_03XX, $CAN_ADDRESS_HEX_04XX, $CAN_ADDRESS_HEX_05XX, $CAN_ADDRESS_HEX_06XX, $CAN_ADDRESS_HEX_07XX, $CAN_ADDRESS_HEX_inv255
|
||||
#define CAN_ADDRESS_HEX = $CAN_ADDRESS_HEX_01XX, $CAN_ADDRESS_HEX_02XX, $CAN_ADDRESS_HEX_03XX, $CAN_ADDRESS_HEX_04XX, $CAN_ADDRESS_HEX_05XX, $CAN_ADDRESS_HEX_06XX, $CAN_ADDRESS_HEX_07XX, $invalid_x32768, $invalid_x16384, $invalid_x8192, $invalid_x4096, $invalid_x2048, $invalid_x256
|
||||
|
||||
;--------------------------------------------------
|
||||
;Start Page 1
|
||||
|
|
@ -922,39 +930,39 @@ page = 9
|
|||
caninput_sel15extsourceb = bits, U08, 16, [6:6], "Via Secondary Serial", "Via Internal CAN"
|
||||
caninput_sel15extsourcec = bits, U08, 16, [7:7], "INVALID", "Via Internal CAN"
|
||||
|
||||
caninput_source_can_address0 = bits, U16, 17, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address1 = bits, U16, 19, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address2 = bits, U16, 21, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address3 = bits, U16, 23, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address4 = bits, U16, 25, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address5 = bits, U16, 27, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address6 = bits, U16, 29, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address7 = bits, U16, 31, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address8 = bits, U16, 33, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address9 = bits, U16, 35, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address10 = bits, U16, 37, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address11 = bits, U16, 39, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address12 = bits, U16, 41, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address13 = bits, U16, 43, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address14 = bits, U16, 45, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address15 = bits, U16, 47, [0:10], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address0 = bits, U16, 17, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address1 = bits, U16, 19, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address2 = bits, U16, 21, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address3 = bits, U16, 23, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address4 = bits, U16, 25, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address5 = bits, U16, 27, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address6 = bits, U16, 29, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address7 = bits, U16, 31, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address8 = bits, U16, 33, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address9 = bits, U16, 35, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address10 = bits, U16, 37, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address11 = bits, U16, 39, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address12 = bits, U16, 41, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address13 = bits, U16, 43, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address14 = bits, U16, 45, [0:15], $CAN_ADDRESS_HEX
|
||||
caninput_source_can_address15 = bits, U16, 47, [0:15], $CAN_ADDRESS_HEX
|
||||
|
||||
caninput_source_start_byte0 = bits, U08, 49, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte1 = bits, U08, 50, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte2 = bits, U08, 51, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte3 = bits, U08, 52, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte4 = bits, U08, 53, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte5 = bits, U08, 54, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte6 = bits, U08, 55, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte7 = bits, U08, 56, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte8 = bits, U08, 57, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte9 = bits, U08, 58, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte10 = bits, U08, 59, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte11 = bits, U08, 60, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte12 = bits, U08, 61, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte13 = bits, U08, 62, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte14 = bits, U08, 63, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte15 = bits, U08, 64, [0:2], "0", "1", "2", "3", "4", "5", "6", "7"
|
||||
caninput_source_start_byte0 = scalar, U08, 49, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte1 = scalar, U08, 50, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte2 = scalar, U08, 51, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte3 = scalar, U08, 52, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte4 = scalar, U08, 53, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte5 = scalar, U08, 54, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte6 = scalar, U08, 55, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte7 = scalar, U08, 56, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte8 = scalar, U08, 57, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte9 = scalar, U08, 58, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte10 = scalar, U08, 59, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte11 = scalar, U08, 60, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte12 = scalar, U08, 61, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte13 = scalar, U08, 62, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte14 = scalar, U08, 63, "", 1, 0, 0, 7, 0
|
||||
caninput_source_start_byte15 = scalar, U08, 64, "", 1, 0, 0, 7, 0
|
||||
|
||||
caninput_source_num_bytes0 = bits, U16, 65, [0:0], "1", "2"
|
||||
caninput_source_num_bytes1 = bits, U16, 65, [1:1], "1", "2"
|
||||
|
|
@ -1009,9 +1017,9 @@ page = 9
|
|||
egoMAPMin = scalar, U08, 113, "kPa", 2.0, 0.0, 2.0, 511.0, 0
|
||||
|
||||
speeduino_tsCanId = bits, U08, 114, [0:3], $tsCanId_list
|
||||
true_address = bits, U16, 115, [0:10], $CAN_ADDRESS_HEX
|
||||
realtime_base_address = bits, U16, 117, [0:10], $CAN_ADDRESS_HEX
|
||||
obd_address = bits, U16, 119, [0:10], $CAN_ADDRESS_HEX
|
||||
true_address = bits, U16, 115, [0:15], $CAN_ADDRESS_HEX
|
||||
realtime_base_address = bits, U16, 117, [0:15], $CAN_ADDRESS_HEX
|
||||
obd_address = bits, U16, 119, [0:15], $CAN_ADDRESS_HEX
|
||||
|
||||
Auxin0pina = bits, U08, 121, [0:5], $ANALOG_PIN
|
||||
Auxin1pina = bits, U08, 122, [0:5], $ANALOG_PIN
|
||||
|
|
|
|||
Loading…
Reference in New Issue