hyper-tuner
/
ini
mirror of https://github.com/hyper-tuner/ini.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better string sanitization

This commit is contained in:
Piotr Rogowski 2021-09-27 20:41:25 +02:00
parent f0cffb2d04
commit d142f37114
No known key found for this signature in database
GPG Key ID: F40F61D5587F5673
8 changed files with 212 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ini.ts
View File

@ -1135,9 +1135,14 @@ export class INI {
.tryParse(line);
}
private static numberOrExpression = (val: string | undefined | null) => INI.isNumber(val || '0') ? Number(val || 0) : INI.sanitize(`${val}`);
private static numberOrExpression = (val: string | undefined | null) =>
INI.isNumber(val || '0') ? Number(val || 0) : INI.sanitize(`${val}`);
private static sanitize = (val: any) => val === undefined ? '' : `${val}`.replace(/"/g, '').trim();
private static sanitize = (val: any) =>
val === undefined ? '' : `${val}`
.replace(/"/g, '')
.replace(/\s+/g, ' ')
.trim();
private static isNumber = (val: any) => !Number.isNaN(Number(val));

2
test/data/json/202012.json
View File

File diff suppressed because one or more lines are too long

2
test/data/json/202103.json
View File

File diff suppressed because one or more lines are too long

2
test/data/json/202109-dev.json
View File

File diff suppressed because one or more lines are too long

122
test/data/yaml/202012.yml
View File

@ -7317,7 +7317,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -7359,7 +7359,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , ignAlgorithm) }'
units: '{ bitStringValue(algorithmUnits , ignAlgorithm) }'
scale: 2
transform: 0
min: 0
@ -8559,7 +8559,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -9735,7 +9735,7 @@ constants:
shape:
columns: 8
rows: 0
units: '{ bitStringValue(algorithmUnits , vvtLoadSource) }'
units: '{ bitStringValue(algorithmUnits , vvtLoadSource) }'
scale: 1
transform: 0
min: 0
@ -9774,7 +9774,7 @@ constants:
shape:
columns: 8
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -9816,7 +9816,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -9855,7 +9855,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -9894,7 +9894,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -9933,7 +9933,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -53201,7 +53201,7 @@ constants:
shape:
columns: 8
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -54064,7 +54064,7 @@ constants:
type: scalar
size: U16
offset: 123
units: '{ bitStringValue(fuel2SwitchUnits, fuel2SwitchVariable) }'
units: '{ bitStringValue(fuel2SwitchUnits, fuel2SwitchVariable) }'
scale: 1
transform: 0
min: 0
@ -54919,7 +54919,7 @@ constants:
type: scalar
size: U16
offset: 187
units: '{ bitStringValue(fuel2SwitchUnits, spark2SwitchVariable) }'
units: '{ bitStringValue(fuel2SwitchUnits, spark2SwitchVariable) }'
scale: 1
transform: 0
min: 0
@ -55066,7 +55066,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , fuel2Algorithm) }'
units: '{ bitStringValue(algorithmUnits , fuel2Algorithm) }'
scale: 2
transform: 0
min: 0
@ -58288,7 +58288,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , ignAlgorithm) }'
units: '{ bitStringValue(algorithmUnits , ignAlgorithm) }'
scale: 2
transform: 0
min: 0
@ -58472,7 +58472,7 @@ menus:
iacStep_curve:
title: Idle - Stepper Motor
page: 7
condition: '{ iacAlgorithm == 4 }'
condition: '{ iacAlgorithm == 4 }'
iacStepCrank_curve:
title: Idle - Stepper Motor Cranking
page: 7
@ -61607,224 +61607,224 @@ dialogs:
- name: _fieldText_
title: Source
- name: Auxin0pina
title: 'Local Analog Source 0 Pin No:'
title: 'Local Analog Source 0 Pin No:'
condition: >-
{(caninput_sel0a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel0b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin0pinb
title: 'Local Digital Source 0 Pin No:'
title: 'Local Digital Source 0 Pin No:'
condition: >-
{(caninput_sel0a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel0b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin1pina
title: 'Local Analog Source 1 Pin No:'
title: 'Local Analog Source 1 Pin No:'
condition: >-
{(caninput_sel1a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel1b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin1pinb
title: 'Local Digital Source 1 Pin No:'
title: 'Local Digital Source 1 Pin No:'
condition: >-
{(caninput_sel1a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel1b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin2pina
title: 'Local Analog Source 2 Pin No:'
title: 'Local Analog Source 2 Pin No:'
condition: >-
{(caninput_sel2a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel2b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin2pinb
title: 'Local Digital Source 2 Pin No:'
title: 'Local Digital Source 2 Pin No:'
condition: >-
{(caninput_sel2a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel2b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin3pina
title: 'Local Analog Source 3 Pin No:'
title: 'Local Analog Source 3 Pin No:'
condition: >-
{(caninput_sel3a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel3b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin3pinb
title: 'Local Digital Source 3 Pin No:'
title: 'Local Digital Source 3 Pin No:'
condition: >-
{(caninput_sel3a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel3b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin4pina
title: 'Local Analog Source 4 Pin No:'
title: 'Local Analog Source 4 Pin No:'
condition: >-
{(caninput_sel4a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel4b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin4pinb
title: 'Local Digital Source 4 Pin No:'
title: 'Local Digital Source 4 Pin No:'
condition: >-
{(caninput_sel4a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel4b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin5pina
title: 'Local Analog Source 5 Pin No:'
title: 'Local Analog Source 5 Pin No:'
condition: >-
{(caninput_sel5a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel5b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin5pinb
title: 'Local Digital Source 5 Pin No:'
title: 'Local Digital Source 5 Pin No:'
condition: >-
{(caninput_sel5a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel5b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin6pina
title: 'Local Analog Source 6 Pin No:'
title: 'Local Analog Source 6 Pin No:'
condition: >-
{(caninput_sel6a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel6b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin6pinb
title: 'Local Digital Source 6 Pin No:'
title: 'Local Digital Source 6 Pin No:'
condition: >-
{(caninput_sel6a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel6b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin7pina
title: 'Local Analog Source 7 Pin No:'
title: 'Local Analog Source 7 Pin No:'
condition: >-
{(caninput_sel7a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel7b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin7pinb
title: 'Local Digital Source 7 Pin No:'
title: 'Local Digital Source 7 Pin No:'
condition: >-
{(caninput_sel7a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel7b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin8pina
title: 'Local Analog Source 8 Pin No:'
title: 'Local Analog Source 8 Pin No:'
condition: >-
{(caninput_sel8a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel8b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin8pinb
title: 'Local Digital Source 8 Pin No:'
title: 'Local Digital Source 8 Pin No:'
condition: >-
{(caninput_sel8a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel8b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin9pina
title: 'Local Analog Source 9 Pin No:'
title: 'Local Analog Source 9 Pin No:'
condition: >-
{(caninput_sel9a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel9b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin9pinb
title: 'Local Digital Source 9 Pin No:'
title: 'Local Digital Source 9 Pin No:'
condition: >-
{(caninput_sel9a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel9b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin10pina
title: 'Local Analog Source 10 Pin No:'
title: 'Local Analog Source 10 Pin No:'
condition: >-
{(caninput_sel10a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel10b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin10pinb
title: 'Local Digital Source 10 Pin No:'
title: 'Local Digital Source 10 Pin No:'
condition: >-
{(caninput_sel10a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel10b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin11pina
title: 'Local Analog Source 11 Pin No:'
title: 'Local Analog Source 11 Pin No:'
condition: >-
{(caninput_sel11a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel11b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin11pinb
title: 'Local Digital Source 11 Pin No:'
title: 'Local Digital Source 11 Pin No:'
condition: >-
{(caninput_sel11a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel11b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin12pina
title: 'Local Analog Source 12 Pin No:'
title: 'Local Analog Source 12 Pin No:'
condition: >-
{(caninput_sel12a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel12b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin12pinb
title: 'Local Digital Source 12 Pin No:'
title: 'Local Digital Source 12 Pin No:'
condition: >-
{(caninput_sel12a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel12b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin13pina
title: 'Local Analog Source 13 Pin No:'
title: 'Local Analog Source 13 Pin No:'
condition: >-
{(caninput_sel13a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel13b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin13pinb
title: 'Local Digital Source 13 Pin No:'
title: 'Local Digital Source 13 Pin No:'
condition: >-
{(caninput_sel13a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel13b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin14pina
title: 'Local Analog Source 14 Pin No:'
title: 'Local Analog Source 14 Pin No:'
condition: >-
{(caninput_sel14a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel14b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin14pinb
title: 'Local Digital Source 14 Pin No:'
title: 'Local Digital Source 14 Pin No:'
condition: >-
{(caninput_sel14a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel14b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin15pina
title: 'Local Analog Source 15 Pin No:'
title: 'Local Analog Source 15 Pin No:'
condition: >-
{(caninput_sel15a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel15b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin15pinb
title: 'Local Digital Source 15 Pin No:'
title: 'Local Digital Source 15 Pin No:'
condition: >-
{(caninput_sel15a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel15b ==
@ -64272,7 +64272,7 @@ outputChannels:
type: scalar
size: U08
offset: 37
units: '{ bitStringValue( idleUnits , iacAlgorithm ) }'
units: '{ bitStringValue( idleUnits , iacAlgorithm ) }'
scale: >-
{ (iacAlgorithm == 2 || iacAlgorithm == 3 || iacAlgorithm == 6 ||
iacMaxSteps <= 255) ? 1.000 : 2.000 }
@ -64589,14 +64589,14 @@ outputChannels:
type: scalar
size: S16
offset: 85
units: '{ bitStringValue( algorithmUnits , algorithm ) }'
units: '{ bitStringValue( algorithmUnits , algorithm ) }'
scale: 1
transform: 0
ignLoad:
type: scalar
size: S16
offset: 87
units: '{ bitStringValue( algorithmUnits , ignAlgorithm ) }'
units: '{ bitStringValue( algorithmUnits , ignAlgorithm ) }'
scale: 1
transform: 0
dwell:
@ -64831,25 +64831,25 @@ outputChannels:
scale: 1
transform: 0
coolant:
value: '{ (coolantRaw - 40) * 1.8 + 32 }'
value: '{ (coolantRaw - 40) * 1.8 + 32 }'
iat:
value: '{ (iatRaw - 40) * 1.8 + 32 }'
value: '{ (iatRaw - 40) * 1.8 + 32 }'
fuelTemp:
value: '{ (fuelTempRaw - 40) * 1.8 + 32 }'
value: '{ (fuelTempRaw - 40) * 1.8 + 32 }'
time:
value: '{ timeNow }'
value: '{ timeNow }'
seconds:
value: '{ secl }'
value: '{ secl }'
throttle:
value: '{ tps }'
revolutionTime:
value: '{ rpm ? ( 60000.0 / rpm) : 0 }'
value: '{ rpm ? ( 60000.0 / rpm) : 0 }'
strokeMultipler:
value: '{ twoStroke == 1 ? 1 : 2 }'
value: '{ twoStroke == 1 ? 1 : 2 }'
cycleTime:
value: '{ revolutionTime * strokeMultipler }'
value: '{ revolutionTime * strokeMultipler }'
pulseLimit:
value: '{ cycleTime / nSquirts }'
value: '{ cycleTime / nSquirts }'
nFuelChannels:
value: '{ arrayValue( array.boardFuelOutputs, pinLayout ) }'
nIgnChannels:
@ -64859,9 +64859,9 @@ outputChannels:
sequentialIgnitionAvailable:
value: '{ nCylinders <= nIgnChannels }'
dutyCycle:
value: '{ rpm ? ( 100.0*pulseWidth/pulseLimit ) : 0 }'
value: '{ rpm ? ( 100.0*pulseWidth/pulseLimit ) : 0 }'
stgDutyCycle:
value: '{ rpm && stagingEnabled ? ( 100.0*pulseWidth3/pulseLimit ) : 0 }'
value: '{ rpm && stagingEnabled ? ( 100.0*pulseWidth3/pulseLimit ) : 0 }'
boostCutOut:
value: '{ boostCutFuel || boostCutSpark }'
lambda:

130
test/data/yaml/202103.yml
View File

@ -7393,7 +7393,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -7435,7 +7435,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , ignAlgorithm) }'
units: '{ bitStringValue(algorithmUnits , ignAlgorithm) }'
scale: 2
transform: 0
min: 0
@ -8517,7 +8517,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -9701,7 +9701,7 @@ constants:
shape:
columns: 8
rows: 0
units: '{ bitStringValue(algorithmUnits , vvtLoadSource) }'
units: '{ bitStringValue(algorithmUnits , vvtLoadSource) }'
scale: 1
transform: 0
min: 0
@ -9740,7 +9740,7 @@ constants:
shape:
columns: 8
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -9782,7 +9782,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -9821,7 +9821,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -9860,7 +9860,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -9899,7 +9899,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -9938,7 +9938,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -9977,7 +9977,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -10016,7 +10016,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -10055,7 +10055,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -53323,7 +53323,7 @@ constants:
shape:
columns: 8
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -54186,7 +54186,7 @@ constants:
type: scalar
size: U16
offset: 123
units: '{ bitStringValue(fuel2SwitchUnits, fuel2SwitchVariable) }'
units: '{ bitStringValue(fuel2SwitchUnits, fuel2SwitchVariable) }'
scale: 1
transform: 0
min: 0
@ -55041,7 +55041,7 @@ constants:
type: scalar
size: U16
offset: 187
units: '{ bitStringValue(fuel2SwitchUnits, spark2SwitchVariable) }'
units: '{ bitStringValue(fuel2SwitchUnits, spark2SwitchVariable) }'
scale: 1
transform: 0
min: 0
@ -55188,7 +55188,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , fuel2Algorithm) }'
units: '{ bitStringValue(algorithmUnits , fuel2Algorithm) }'
scale: 2
transform: 0
min: 0
@ -58449,7 +58449,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , ignAlgorithm) }'
units: '{ bitStringValue(algorithmUnits , ignAlgorithm) }'
scale: 2
transform: 0
min: 0
@ -58641,7 +58641,7 @@ menus:
iacStep_curve:
title: Idle - Stepper Motor
page: 7
condition: '{ iacAlgorithm == 4 }'
condition: '{ iacAlgorithm == 4 }'
iacStepCrank_curve:
title: Idle - Stepper Motor Cranking
page: 7
@ -61857,224 +61857,224 @@ dialogs:
- name: _fieldText_
title: Source
- name: Auxin0pina
title: 'Local Analog Source 0 Pin No:'
title: 'Local Analog Source 0 Pin No:'
condition: >-
{(caninput_sel0a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel0b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin0pinb
title: 'Local Digital Source 0 Pin No:'
title: 'Local Digital Source 0 Pin No:'
condition: >-
{(caninput_sel0a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel0b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin1pina
title: 'Local Analog Source 1 Pin No:'
title: 'Local Analog Source 1 Pin No:'
condition: >-
{(caninput_sel1a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel1b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin1pinb
title: 'Local Digital Source 1 Pin No:'
title: 'Local Digital Source 1 Pin No:'
condition: >-
{(caninput_sel1a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel1b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin2pina
title: 'Local Analog Source 2 Pin No:'
title: 'Local Analog Source 2 Pin No:'
condition: >-
{(caninput_sel2a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel2b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin2pinb
title: 'Local Digital Source 2 Pin No:'
title: 'Local Digital Source 2 Pin No:'
condition: >-
{(caninput_sel2a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel2b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin3pina
title: 'Local Analog Source 3 Pin No:'
title: 'Local Analog Source 3 Pin No:'
condition: >-
{(caninput_sel3a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel3b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin3pinb
title: 'Local Digital Source 3 Pin No:'
title: 'Local Digital Source 3 Pin No:'
condition: >-
{(caninput_sel3a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel3b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin4pina
title: 'Local Analog Source 4 Pin No:'
title: 'Local Analog Source 4 Pin No:'
condition: >-
{(caninput_sel4a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel4b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin4pinb
title: 'Local Digital Source 4 Pin No:'
title: 'Local Digital Source 4 Pin No:'
condition: >-
{(caninput_sel4a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel4b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin5pina
title: 'Local Analog Source 5 Pin No:'
title: 'Local Analog Source 5 Pin No:'
condition: >-
{(caninput_sel5a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel5b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin5pinb
title: 'Local Digital Source 5 Pin No:'
title: 'Local Digital Source 5 Pin No:'
condition: >-
{(caninput_sel5a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel5b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin6pina
title: 'Local Analog Source 6 Pin No:'
title: 'Local Analog Source 6 Pin No:'
condition: >-
{(caninput_sel6a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel6b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin6pinb
title: 'Local Digital Source 6 Pin No:'
title: 'Local Digital Source 6 Pin No:'
condition: >-
{(caninput_sel6a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel6b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin7pina
title: 'Local Analog Source 7 Pin No:'
title: 'Local Analog Source 7 Pin No:'
condition: >-
{(caninput_sel7a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel7b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin7pinb
title: 'Local Digital Source 7 Pin No:'
title: 'Local Digital Source 7 Pin No:'
condition: >-
{(caninput_sel7a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel7b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin8pina
title: 'Local Analog Source 8 Pin No:'
title: 'Local Analog Source 8 Pin No:'
condition: >-
{(caninput_sel8a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel8b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin8pinb
title: 'Local Digital Source 8 Pin No:'
title: 'Local Digital Source 8 Pin No:'
condition: >-
{(caninput_sel8a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel8b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin9pina
title: 'Local Analog Source 9 Pin No:'
title: 'Local Analog Source 9 Pin No:'
condition: >-
{(caninput_sel9a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel9b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin9pinb
title: 'Local Digital Source 9 Pin No:'
title: 'Local Digital Source 9 Pin No:'
condition: >-
{(caninput_sel9a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel9b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin10pina
title: 'Local Analog Source 10 Pin No:'
title: 'Local Analog Source 10 Pin No:'
condition: >-
{(caninput_sel10a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel10b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin10pinb
title: 'Local Digital Source 10 Pin No:'
title: 'Local Digital Source 10 Pin No:'
condition: >-
{(caninput_sel10a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel10b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin11pina
title: 'Local Analog Source 11 Pin No:'
title: 'Local Analog Source 11 Pin No:'
condition: >-
{(caninput_sel11a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel11b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin11pinb
title: 'Local Digital Source 11 Pin No:'
title: 'Local Digital Source 11 Pin No:'
condition: >-
{(caninput_sel11a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel11b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin12pina
title: 'Local Analog Source 12 Pin No:'
title: 'Local Analog Source 12 Pin No:'
condition: >-
{(caninput_sel12a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel12b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin12pinb
title: 'Local Digital Source 12 Pin No:'
title: 'Local Digital Source 12 Pin No:'
condition: >-
{(caninput_sel12a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel12b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin13pina
title: 'Local Analog Source 13 Pin No:'
title: 'Local Analog Source 13 Pin No:'
condition: >-
{(caninput_sel13a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel13b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin13pinb
title: 'Local Digital Source 13 Pin No:'
title: 'Local Digital Source 13 Pin No:'
condition: >-
{(caninput_sel13a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel13b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin14pina
title: 'Local Analog Source 14 Pin No:'
title: 'Local Analog Source 14 Pin No:'
condition: >-
{(caninput_sel14a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel14b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin14pinb
title: 'Local Digital Source 14 Pin No:'
title: 'Local Digital Source 14 Pin No:'
condition: >-
{(caninput_sel14a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel14b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin15pina
title: 'Local Analog Source 15 Pin No:'
title: 'Local Analog Source 15 Pin No:'
condition: >-
{(caninput_sel15a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel15b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin15pinb
title: 'Local Digital Source 15 Pin No:'
title: 'Local Digital Source 15 Pin No:'
condition: >-
{(caninput_sel15a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel15b ==
@ -64649,7 +64649,7 @@ outputChannels:
type: scalar
size: U08
offset: 37
units: '{ bitStringValue( idleUnits , iacAlgorithm ) }'
units: '{ bitStringValue( idleUnits , iacAlgorithm ) }'
scale: >-
{ (iacAlgorithm == 2 || iacAlgorithm == 3 || iacAlgorithm == 6 ||
iacMaxSteps <= 255) ? 1.000 : 2.000 }
@ -64966,14 +64966,14 @@ outputChannels:
type: scalar
size: S16
offset: 85
units: '{ bitStringValue( algorithmUnits , algorithm ) }'
units: '{ bitStringValue( algorithmUnits , algorithm ) }'
scale: 1
transform: 0
ignLoad:
type: scalar
size: S16
offset: 87
units: '{ bitStringValue( algorithmUnits , ignAlgorithm ) }'
units: '{ bitStringValue( algorithmUnits , ignAlgorithm ) }'
scale: 1
transform: 0
dwell:
@ -65208,25 +65208,25 @@ outputChannels:
scale: 1
transform: 0
coolant:
value: '{ (coolantRaw - 40) * 1.8 + 32 }'
value: '{ (coolantRaw - 40) * 1.8 + 32 }'
iat:
value: '{ (iatRaw - 40) * 1.8 + 32 }'
value: '{ (iatRaw - 40) * 1.8 + 32 }'
fuelTemp:
value: '{ (fuelTempRaw - 40) * 1.8 + 32 }'
value: '{ (fuelTempRaw - 40) * 1.8 + 32 }'
time:
value: '{ timeNow }'
value: '{ timeNow }'
seconds:
value: '{ secl }'
value: '{ secl }'
throttle:
value: '{ tps }'
revolutionTime:
value: '{ rpm ? ( 60000.0 / rpm) : 0 }'
value: '{ rpm ? ( 60000.0 / rpm) : 0 }'
strokeMultipler:
value: '{ twoStroke == 1 ? 1 : 2 }'
value: '{ twoStroke == 1 ? 1 : 2 }'
cycleTime:
value: '{ revolutionTime * strokeMultipler }'
value: '{ revolutionTime * strokeMultipler }'
pulseLimit:
value: '{ cycleTime / nSquirts }'
value: '{ cycleTime / nSquirts }'
nFuelChannels:
value: '{ arrayValue( array.boardFuelOutputs, pinLayout ) }'
nIgnChannels:
@ -65236,9 +65236,9 @@ outputChannels:
sequentialIgnitionAvailable:
value: '{ nCylinders <= nIgnChannels }'
dutyCycle:
value: '{ rpm ? ( 100.0*pulseWidth/pulseLimit ) : 0 }'
value: '{ rpm ? ( 100.0*pulseWidth/pulseLimit ) : 0 }'
stgDutyCycle:
value: '{ rpm && stagingEnabled ? ( 100.0*pulseWidth3/pulseLimit ) : 0 }'
value: '{ rpm && stagingEnabled ? ( 100.0*pulseWidth3/pulseLimit ) : 0 }'
boostCutOut:
value: '{ boostCutFuel || boostCutSpark }'
lambda:

144
test/data/yaml/202109-dev.yml
View File

@ -7892,7 +7892,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -7934,7 +7934,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , ignAlgorithm) }'
units: '{ bitStringValue(algorithmUnits , ignAlgorithm) }'
scale: 2
transform: 0
min: 0
@ -9071,7 +9071,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -10255,7 +10255,7 @@ constants:
shape:
columns: 8
rows: 0
units: '{ bitStringValue(algorithmUnits , vvtLoadSource) }'
units: '{ bitStringValue(algorithmUnits , vvtLoadSource) }'
scale: 1
transform: 0
min: 0
@ -10294,7 +10294,7 @@ constants:
shape:
columns: 8
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -10336,7 +10336,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -10375,7 +10375,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -10414,7 +10414,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -10453,7 +10453,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -10492,7 +10492,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -10531,7 +10531,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -10570,7 +10570,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -10609,7 +10609,7 @@ constants:
shape:
columns: 6
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -53785,7 +53785,7 @@ constants:
type: scalar
size: U08
offset: 156
units: '{ bitStringValue(boostByGearLabels , boostByGearEnabled) }'
units: '{ bitStringValue(boostByGearLabels , boostByGearEnabled) }'
scale: 2
transform: 0
min: 0
@ -53795,7 +53795,7 @@ constants:
type: scalar
size: U08
offset: 157
units: '{ bitStringValue(boostByGearLabels , boostByGearEnabled) }'
units: '{ bitStringValue(boostByGearLabels , boostByGearEnabled) }'
scale: 2
transform: 0
min: 0
@ -53805,7 +53805,7 @@ constants:
type: scalar
size: U08
offset: 158
units: '{ bitStringValue(boostByGearLabels , boostByGearEnabled) }'
units: '{ bitStringValue(boostByGearLabels , boostByGearEnabled) }'
scale: 2
transform: 0
min: 0
@ -53815,7 +53815,7 @@ constants:
type: scalar
size: U08
offset: 159
units: '{ bitStringValue(boostByGearLabels , boostByGearEnabled) }'
units: '{ bitStringValue(boostByGearLabels , boostByGearEnabled) }'
scale: 2
transform: 0
min: 0
@ -53825,7 +53825,7 @@ constants:
type: scalar
size: U08
offset: 160
units: '{ bitStringValue(boostByGearLabels , boostByGearEnabled) }'
units: '{ bitStringValue(boostByGearLabels , boostByGearEnabled) }'
scale: 2
transform: 0
min: 0
@ -53835,7 +53835,7 @@ constants:
type: scalar
size: U08
offset: 161
units: '{ bitStringValue(boostByGearLabels , boostByGearEnabled) }'
units: '{ bitStringValue(boostByGearLabels , boostByGearEnabled) }'
scale: 2
transform: 0
min: 0
@ -53959,7 +53959,7 @@ constants:
shape:
columns: 8
rows: 0
units: '{ bitStringValue(algorithmUnits , algorithm) }'
units: '{ bitStringValue(algorithmUnits , algorithm) }'
scale: 2
transform: 0
min: 0
@ -54822,7 +54822,7 @@ constants:
type: scalar
size: U16
offset: 123
units: '{ bitStringValue(fuel2SwitchUnits, fuel2SwitchVariable) }'
units: '{ bitStringValue(fuel2SwitchUnits, fuel2SwitchVariable) }'
scale: 1
transform: 0
min: 0
@ -55739,7 +55739,7 @@ constants:
type: scalar
size: U16
offset: 187
units: '{ bitStringValue(fuel2SwitchUnits, spark2SwitchVariable) }'
units: '{ bitStringValue(fuel2SwitchUnits, spark2SwitchVariable) }'
scale: 1
transform: 0
min: 0
@ -55886,7 +55886,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , fuel2Algorithm) }'
units: '{ bitStringValue(algorithmUnits , fuel2Algorithm) }'
scale: 2
transform: 0
min: 0
@ -55967,7 +55967,7 @@ constants:
shape:
columns: 8
rows: 0
units: '{ bitStringValue(algorithmUnits , vvtLoadSource) }'
units: '{ bitStringValue(algorithmUnits , vvtLoadSource) }'
scale: 1
transform: 0
min: 0
@ -61997,7 +61997,7 @@ constants:
shape:
columns: 16
rows: 0
units: '{ bitStringValue(algorithmUnits , spark2Algorithm) }'
units: '{ bitStringValue(algorithmUnits , spark2Algorithm) }'
scale: 2
transform: 0
min: 0
@ -62189,7 +62189,7 @@ menus:
iacStep_curve:
title: Idle - Stepper Motor
page: 7
condition: '{ iacAlgorithm == 4 }'
condition: '{ iacAlgorithm == 4 }'
iacStepCrank_curve:
title: Idle - Stepper Motor Cranking
page: 7
@ -65476,224 +65476,224 @@ dialogs:
- name: _fieldText_
title: Source
- name: Auxin0pina
title: 'Local Analog Source 0 Pin No:'
title: 'Local Analog Source 0 Pin No:'
condition: >-
{(caninput_sel0a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel0b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin0pinb
title: 'Local Digital Source 0 Pin No:'
title: 'Local Digital Source 0 Pin No:'
condition: >-
{(caninput_sel0a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel0b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin1pina
title: 'Local Analog Source 1 Pin No:'
title: 'Local Analog Source 1 Pin No:'
condition: >-
{(caninput_sel1a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel1b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin1pinb
title: 'Local Digital Source 1 Pin No:'
title: 'Local Digital Source 1 Pin No:'
condition: >-
{(caninput_sel1a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel1b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin2pina
title: 'Local Analog Source 2 Pin No:'
title: 'Local Analog Source 2 Pin No:'
condition: >-
{(caninput_sel2a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel2b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin2pinb
title: 'Local Digital Source 2 Pin No:'
title: 'Local Digital Source 2 Pin No:'
condition: >-
{(caninput_sel2a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel2b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin3pina
title: 'Local Analog Source 3 Pin No:'
title: 'Local Analog Source 3 Pin No:'
condition: >-
{(caninput_sel3a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel3b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin3pinb
title: 'Local Digital Source 3 Pin No:'
title: 'Local Digital Source 3 Pin No:'
condition: >-
{(caninput_sel3a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel3b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin4pina
title: 'Local Analog Source 4 Pin No:'
title: 'Local Analog Source 4 Pin No:'
condition: >-
{(caninput_sel4a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel4b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin4pinb
title: 'Local Digital Source 4 Pin No:'
title: 'Local Digital Source 4 Pin No:'
condition: >-
{(caninput_sel4a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel4b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin5pina
title: 'Local Analog Source 5 Pin No:'
title: 'Local Analog Source 5 Pin No:'
condition: >-
{(caninput_sel5a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel5b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin5pinb
title: 'Local Digital Source 5 Pin No:'
title: 'Local Digital Source 5 Pin No:'
condition: >-
{(caninput_sel5a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel5b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin6pina
title: 'Local Analog Source 6 Pin No:'
title: 'Local Analog Source 6 Pin No:'
condition: >-
{(caninput_sel6a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel6b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin6pinb
title: 'Local Digital Source 6 Pin No:'
title: 'Local Digital Source 6 Pin No:'
condition: >-
{(caninput_sel6a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel6b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin7pina
title: 'Local Analog Source 7 Pin No:'
title: 'Local Analog Source 7 Pin No:'
condition: >-
{(caninput_sel7a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel7b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin7pinb
title: 'Local Digital Source 7 Pin No:'
title: 'Local Digital Source 7 Pin No:'
condition: >-
{(caninput_sel7a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel7b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin8pina
title: 'Local Analog Source 8 Pin No:'
title: 'Local Analog Source 8 Pin No:'
condition: >-
{(caninput_sel8a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel8b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin8pinb
title: 'Local Digital Source 8 Pin No:'
title: 'Local Digital Source 8 Pin No:'
condition: >-
{(caninput_sel8a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel8b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin9pina
title: 'Local Analog Source 9 Pin No:'
title: 'Local Analog Source 9 Pin No:'
condition: >-
{(caninput_sel9a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel9b == 2
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin9pinb
title: 'Local Digital Source 9 Pin No:'
title: 'Local Digital Source 9 Pin No:'
condition: >-
{(caninput_sel9a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel9b == 3
&& (enable_secondarySerial || (enable_intcan && intcan_available == 1
)))}
- name: Auxin10pina
title: 'Local Analog Source 10 Pin No:'
title: 'Local Analog Source 10 Pin No:'
condition: >-
{(caninput_sel10a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel10b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin10pinb
title: 'Local Digital Source 10 Pin No:'
title: 'Local Digital Source 10 Pin No:'
condition: >-
{(caninput_sel10a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel10b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin11pina
title: 'Local Analog Source 11 Pin No:'
title: 'Local Analog Source 11 Pin No:'
condition: >-
{(caninput_sel11a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel11b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin11pinb
title: 'Local Digital Source 11 Pin No:'
title: 'Local Digital Source 11 Pin No:'
condition: >-
{(caninput_sel11a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel11b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin12pina
title: 'Local Analog Source 12 Pin No:'
title: 'Local Analog Source 12 Pin No:'
condition: >-
{(caninput_sel12a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel12b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin12pinb
title: 'Local Digital Source 12 Pin No:'
title: 'Local Digital Source 12 Pin No:'
condition: >-
{(caninput_sel12a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel12b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin13pina
title: 'Local Analog Source 13 Pin No:'
title: 'Local Analog Source 13 Pin No:'
condition: >-
{(caninput_sel13a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel13b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin13pinb
title: 'Local Digital Source 13 Pin No:'
title: 'Local Digital Source 13 Pin No:'
condition: >-
{(caninput_sel13a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel13b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin14pina
title: 'Local Analog Source 14 Pin No:'
title: 'Local Analog Source 14 Pin No:'
condition: >-
{(caninput_sel14a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel14b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin14pinb
title: 'Local Digital Source 14 Pin No:'
title: 'Local Digital Source 14 Pin No:'
condition: >-
{(caninput_sel14a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel14b ==
3 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin15pina
title: 'Local Analog Source 15 Pin No:'
title: 'Local Analog Source 15 Pin No:'
condition: >-
{(caninput_sel15a == 2 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel15b ==
2 && (enable_secondarySerial || (enable_intcan && intcan_available ==
1 )))}
- name: Auxin15pinb
title: 'Local Digital Source 15 Pin No:'
title: 'Local Digital Source 15 Pin No:'
condition: >-
{(caninput_sel15a == 3 && (!enable_secondarySerial && (!enable_intcan
|| (enable_intcan && intcan_available == 0)))) || (caninput_sel15b ==
@ -68114,7 +68114,7 @@ outputChannels:
type: scalar
size: U08
offset: 37
units: '{ bitStringValue( idleUnits , iacAlgorithm ) }'
units: '{ bitStringValue( idleUnits , iacAlgorithm ) }'
scale: >-
{ (iacAlgorithm == 2 || iacAlgorithm == 3 || iacAlgorithm == 6 ||
iacMaxSteps <= 255) ? 1.000 : 2.000 }
@ -68431,14 +68431,14 @@ outputChannels:
type: scalar
size: S16
offset: 85
units: '{ bitStringValue( algorithmUnits , algorithm ) }'
units: '{ bitStringValue( algorithmUnits , algorithm ) }'
scale: 1
transform: 0
ignLoad:
type: scalar
size: S16
offset: 87
units: '{ bitStringValue( algorithmUnits , ignAlgorithm ) }'
units: '{ bitStringValue( algorithmUnits , ignAlgorithm ) }'
scale: 1
transform: 0
dwell:
@ -68701,25 +68701,25 @@ outputChannels:
scale: 1
transform: 0
coolant:
value: '{ (coolantRaw - 40) * 1.8 + 32 }'
value: '{ (coolantRaw - 40) * 1.8 + 32 }'
iat:
value: '{ (iatRaw - 40) * 1.8 + 32 }'
value: '{ (iatRaw - 40) * 1.8 + 32 }'
fuelTemp:
value: '{ (fuelTempRaw - 40) * 1.8 + 32 }'
value: '{ (fuelTempRaw - 40) * 1.8 + 32 }'
time:
value: '{ timeNow }'
value: '{ timeNow }'
seconds:
value: '{ secl }'
value: '{ secl }'
throttle:
value: '{ tps }'
revolutionTime:
value: '{ rpm ? ( 60000.0 / rpm) : 0 }'
value: '{ rpm ? ( 60000.0 / rpm) : 0 }'
strokeMultipler:
value: '{ twoStroke == 1 ? 1 : 2 }'
value: '{ twoStroke == 1 ? 1 : 2 }'
cycleTime:
value: '{ revolutionTime * strokeMultipler }'
value: '{ revolutionTime * strokeMultipler }'
pulseLimit:
value: '{ cycleTime / nSquirts }'
value: '{ cycleTime / nSquirts }'
nFuelChannels:
value: '{ arrayValue( array.boardFuelOutputs, pinLayout ) }'
nIgnChannels:
@ -68729,9 +68729,9 @@ outputChannels:
sequentialIgnitionAvailable:
value: '{ nCylinders <= nIgnChannels }'
dutyCycle:
value: '{ rpm ? ( 100.0*pulseWidth/pulseLimit ) : 0 }'
value: '{ rpm ? ( 100.0*pulseWidth/pulseLimit ) : 0 }'
stgDutyCycle:
value: '{ rpm && stagingEnabled ? ( 100.0*pulseWidth3/pulseLimit ) : 0 }'
value: '{ rpm && stagingEnabled ? ( 100.0*pulseWidth3/pulseLimit ) : 0 }'
boostCutOut:
value: '{ boostCutFuel || boostCutSpark }'
lambda:

8
test/test.js
View File

@ -47,9 +47,9 @@ VERSIONS.forEach((version) => {
fs.writeFileSync(pathFor(`tmp/${version}.yml`), yamlContent);
fs.writeFileSync(pathFor(`tmp/${version}.json`), jsonContent);
assert.equal(yamlNew, yamlOld);
assert.equal(jsonNew, jsonOld);
assert.equal(yamlNew, yamlOld, `Generated file ${version}.yaml looks different than expected`);
assert.equal(jsonNew, jsonOld, `Generated file ${version}.json looks different than expected`);
fs.unlinkSync(pathFor(`tmp/${version}.yml`));
fs.unlinkSync(pathFor(`tmp/${version}.json`));
// fs.unlinkSync(pathFor(`tmp/${version}.yml`));
// fs.unlinkSync(pathFor(`tmp/${version}.json`));
});