Resolve all pr/77 conflicts
This commit is contained in:
Josh Stewart
parent
3f099f06f1
commit
fa9f418c35
|
|
@ -524,7 +524,6 @@ 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"
|
||||
|
|
@ -551,49 +550,6 @@ page = 10
|
|||
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
|
||||
|
|
@ -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"
|
||||
#if CAN_COMMANDS
|
||||
subMenu = std_separator
|
||||
subMenu = Canin_config, "Canbus Input Configuration"
|
||||
subMenu = std_separator
|
||||
;subMenu = std_separator
|
||||
;subMenu = Canout_config, "Canbus Output Configuration"
|
||||
#endif
|
||||
|
||||
|
||||
=======
|
||||
subMenu = canIO, "Canbus Interface"
|
||||
|
||||
|
||||
|
||||
>>>>>>> master
|
||||
menuDialog = main
|
||||
menu = "T&ools"
|
||||
subMenu = mapCal, "Calibrate MAP"
|
||||
|
|
@ -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 }
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
|
|
@ -2211,10 +2154,6 @@ cmdtestspk450dc = "E\x03\x0C"
|
|||
entry = canin_gauge7, "CanIn CH7", int, "%d"
|
||||
entry = canin_gauge8, "CanIn CH8", int, "%d"
|
||||
|
||||
=======
|
||||
|
||||
>>>>>>> master
|
||||
; Indicators
|
||||
|
||||
[LoggerDefinition]
|
||||
; valid logger types: composite, tooth, trigger, csv
|
||||
|
|
|
|||
|
|
@ -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<packetLength; x++)
|
||||
{
|
||||
response[x] = fullStatus[offset+x];
|
||||
}
|
||||
|
||||
>>>>>>> master
|
||||
//cli();
|
||||
if (portNum == 0) { Serial.write(response, (size_t)packetLength); }
|
||||
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) //ATmega2561 does not have Serial3
|
||||
|
|
|
|||
Loading…
Reference in New Issue