diff --git a/reference/speeduino.ini b/reference/speeduino.ini index 9c75e57c..c3fff000 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -524,163 +524,119 @@ page = 9 ;CANBUS control (Page 10) ;-------------------------------------------------- page = 10 -<<<<<<< HEAD - enable_candata_in = bits, U08, 0, [0:0], "Off", "On" - caninput_sel1 = bits, U08, 1, [0:0], "Off", "On" - caninput_sel2 = bits, U08, 2, [0:0], "Off", "On" - caninput_sel3 = bits, U08, 3, [0:0], "Off", "On" - caninput_sel4 = bits, U08, 4, [0:0], "Off", "On" - caninput_sel5 = bits, U08, 5, [0:0], "Off", "On" - caninput_sel6 = bits, U08, 6, [0:0], "Off", "On" - caninput_sel7 = bits, U08, 7, [0:0], "Off", "On" - caninput_sel8 = bits, U08, 8, [0:0], "Off", "On" - caninput_param_group = array , U16, 9, [ 8], "", 1, 0, 0, 65535, 0 - caninput_param_start_byte1 = bits, U08, 25, [0:2], "1", "2", "3", "4", "5", "6", "7", "8" + enable_candata_in = bits, U08, 0, [0:0], "Off", "On" + caninput_sel1 = bits, U08, 1, [0:0], "Off", "On" + caninput_sel2 = bits, U08, 2, [0:0], "Off", "On" + caninput_sel3 = bits, U08, 3, [0:0], "Off", "On" + caninput_sel4 = bits, U08, 4, [0:0], "Off", "On" + caninput_sel5 = bits, U08, 5, [0:0], "Off", "On" + caninput_sel6 = bits, U08, 6, [0:0], "Off", "On" + caninput_sel7 = bits, U08, 7, [0:0], "Off", "On" + caninput_sel8 = bits, U08, 8, [0:0], "Off", "On" + caninput_param_group = array , U16, 9, [ 8], "", 1, 0, 0, 65535, 0 + caninput_param_start_byte1 = bits, U08, 25, [0:2], "1", "2", "3", "4", "5", "6", "7", "8" caninput_param_start_byte2 = bits, U08, 26, [0:2], "1", "2", "3", "4", "5", "6", "7", "8" caninput_param_start_byte3 = bits, U08, 27, [0:2], "1", "2", "3", "4", "5", "6", "7", "8" caninput_param_start_byte4 = bits, U08, 28, [0:2], "1", "2", "3", "4", "5", "6", "7", "8" caninput_param_start_byte5 = bits, U08, 29, [0:2], "1", "2", "3", "4", "5", "6", "7", "8" caninput_param_start_byte6 = bits, U08, 30, [0:2], "1", "2", "3", "4", "5", "6", "7", "8" - caninput_param_start_byte7 = bits, U08, 31, [0:2], "1", "2", "3", "4", "5", "6", "7", "8" - caninput_param_start_byte8 = bits, U08, 32, [0:2], "1", "2", "3", "4", "5", "6", "7", "8" - caninput_param_num_bytes1 = bits, U08, 33, [0:1], "INVALID", "1", "2", "INVALID" + caninput_param_start_byte7 = bits, U08, 31, [0:2], "1", "2", "3", "4", "5", "6", "7", "8" + caninput_param_start_byte8 = bits, U08, 32, [0:2], "1", "2", "3", "4", "5", "6", "7", "8" + caninput_param_num_bytes1 = bits, U08, 33, [0:1], "INVALID", "1", "2", "INVALID" caninput_param_num_bytes2 = bits, U08, 34, [0:1], "INVALID", "1", "2", "INVALID" caninput_param_num_bytes3 = bits, U08, 35, [0:1], "INVALID", "1", "2", "INVALID" caninput_param_num_bytes4 = bits, U08, 36, [0:1], "INVALID", "1", "2", "INVALID" caninput_param_num_bytes5 = bits, U08, 37, [0:1], "INVALID", "1", "2", "INVALID" caninput_param_num_bytes6 = bits, U08, 38, [0:1], "INVALID", "1", "2", "INVALID" - caninput_param_num_bytes7 = bits, U08, 39, [0:1], "INVALID", "1", "2", "INVALID" - caninput_param_num_bytes8 = bits, U08, 40, [0:1], "INVALID", "1", "2", "INVALID" -======= - unused10_0 = scalar, U08, 0, "", 1, 0, 0, 255, 0 - unused10_1 = scalar, U08, 1, "", 1, 0, 0, 255, 0 - unused10_2 = scalar, U08, 2, "", 1, 0, 0, 255, 0 - unused10_3 = scalar, U08, 3, "", 1, 0, 0, 255, 0 - unused10_4 = scalar, U08, 4, "", 1, 0, 0, 255, 0 - unused10_5 = scalar, U08, 5, "", 1, 0, 0, 255, 0 - unused10_6 = scalar, U08, 6, "", 1, 0, 0, 255, 0 - unused10_7 = scalar, U08, 7, "", 1, 0, 0, 255, 0 - unused10_8 = scalar, U08, 8, "", 1, 0, 0, 255, 0 - unused10_9 = scalar, U08, 9, "", 1, 0, 0, 255, 0 - unused10_10 = scalar, U08, 10, "", 1, 0, 0, 255, 0 - unused10_11 = scalar, U08, 11, "", 1, 0, 0, 255, 0 - unused10_12 = scalar, U08, 12, "", 1, 0, 0, 255, 0 - unused10_13 = scalar, U08, 13, "", 1, 0, 0, 255, 0 - unused10_14 = scalar, U08, 14, "", 1, 0, 0, 255, 0 - unused10_15 = scalar, U08, 15, "", 1, 0, 0, 255, 0 - unused10_16 = scalar, U08, 16, "", 1, 0, 0, 255, 0 - unused10_17 = scalar, U08, 17, "", 1, 0, 0, 255, 0 - unused10_18 = scalar, U08, 18, "", 1, 0, 0, 255, 0 - unused10_19 = scalar, U08, 19, "", 1, 0, 0, 255, 0 - unused10_20 = scalar, U08, 20, "", 1, 0, 0, 255, 0 - unused10_21 = scalar, U08, 21, "", 1, 0, 0, 255, 0 - unused10_22 = scalar, U08, 22, "", 1, 0, 0, 255, 0 - unused10_23 = scalar, U08, 23, "", 1, 0, 0, 255, 0 - unused10_24 = scalar, U08, 24, "", 1, 0, 0, 255, 0 - unused10_25 = scalar, U08, 25, "", 1, 0, 0, 255, 0 - unused10_26 = scalar, U08, 26, "", 1, 0, 0, 255, 0 - unused10_27 = scalar, U08, 27, "", 1, 0, 0, 255, 0 - unused10_28 = scalar, U08, 28, "", 1, 0, 0, 255, 0 - unused10_29 = scalar, U08, 29, "", 1, 0, 0, 255, 0 - unused10_30 = scalar, U08, 30, "", 1, 0, 0, 255, 0 - unused10_31 = scalar, U08, 31, "", 1, 0, 0, 255, 0 - unused10_32 = scalar, U08, 32, "", 1, 0, 0, 255, 0 - unused10_33 = scalar, U08, 33, "", 1, 0, 0, 255, 0 - unused10_34 = scalar, U08, 34, "", 1, 0, 0, 255, 0 - unused10_35 = scalar, U08, 35, "", 1, 0, 0, 255, 0 - unused10_36 = scalar, U08, 36, "", 1, 0, 0, 255, 0 - unused10_37 = scalar, U08, 37, "", 1, 0, 0, 255, 0 - unused10_38 = scalar, U08, 38, "", 1, 0, 0, 255, 0 - unused10_39 = scalar, U08, 39, "", 1, 0, 0, 255, 0 - unused10_40 = scalar, U08, 40, "", 1, 0, 0, 255, 0 ->>>>>>> master - unused10_41 = scalar, U08, 41, "", 1, 0, 0, 255, 0 - unused10_42 = scalar, U08, 42, "", 1, 0, 0, 255, 0 - unused10_43 = scalar, U08, 43, "", 1, 0, 0, 255, 0 - unused10_44 = scalar, U08, 44, "", 1, 0, 0, 255, 0 - unused10_45 = scalar, U08, 45, "", 1, 0, 0, 255, 0 - unused10_46 = scalar, U08, 46, "", 1, 0, 0, 255, 0 - unused10_47 = scalar, U08, 47, "", 1, 0, 0, 255, 0 - unused10_48 = scalar, U08, 48, "", 1, 0, 0, 255, 0 - unused10_49 = scalar, U08, 49, "", 1, 0, 0, 255, 0 - enable_candata_out = bits, U08, 50, [0:0], "Off", "On" - unused10_51 = scalar, U08, 51, "", 1, 0, 0, 255, 0 - unused10_52 = scalar, U08, 52, "", 1, 0, 0, 255, 0 - unused10_53 = scalar, U08, 53, "", 1, 0, 0, 255, 0 - unused10_54 = scalar, U08, 54, "", 1, 0, 0, 255, 0 - unused10_55 = scalar, U08, 55, "", 1, 0, 0, 255, 0 - unused10_56 = scalar, U08, 56, "", 1, 0, 0, 255, 0 - unused10_57 = scalar, U08, 57, "", 1, 0, 0, 255, 0 - unused10_58 = scalar, U08, 58, "", 1, 0, 0, 255, 0 - unused10_59 = scalar, U08, 59, "", 1, 0, 0, 255, 0 - unused10_60 = scalar, U08, 60, "", 1, 0, 0, 255, 0 - unused10_61 = scalar, U08, 61, "", 1, 0, 0, 255, 0 - unused10_62 = scalar, U08, 62, "", 1, 0, 0, 255, 0 - unused10_63 = scalar, U08, 63, "", 1, 0, 0, 255, 0 - unused10_64 = scalar, U08, 64, "", 1, 0, 0, 255, 0 - unused10_65 = scalar, U08, 65, "", 1, 0, 0, 255, 0 - unused10_66 = scalar, U08, 66, "", 1, 0, 0, 255, 0 - unused10_67 = scalar, U08, 67, "", 1, 0, 0, 255, 0 - unused10_68 = scalar, U08, 68, "", 1, 0, 0, 255, 0 - unused10_69 = scalar, U08, 69, "", 1, 0, 0, 255, 0 - unused10_70 = scalar, U08, 70, "", 1, 0, 0, 255, 0 - unused10_71 = scalar, U08, 71, "", 1, 0, 0, 255, 0 - unused10_72 = scalar, U08, 72, "", 1, 0, 0, 255, 0 - unused10_73 = scalar, U08, 73, "", 1, 0, 0, 255, 0 - unused10_74 = scalar, U08, 74, "", 1, 0, 0, 255, 0 - unused10_75 = scalar, U08, 75, "", 1, 0, 0, 255, 0 - unused10_76 = scalar, U08, 76, "", 1, 0, 0, 255, 0 - unused10_77 = scalar, U08, 77, "", 1, 0, 0, 255, 0 - unused10_78 = scalar, U08, 78, "", 1, 0, 0, 255, 0 - unused10_79 = scalar, U08, 79, "", 1, 0, 0, 255, 0 - unused10_80 = scalar, U08, 80, "", 1, 0, 0, 255, 0 - unused10_81 = scalar, U08, 81, "", 1, 0, 0, 255, 0 - unused10_82 = scalar, U08, 82, "", 1, 0, 0, 255, 0 - unused10_83 = scalar, U08, 83, "", 1, 0, 0, 255, 0 - unused10_84 = scalar, U08, 84, "", 1, 0, 0, 255, 0 - unused10_85 = scalar, U08, 85, "", 1, 0, 0, 255, 0 - unused10_86 = scalar, U08, 86, "", 1, 0, 0, 255, 0 - unused10_87 = scalar, U08, 87, "", 1, 0, 0, 255, 0 - unused10_88 = scalar, U08, 88, "", 1, 0, 0, 255, 0 - unused10_89 = scalar, U08, 89, "", 1, 0, 0, 255, 0 - unused10_90 = scalar, U08, 90, "", 1, 0, 0, 255, 0 - unused10_91 = scalar, U08, 91, "", 1, 0, 0, 255, 0 - unused10_92 = scalar, U08, 92, "", 1, 0, 0, 255, 0 - unused10_93 = scalar, U08, 93, "", 1, 0, 0, 255, 0 - unused10_94 = scalar, U08, 94, "", 1, 0, 0, 255, 0 - unused10_95 = scalar, U08, 95, "", 1, 0, 0, 255, 0 - unused10_96 = scalar, U08, 96, "", 1, 0, 0, 255, 0 - 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 - unused10_100 = scalar, U08, 100, "", 1, 0, 0, 255, 0 - unused10_101 = scalar, U08, 101, "", 1, 0, 0, 255, 0 - unused10_102 = scalar, U08, 102, "", 1, 0, 0, 255, 0 - unused10_103 = scalar, U08, 103, "", 1, 0, 0, 255, 0 - unused10_104 = scalar, U08, 104, "", 1, 0, 0, 255, 0 - unused10_105 = scalar, U08, 105, "", 1, 0, 0, 255, 0 - unused10_106 = scalar, U08, 106, "", 1, 0, 0, 255, 0 - unused10_107 = scalar, U08, 107, "", 1, 0, 0, 255, 0 - unused10_108 = scalar, U08, 108, "", 1, 0, 0, 255, 0 - unused10_109 = scalar, U08, 109, "", 1, 0, 0, 255, 0 - unused10_110 = scalar, U08, 110, "", 1, 0, 0, 255, 0 - unused10_111 = scalar, U08, 111, "", 1, 0, 0, 255, 0 - unused10_112 = scalar, U08, 112, "", 1, 0, 0, 255, 0 - unused10_113 = scalar, U08, 113, "", 1, 0, 0, 255, 0 - unused10_114 = scalar, U08, 114, "", 1, 0, 0, 255, 0 - unused10_115 = scalar, U08, 115, "", 1, 0, 0, 255, 0 - unused10_116 = scalar, U08, 116, "", 1, 0, 0, 255, 0 - unused10_117 = scalar, U08, 117, "", 1, 0, 0, 255, 0 - unused10_118 = scalar, U08, 118, "", 1, 0, 0, 255, 0 - unused10_119 = scalar, U08, 119, "", 1, 0, 0, 255, 0 - unused10_120 = scalar, U08, 120, "", 1, 0, 0, 255, 0 - unused10_121 = scalar, U08, 121, "", 1, 0, 0, 255, 0 - unused10_122 = scalar, U08, 122, "", 1, 0, 0, 255, 0 - unused10_123 = scalar, U08, 123, "", 1, 0, 0, 255, 0 - unused10_124 = scalar, U08, 124, "", 1, 0, 0, 255, 0 - unused10_125 = scalar, U08, 125, "", 1, 0, 0, 255, 0 - unused10_126 = scalar, U08, 126, "", 1, 0, 0, 255, 0 - unused10_127 = scalar, U08, 127, "", 1, 0, 0, 255, 0 + caninput_param_num_bytes7 = bits, U08, 39, [0:1], "INVALID", "1", "2", "INVALID" + caninput_param_num_bytes8 = bits, U08, 40, [0:1], "INVALID", "1", "2", "INVALID" + unused10_41 = scalar, U08, 41, "", 1, 0, 0, 255, 0 + unused10_42 = scalar, U08, 42, "", 1, 0, 0, 255, 0 + unused10_43 = scalar, U08, 43, "", 1, 0, 0, 255, 0 + unused10_44 = scalar, U08, 44, "", 1, 0, 0, 255, 0 + unused10_45 = scalar, U08, 45, "", 1, 0, 0, 255, 0 + unused10_46 = scalar, U08, 46, "", 1, 0, 0, 255, 0 + unused10_47 = scalar, U08, 47, "", 1, 0, 0, 255, 0 + unused10_48 = scalar, U08, 48, "", 1, 0, 0, 255, 0 + unused10_49 = scalar, U08, 49, "", 1, 0, 0, 255, 0 + enable_candata_out = bits, U08, 50, [0:0], "Off", "On" + unused10_51 = scalar, U08, 51, "", 1, 0, 0, 255, 0 + unused10_52 = scalar, U08, 52, "", 1, 0, 0, 255, 0 + unused10_53 = scalar, U08, 53, "", 1, 0, 0, 255, 0 + unused10_54 = scalar, U08, 54, "", 1, 0, 0, 255, 0 + unused10_55 = scalar, U08, 55, "", 1, 0, 0, 255, 0 + unused10_56 = scalar, U08, 56, "", 1, 0, 0, 255, 0 + unused10_57 = scalar, U08, 57, "", 1, 0, 0, 255, 0 + unused10_58 = scalar, U08, 58, "", 1, 0, 0, 255, 0 + unused10_59 = scalar, U08, 59, "", 1, 0, 0, 255, 0 + unused10_60 = scalar, U08, 60, "", 1, 0, 0, 255, 0 + unused10_61 = scalar, U08, 61, "", 1, 0, 0, 255, 0 + unused10_62 = scalar, U08, 62, "", 1, 0, 0, 255, 0 + unused10_63 = scalar, U08, 63, "", 1, 0, 0, 255, 0 + unused10_64 = scalar, U08, 64, "", 1, 0, 0, 255, 0 + unused10_65 = scalar, U08, 65, "", 1, 0, 0, 255, 0 + unused10_66 = scalar, U08, 66, "", 1, 0, 0, 255, 0 + unused10_67 = scalar, U08, 67, "", 1, 0, 0, 255, 0 + unused10_68 = scalar, U08, 68, "", 1, 0, 0, 255, 0 + unused10_69 = scalar, U08, 69, "", 1, 0, 0, 255, 0 + unused10_70 = scalar, U08, 70, "", 1, 0, 0, 255, 0 + unused10_71 = scalar, U08, 71, "", 1, 0, 0, 255, 0 + unused10_72 = scalar, U08, 72, "", 1, 0, 0, 255, 0 + unused10_73 = scalar, U08, 73, "", 1, 0, 0, 255, 0 + unused10_74 = scalar, U08, 74, "", 1, 0, 0, 255, 0 + unused10_75 = scalar, U08, 75, "", 1, 0, 0, 255, 0 + unused10_76 = scalar, U08, 76, "", 1, 0, 0, 255, 0 + unused10_77 = scalar, U08, 77, "", 1, 0, 0, 255, 0 + unused10_78 = scalar, U08, 78, "", 1, 0, 0, 255, 0 + unused10_79 = scalar, U08, 79, "", 1, 0, 0, 255, 0 + unused10_80 = scalar, U08, 80, "", 1, 0, 0, 255, 0 + unused10_81 = scalar, U08, 81, "", 1, 0, 0, 255, 0 + unused10_82 = scalar, U08, 82, "", 1, 0, 0, 255, 0 + unused10_83 = scalar, U08, 83, "", 1, 0, 0, 255, 0 + unused10_84 = scalar, U08, 84, "", 1, 0, 0, 255, 0 + unused10_85 = scalar, U08, 85, "", 1, 0, 0, 255, 0 + unused10_86 = scalar, U08, 86, "", 1, 0, 0, 255, 0 + unused10_87 = scalar, U08, 87, "", 1, 0, 0, 255, 0 + unused10_88 = scalar, U08, 88, "", 1, 0, 0, 255, 0 + unused10_89 = scalar, U08, 89, "", 1, 0, 0, 255, 0 + unused10_90 = scalar, U08, 90, "", 1, 0, 0, 255, 0 + unused10_91 = scalar, U08, 91, "", 1, 0, 0, 255, 0 + unused10_92 = scalar, U08, 92, "", 1, 0, 0, 255, 0 + unused10_93 = scalar, U08, 93, "", 1, 0, 0, 255, 0 + unused10_94 = scalar, U08, 94, "", 1, 0, 0, 255, 0 + unused10_95 = scalar, U08, 95, "", 1, 0, 0, 255, 0 + unused10_96 = scalar, U08, 96, "", 1, 0, 0, 255, 0 + 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 + unused10_100 = scalar, U08, 100, "", 1, 0, 0, 255, 0 + unused10_101 = scalar, U08, 101, "", 1, 0, 0, 255, 0 + unused10_102 = scalar, U08, 102, "", 1, 0, 0, 255, 0 + unused10_103 = scalar, U08, 103, "", 1, 0, 0, 255, 0 + unused10_104 = scalar, U08, 104, "", 1, 0, 0, 255, 0 + unused10_105 = scalar, U08, 105, "", 1, 0, 0, 255, 0 + unused10_106 = scalar, U08, 106, "", 1, 0, 0, 255, 0 + unused10_107 = scalar, U08, 107, "", 1, 0, 0, 255, 0 + unused10_108 = scalar, U08, 108, "", 1, 0, 0, 255, 0 + unused10_109 = scalar, U08, 109, "", 1, 0, 0, 255, 0 + unused10_110 = scalar, U08, 110, "", 1, 0, 0, 255, 0 + unused10_111 = scalar, U08, 111, "", 1, 0, 0, 255, 0 + unused10_112 = scalar, U08, 112, "", 1, 0, 0, 255, 0 + unused10_113 = scalar, U08, 113, "", 1, 0, 0, 255, 0 + unused10_114 = scalar, U08, 114, "", 1, 0, 0, 255, 0 + unused10_115 = scalar, U08, 115, "", 1, 0, 0, 255, 0 + unused10_116 = scalar, U08, 116, "", 1, 0, 0, 255, 0 + unused10_117 = scalar, U08, 117, "", 1, 0, 0, 255, 0 + unused10_118 = scalar, U08, 118, "", 1, 0, 0, 255, 0 + unused10_119 = scalar, U08, 119, "", 1, 0, 0, 255, 0 + unused10_120 = scalar, U08, 120, "", 1, 0, 0, 255, 0 + unused10_121 = scalar, U08, 121, "", 1, 0, 0, 255, 0 + unused10_122 = scalar, U08, 122, "", 1, 0, 0, 255, 0 + unused10_123 = scalar, U08, 123, "", 1, 0, 0, 255, 0 + unused10_124 = scalar, U08, 124, "", 1, 0, 0, 255, 0 + unused10_125 = scalar, U08, 125, "", 1, 0, 0, 255, 0 + unused10_126 = scalar, U08, 126, "", 1, 0, 0, 255, 0 + unused10_127 = scalar, U08, 127, "", 1, 0, 0, 255, 0 ;------------------------------------------------------------------------------- @@ -840,23 +796,17 @@ menuDialog = main subMenu = vvtTbl, "VVT duty cycle", 8, { vvtEnabled } subMenu = std_separator subMenu = tacho, "Tacho Output" + subMenu = std_separator -<<<<<<< HEAD - subMenu = canIO, "Serial3 IO Interface" + + subMenu = canIO, "Serial3 IO Interface" #if CAN_COMMANDS subMenu = std_separator - subMenu = Canin_config, "Canbus Input Configuration" - subMenu = std_separator - ;subMenu = Canout_config, "Canbus Output Configuration" - #endif - - -======= - subMenu = canIO, "Canbus Interface" + subMenu = Canin_config, "Canbus Input Configuration" + ;subMenu = std_separator + ;subMenu = Canout_config, "Canbus Output Configuration" + #endif - - ->>>>>>> master menuDialog = main menu = "T&ools" subMenu = mapCal, "Calibrate MAP" @@ -984,7 +934,7 @@ menuDialog = main caninput_param_num_bytes3 = "The number of bytes the specific data is made from starting at selected start byte number" caninput_param_num_bytes4 = "The number of bytes the specific data is made from starting at selected start byte number" caninput_param_num_bytes5 = "The number of bytes the specific data is made from starting at selected start byte number" - caninput_param_num_bytes6 = "The number of bytes the specific data is made from starting at selected start byte number" + caninput_param_num_bytes6 = "The number of bytes the specific data is made from starting at selected start byte number" caninput_param_num_bytes7 = "The number of bytes the specific data is made from starting at selected start byte number" caninput_param_num_bytes8 = "The number of bytes the specific data is made from starting at selected start byte number" @@ -1387,7 +1337,7 @@ menuDialog = main dialog = enableoutputtestbuttons, "Enable Test Controls", xAxis ;commandButton = "Label Text", command, { Enabled Condition }, optionalFlags - ; The rem > 0 expression is just for testing.. It works when the MS is on the Stim with rpm. + ; The rem > 0 expression is just for testing.. It works when the arduino is on the Stim with rpm. ; a status bit there would be the expected real expression commandButton = "Enable Test Mode", cmdEnableTestMode,{!testenabled & !testactive } @@ -1452,7 +1402,7 @@ menuDialog = main panel = outputtest_spark ;panel = outputtest_io2 panel = outputtest_warningmessage - + dialog = caninput_sel, "" ;CAN inputs field = "CAN Input Channel on/off" @@ -1475,7 +1425,7 @@ menuDialog = main field = "", caninput_param_group[5], { caninput_sel6 && enable_candata_in } field = "", caninput_param_group[6], { caninput_sel7 && enable_candata_in } field = "", caninput_param_group[7], { caninput_sel8 && enable_candata_in } - + dialog = caninput_parameter_start_byte, "", yAxis field = "Input Parameter Start Byte" field = "", caninput_param_start_byte1, { caninput_sel1 && enable_candata_in } @@ -1485,8 +1435,8 @@ menuDialog = main field = "", caninput_param_start_byte5, { caninput_sel5 && enable_candata_in } field = "", caninput_param_start_byte6, { caninput_sel6 && enable_candata_in } field = "", caninput_param_start_byte7, { caninput_sel7 && enable_candata_in } - field = "", caninput_param_start_byte8, { caninput_sel8 && enable_candata_in } - + field = "", caninput_param_start_byte8, { caninput_sel8 && enable_candata_in } + dialog = caninput_parameter_num_byte, "", yAxis field = "Input Parameter Number of Bytes" field = "", caninput_param_num_bytes1, { caninput_sel1 && enable_candata_in } @@ -1497,10 +1447,10 @@ menuDialog = main field = "", caninput_param_num_bytes6, { caninput_sel6 && enable_candata_in } field = "", caninput_param_num_bytes7, { caninput_sel7 && enable_candata_in } field = "", caninput_param_num_bytes8, { caninput_sel8 && enable_candata_in } - + dialog = caninconfig_blank1,"" field = "" - + dialog = Canin_config1, "", xAxis panel = caninput_sel panel = caninconfig_blank1 @@ -1509,18 +1459,18 @@ menuDialog = main panel = caninput_parameter_start_byte panel = caninconfig_blank1 panel = caninput_parameter_num_byte - + dialog = Canin_config2, "CAN Data Input" - field = "Enable CanBus data input", enable_candata_in - + field = "Enable CanBus data input", enable_candata_in + dialog = Canin_config, "", border topicHelp = "file://$getProjectsDirPath()/Docs/speeduino_canbus.txt" panel = Canin_config2, North panel = Canin_config1, South - + dialog = Canout_config, "Can Data Out" - field = "Enable CanBus data Output", enable_candata_out - + field = "Enable CanBus data Output", enable_candata_out + ;------------------------------------------------------------------------------- ; General help text @@ -1668,7 +1618,7 @@ cmdtestspk450dc = "E\x03\x0C" ; Warmup enrichment curve curve = warmup_curve, "Warmup Enrichment (WUE) Curve" - ;topicHelp = "file://$getProjectsDirPath()/docs/Megasquirt3_TunerStudio_MS_Lite_Reference-1.3.pdf#wue" + ;topicHelp = "file://$getProjectsDirPath()/docs/xxx.pdf#wue" columnLabel = "Coolant", "WUE %" xAxis = -40, 210, 9 yAxis = 0, 240, 6 @@ -1865,7 +1815,7 @@ cmdtestspk450dc = "E\x03\x0C" advanceGauge = advance, "Spark Advance", "deg BTDC", 50, -10, 0, 0, 35, 45, 0, 0 flexGauge = flex, "Flex sensor", "%", 0, 100, -1, -1, 999, 999, 0, 0 - #if CAN_COMMANDS + #if CAN_COMMANDS gaugeCategory = "CanBus Inputs" 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 @@ -1875,8 +1825,8 @@ cmdtestspk450dc = "E\x03\x0C" 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 -#endif - +#endif + gaugeCategory = "Other" clockGauge = secl, "Clock", "Seconds", 0, 255, 10, 10, 245, 245, 0, 0 deadGauge = deadValue, "---", "", 0, 1, -1, -1, 2, 2, 0, 0 @@ -2003,15 +1953,8 @@ cmdtestspk450dc = "E\x03\x0C" deadValue = { 0 } ; Convenient unchanging value. -<<<<<<< HEAD - ochGetCommand = "A" - ochBlockSize = 57 -======= - ;ochGetCommand = "A" ochGetCommand = "r\$tsCanId\x07%2o%2c" - ochBlockSize = 41 ->>>>>>> master - + ochBlockSize = 57 secl = scalar, U08, 0, "sec", 1.000, 0.000 squirt = scalar, U08, 1, "bits", 1.000, 0.000 @@ -2076,18 +2019,18 @@ cmdtestspk450dc = "E\x03\x0C" boostTarget = scalar, U08, 37, "kPa", 2.000, 0.000 boostDuty = scalar, U08, 38, "%", 1.000, 0.000 idleLoad = scalar, U08, 39, { bitStringValue( idleUnits , iacAlgorithm ) }, 2.000, 0.000 ; This is a combined variable covering both PWM and stepper IACs. The units used depend on which idle algorithm is chosen - testoutputs = scalar, U08, 40, "bits", 1.000, 0.000 - testenabled = bits, U08, 40, [0:0] - testactive = bits, U08, 40, [1:1] - canin_gauge1 = scalar, U16, 41, "", 1.000, 0.000 - canin_gauge2 = scalar, U16, 43, "", 1.000, 0.000 - canin_gauge3 = scalar, U16, 45, "", 1.000, 0.000 - canin_gauge4 = scalar, U16, 47, "", 1.000, 0.000 - canin_gauge5 = scalar, U16, 49, "", 1.000, 0.000 - canin_gauge6 = scalar, U16, 51, "", 1.000, 0.000 - canin_gauge7 = scalar, U16, 53, "", 1.000, 0.000 - canin_gauge8 = scalar, U16, 55, "", 1.000, 0.000 - + testoutputs = scalar, U08, 40, "bits", 1.000, 0.000 + testenabled = bits, U08, 40, [0:0] + testactive = bits, U08, 40, [1:1] + canin_gauge1 = scalar, U16, 41, "", 1.000, 0.000 + canin_gauge2 = scalar, U16, 43, "", 1.000, 0.000 + canin_gauge3 = scalar, U16, 45, "", 1.000, 0.000 + canin_gauge4 = scalar, U16, 47, "", 1.000, 0.000 + canin_gauge5 = scalar, U16, 49, "", 1.000, 0.000 + canin_gauge6 = scalar, U16, 51, "", 1.000, 0.000 + canin_gauge7 = scalar, U16, 53, "", 1.000, 0.000 + canin_gauge8 = scalar, U16, 55, "", 1.000, 0.000 + ; Computed output channels. See "megatuneExamples.ini" for all the ; pre-defined variables, search for "???" and you'll see them. @@ -2201,7 +2144,7 @@ cmdtestspk450dc = "E\x03\x0C" entry = boostDuty, "Boost Duty", int, "%d", { boostEnabled } entry = boostCutOut , "Boost cut", int, "%d" entry = idleLoad, "IAC value", int, "%d" -<<<<<<< HEAD + entry = canin_gauge1, "CanIn CH1", int, "%d" entry = canin_gauge2, "CanIn CH2", int, "%d" entry = canin_gauge3, "CanIn CH3", int, "%d" @@ -2210,11 +2153,7 @@ cmdtestspk450dc = "E\x03\x0C" entry = canin_gauge6, "CanIn CH6", int, "%d" entry = canin_gauge7, "CanIn CH7", int, "%d" entry = canin_gauge8, "CanIn CH8", int, "%d" - -======= ->>>>>>> master - ; Indicators [LoggerDefinition] ; valid logger types: composite, tooth, trigger, csv diff --git a/speeduino/comms.ino b/speeduino/comms.ino index 70a2a157..5c3016be 100644 --- a/speeduino/comms.ino +++ b/speeduino/comms.ino @@ -299,36 +299,6 @@ void sendValues(uint16_t offset, uint16_t packetLength, byte portNum) fullStatus[30] = currentStatus.O2_2; //O2 //rpmDOT must be sent as a signed integer -<<<<<<< HEAD - response[31] = lowByte(currentStatus.rpmDOT); - response[32] = highByte(currentStatus.rpmDOT); - - response[33] = currentStatus.ethanolPct; //Flex sensor value (or 0 if not used) - response[34] = currentStatus.flexCorrection; //Flex fuel correction (% above or below 100) - response[35] = currentStatus.flexIgnCorrection; //Ignition correction (Increased degrees of advance) for flex fuel - response[36] = getNextError(); - response[37] = currentStatus.boostTarget; - response[38] = currentStatus.boostDuty; - response[39] = currentStatus.idleLoad; - response[40] = currentStatus.testOutputs; - response[41] = lowByte(currentStatus.canin[0]); - response[42] = highByte(currentStatus.canin[0]); - response[43] = lowByte(currentStatus.canin[1]); - response[44] = highByte(currentStatus.canin[1]); - response[45] = lowByte(currentStatus.canin[2]); - response[46] = highByte(currentStatus.canin[2]); - response[47] = lowByte(currentStatus.canin[3]); - response[48] = highByte(currentStatus.canin[3]); - response[49] = lowByte(currentStatus.canin[4]); - response[50] = highByte(currentStatus.canin[4]); - response[51] = lowByte(currentStatus.canin[5]); - response[52] = highByte(currentStatus.canin[5]); - response[53] = lowByte(currentStatus.canin[6]); - response[54] = highByte(currentStatus.canin[6]); - response[55] = lowByte(currentStatus.canin[7]); - response[56] = highByte(currentStatus.canin[7]); - -======= fullStatus[31] = lowByte(currentStatus.rpmDOT); fullStatus[32] = highByte(currentStatus.rpmDOT); @@ -340,13 +310,28 @@ void sendValues(uint16_t offset, uint16_t packetLength, byte portNum) fullStatus[38] = currentStatus.boostDuty; fullStatus[39] = currentStatus.idleLoad; fullStatus[40] = currentStatus.testOutputs; + fullStatus[41] = lowByte(currentStatus.canin[0]); + fullStatus[42] = highByte(currentStatus.canin[0]); + fullStatus[43] = lowByte(currentStatus.canin[1]); + fullStatus[44] = highByte(currentStatus.canin[1]); + fullStatus[45] = lowByte(currentStatus.canin[2]); + fullStatus[46] = highByte(currentStatus.canin[2]); + fullStatus[47] = lowByte(currentStatus.canin[3]); + fullStatus[48] = highByte(currentStatus.canin[3]); + fullStatus[49] = lowByte(currentStatus.canin[4]); + fullStatus[50] = highByte(currentStatus.canin[4]); + fullStatus[51] = lowByte(currentStatus.canin[5]); + fullStatus[52] = highByte(currentStatus.canin[5]); + fullStatus[53] = lowByte(currentStatus.canin[6]); + fullStatus[54] = highByte(currentStatus.canin[6]); + fullStatus[55] = lowByte(currentStatus.canin[7]); + fullStatus[56] = highByte(currentStatus.canin[7]); for(byte x=0; x>>>>>> master //cli(); if (portNum == 0) { Serial.write(response, (size_t)packetLength); } #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) //ATmega2561 does not have Serial3