From ea1a625c000d002e2bbc5ca9c7ddb2c3ab2382cd Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Mon, 28 Sep 2015 12:29:20 +1000 Subject: [PATCH] Missed file from last commit --- auxiliaries.ino | 6 +++--- speeduino.ino | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/auxiliaries.ino b/auxiliaries.ino index 54535719..ddc6e0a6 100644 --- a/auxiliaries.ino +++ b/auxiliaries.ino @@ -24,9 +24,9 @@ void initialiseAuxPWM() { TCCR1B = 0x00; //Disbale Timer1 while we set it up TCNT1 = 0; //Reset Timer Count - TIFR1 = 0x00; //Timer3 INT Flag Reg: Clear Timer Overflow Flag - TCCR1A = 0x00; //Timer3 Control Reg A: Wave Gen Mode normal - TCCR1B = (1 << CS12); //Timer3 Control Reg B: Timer Prescaler set to 256. 1 tick = 16uS. Refer to http://www.instructables.com/files/orig/F3T/TIKL/H3WSA4V7/F3TTIKLH3WSA4V7.jpg + TIFR1 = 0x00; //Timer1 INT Flag Reg: Clear Timer Overflow Flag + TCCR1A = 0x00; //Timer1 Control Reg A: Wave Gen Mode normal (Simply counts up from 0 to 65535 (16-bit int) + TCCR1B = (1 << CS12); //Timer1 Control Reg B: Timer Prescaler set to 256. 1 tick = 16uS. Refer to http://www.instructables.com/files/orig/F3T/TIKL/H3WSA4V7/F3TTIKLH3WSA4V7.jpg boost_pin_port = portOutputRegister(digitalPinToPort(pinBoost)); boost_pin_mask = digitalPinToBitMask(pinBoost); diff --git a/speeduino.ino b/speeduino.ino index 0e2ad15f..56675f0a 100644 --- a/speeduino.ino +++ b/speeduino.ino @@ -177,7 +177,8 @@ void setup() initialiseTimers(); initialiseDisplay(); initialiseIdle(); - initialiseFan(); + initialiseFan(); + initialiseAuxPWM(); //Once the configs have been loaded, a number of one time calculations can be completed req_fuel_uS = configPage1.reqFuel * 100; //Convert to uS and an int. This is the only variable to be used in calculations