From ff766c3293d6c1cd13a37cd5e90abb07ca6bb950 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Jan 2019 07:55:04 -0500 Subject: [PATCH] changed memory location --- reference/speeduino.ini | 10 ++++++---- speeduino/auxiliaries.ino | 2 +- speeduino/globals.h | 11 +++++------ 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/reference/speeduino.ini b/reference/speeduino.ini index 02274a87..8861a390 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -304,7 +304,11 @@ page = 2 baroMax = scalar, U16, 65, "kpa", 1.0, 0.0, 0.0, 25500, 0 EMAPMin = scalar, S08, 67, "kpa", 1.0, 0.0, -100, 127.0, 0 EMAPMax = scalar, U16, 68, "kpa", 1.0, 0.0, 0.0, 25500, 0 - unused2-67 = array, U08, 70, [57], "%", 1.0, 0.0, 0.0, 255, 0 + + fanWhenOff = bits, U08, 70, [0:0], "No", "Yes" + unused_fan_bits = bits, U08, 70,[1:7] + + unused2-67 = array, U08, 71, [56], "%", 1.0, 0.0, 0.0, 255, 0 ;-------------------------------------------------- @@ -546,9 +550,7 @@ page = 6 #else fanPWMBins = array, U08, 124, [4], "F", 1.8, -22.23, -40, 215, 0 #endif - fanWhenOff = bits, U08, 128, [0:0], "No", "Yes" - unused_fan_bits = bits, U08, 128,[1:7] - unused6_129_135 = array, U08, 129,[7] + ;-------------------------------------------------- ;Boost and vvt maps (Page 7) ;-------------------------------------------------- diff --git a/speeduino/auxiliaries.ino b/speeduino/auxiliaries.ino index d1fcb3e7..2b48c08e 100644 --- a/speeduino/auxiliaries.ino +++ b/speeduino/auxiliaries.ino @@ -34,7 +34,7 @@ void fanControl() int offTemp = onTemp - configPage6.fanHyster; bool fanPermit = false; - if ( configPage6.fanWhenOff ) { fanPermit = true; } + if ( configPage2.fanWhenOff ) { fanPermit = true; } else { fanPermit = BIT_CHECK(currentStatus.engine, BIT_ENGINE_RUN); } if ( currentStatus.coolant >= onTemp && fanPermit ) diff --git a/speeduino/globals.h b/speeduino/globals.h index 88e9c90b..156957b1 100644 --- a/speeduino/globals.h +++ b/speeduino/globals.h @@ -522,7 +522,11 @@ struct config2 { int8_t EMAPMin; //Must be signed uint16_t EMAPMax; - byte unused1_70[58]; + + byte fanWhenOff : 1; // Only run fan when engine is running + byte fanUnused : 7; + + byte unused1_70[57]; #if defined(CORE_AVR) }; @@ -693,11 +697,6 @@ struct config6 { byte fanFreq; // Fan PWM frequency byte fanPWMBins[4]; //Temperature Bins for the PWM fan control - byte fanWhenOff : 1; // Only run fan when engine is running - byte fanUnused : 7; - - byte unused6_129_135[7]; - #if defined(CORE_AVR) }; #else