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

Merge branch 'master' of https://github.com/noisymime/speeduino

This commit is contained in:
Josh Stewart 2020-03-12 11:44:38 +11:00
parent 9249c63ac9 743129b21c
commit 0948abe77a
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
reference/speeduino.ini
View File

@ -3630,15 +3630,22 @@ cmdtestspk450dc = "E\x03\x0C"
entry = vvtTarget, "VVT Target Angle", int, "%d", { vvtMode == 2 } ;;Only show when using close loop vvt
entry = vvtDuty, "VVT Duty", int, "%d", { vvtEnabled > 0 }
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"
entry = auxin_gauge0, { stringValue(AUXin00Alias)}, int, "%d", {(caninput_sel0b != 0)}
entry = auxin_gauge1, { stringValue(AUXin01Alias)}, int, "%d", { (caninput_sel1b != 0)}
entry = auxin_gauge2, { stringValue(AUXin02Alias)}, int, "%d", { (caninput_sel2b != 0)}
entry = auxin_gauge3, { stringValue(AUXin03Alias)}, int, "%d", { (caninput_sel3b != 0)}
entry = auxin_gauge4, { stringValue(AUXin04Alias)}, int, "%d", { (caninput_sel4b != 0)}
entry = auxin_gauge5, { stringValue(AUXin05Alias)}, int, "%d", { (caninput_sel5b != 0)}
entry = auxin_gauge6, { stringValue(AUXin06Alias)}, int, "%d", { (caninput_sel6b != 0)}
entry = auxin_gauge7, { stringValue(AUXin07Alias)}, int, "%d", { (caninput_sel7b != 0)}
entry = auxin_gauge8, { stringValue(AUXin08Alias)}, int, "%d", { (caninput_sel8b != 0)}
entry = auxin_gauge9, { stringValue(AUXin09Alias)}, int, "%d", { (caninput_sel9b != 0)}
entry = auxin_gauge10, { stringValue(AUXin10Alias)}, int, "%d", { (caninput_sel10b != 0)}
entry = auxin_gauge11, { stringValue(AUXin11Alias)}, int, "%d", { (caninput_sel11b != 0)}
entry = auxin_gauge12, { stringValue(AUXin12Alias)}, int, "%d", { (caninput_sel12b != 0)}
entry = auxin_gauge13, { stringValue(AUXin13Alias)}, int, "%d", { (caninput_sel13b != 0)}
entry = auxin_gauge14, { stringValue(AUXin14Alias)}, int, "%d", { (caninput_sel14b != 0)}
entry = auxin_gauge15, { stringValue(AUXin15Alias)}, int, "%d", { (caninput_sel15b != 0)}
[LoggerDefinition]
; valid logger types: composite, tooth, trigger, csv

3
speeduino/timers.ino
View File

@ -62,6 +62,9 @@ void oneMSInterval() //Most ARM chips can simply call a function
if(ignitionSchedule3.Status == RUNNING) { if( (ignitionSchedule3.startTime < targetOverdwellTime) && (configPage4.useDwellLim) && (isCrankLocked != true) ) { ign3EndFunction(); ignitionSchedule3.Status = OFF; } }
if(ignitionSchedule4.Status == RUNNING) { if( (ignitionSchedule4.startTime < targetOverdwellTime) && (configPage4.useDwellLim) && (isCrankLocked != true) ) { ign4EndFunction(); ignitionSchedule4.Status = OFF; } }
if(ignitionSchedule5.Status == RUNNING) { if( (ignitionSchedule5.startTime < targetOverdwellTime) && (configPage4.useDwellLim) && (isCrankLocked != true) ) { ign5EndFunction(); ignitionSchedule5.Status = OFF; } }
if(ignitionSchedule6.Status == RUNNING) { if( (ignitionSchedule6.startTime < targetOverdwellTime) && (configPage4.useDwellLim) && (isCrankLocked != true) ) { ign6EndFunction(); ignitionSchedule6.Status = OFF; } }
if(ignitionSchedule7.Status == RUNNING) { if( (ignitionSchedule7.startTime < targetOverdwellTime) && (configPage4.useDwellLim) && (isCrankLocked != true) ) { ign7EndFunction(); ignitionSchedule7.Status = OFF; } }
if(ignitionSchedule8.Status == RUNNING) { if( (ignitionSchedule8.startTime < targetOverdwellTime) && (configPage4.useDwellLim) && (isCrankLocked != true) ) { ign8EndFunction(); ignitionSchedule8.Status = OFF; } }
//Tacho output check
//Tacho is flagged as being ready for a pulse by the ignition outputs.