Additional work for the new memory page

This commit is contained in:
Josh Stewart 2017-07-24 14:19:07 +10:00
parent 11294364bc
commit e16da51101
2 changed files with 26 additions and 7 deletions

View File

@ -97,14 +97,14 @@
;---------------------------------------------------------------------------- ;----------------------------------------------------------------------------
endianness = little endianness = little
nPages = 10 nPages = 11
burnCommand = "B" burnCommand = "B"
pageSize = 288, 64, 288, 64, 288, 64, 64, 160, 192, 128, 192 pageSize = 288, 64, 288, 64, 288, 64, 64, 160, 192, 128, 192
; pageIdentifier = "\$tsCanId\x01", "\$tsCanId\x02", "\$tsCanId\x03", "\$tsCanId\x04", "\$tsCanId\x05", "\$tsCanId\x06", "\$tsCanId\x07", "\$tsCanId\x08", "\$tsCanId\x09", "\$tsCanId\x0A" ; pageIdentifier = "\$tsCanId\x01", "\$tsCanId\x02", "\$tsCanId\x03", "\$tsCanId\x04", "\$tsCanId\x05", "\$tsCanId\x06", "\$tsCanId\x07", "\$tsCanId\x08", "\$tsCanId\x09", "\$tsCanId\x0A"
pageActivationDelay = 10 pageActivationDelay = 10
pageActivate = "P\001", "P\002", "P\003", "P\004", "P\005", "P\006", "P\007", "P\010", "P\011", "P\012" pageActivate = "P\001", "P\002", "P\003", "P\004", "P\005", "P\006", "P\007", "P\010", "P\011", "P\012", "P\013"
pageReadCommand = "V", "V", "V", "V", "V", "V", "V", "V", "V", "V" pageReadCommand = "V", "V", "V", "V", "V", "V", "V", "V", "V", "V", "V"
pageValueWrite = "W%2o%v", "W%o%v", "W%2o%v", "W%o%v", "W%2o%v", "W%o%v", "W%o%v", "W%o%v", "W%o%v", "W%o%v" pageValueWrite = "W%2o%v", "W%o%v", "W%2o%v", "W%o%v", "W%2o%v", "W%o%v", "W%o%v", "W%o%v", "W%o%v", "W%o%v", "W%o%v"
; pageChunkWrite = "" ; No chunk write for standard MS ; pageChunkWrite = "" ; No chunk write for standard MS
blockingFactor = 2048 blockingFactor = 2048
@ -692,6 +692,16 @@ page = 10
unused10_126 = scalar, U08, 126, "", 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 unused10_127 = scalar, U08, 127, "", 1, 0, 0, 255, 0
page = 11
#if CELSIUS
crankingEnrichBins = array, U08, 0, [4], "C", 1.0, -40, -40, 215, 0
#else
crankingEnrichBins = array, U08, 0, [4], "F", 1.8, -22.23, -40, 215, 0
#endif
crankingEnrichValues= array, U08, 4, [4], "%", 1.0, 0.0, 0, 255, 0 ; Values for the cranking enrichment curve
unused11_8_192 = array, U08, 8,[184], "RPM", 100.0, 0.0, 100, 25500, 0
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
[ConstantsExtensions] [ConstantsExtensions]
@ -1276,6 +1286,7 @@ menuDialog = main
field = "Priming Pulsewidth", primePulse field = "Priming Pulsewidth", primePulse
field = "" field = ""
field = "Cranking Enrichment %", crankingPct field = "Cranking Enrichment %", crankingPct
panel = cranking_enrich_curve
field = "" field = ""
field = "Cranking bypass", ignBypassEnable field = "Cranking bypass", ignBypassEnable
field = "Bypass output pin", ignBypassPin { ignBypassEnable } field = "Bypass output pin", ignBypassPin { ignBypassEnable }
@ -1815,8 +1826,6 @@ cmdtestspk450dc = "E\x03\x0C"
xBins = brvBins, batteryVoltage xBins = brvBins, batteryVoltage
yBins = injBatRates yBins = injBatRates
; Correction curve for Air Density vs temperature ; Correction curve for Air Density vs temperature
curve = airdensity_curve, "IAT density correction" curve = airdensity_curve, "IAT density correction"
columnLabel = "Air Temperature", "Fuel Amount" columnLabel = "Air Temperature", "Fuel Amount"
@ -1889,6 +1898,16 @@ cmdtestspk450dc = "E\x03\x0C"
yBins = wueRates yBins = wueRates
gauge = cltGauge gauge = cltGauge
; Cranking enrichment curve
curve = cranking_enrich_curve, "Cranking Enrichment Curve"
;topicHelp = "file://$getProjectsDirPath()/docs/xxx.pdf#wue"
columnLabel = "Coolant", "Enrich %"
xAxis = -40, 150, 9
yAxis = 0, 240, 6
xBins = crankingEnrichBins, coolant
yBins = crankingEnrichValues
gauge = cltGauge
; Warmup enrichment VEAL AFR adjustment curve (Not currently working) ; Warmup enrichment VEAL AFR adjustment curve (Not currently working)
;curve = warmup_afr_curve, "AFR Target Temperature Adustment" ;curve = warmup_afr_curve, "AFR Target Temperature Adustment"
; columnLabel = "Coolant Temp", "AFR Offset %" ; columnLabel = "Coolant Temp", "AFR Offset %"

View File

@ -108,7 +108,7 @@ const char TSfirmwareVersion[] = "Speeduino 2016.09";
const byte data_structure_version = 2; //This identifies the data structure when reading / writing. const byte data_structure_version = 2; //This identifies the data structure when reading / writing.
const byte page_size = 64; const byte page_size = 64;
const int npage_size[11] = {0,288,64,288,64,288,64,64,160,192,128}; const int npage_size[12] = {0,288,64,288,64,288,64,64,160,192,128,192};
//const byte page11_size = 128; //const byte page11_size = 128;
#define MAP_PAGE_SIZE 288 #define MAP_PAGE_SIZE 288