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

New idle PWM system

This commit is contained in:
Josh Stewart 2015-09-26 10:12:59 +10:00
parent a4c2a71508
commit 5a49c155e5
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
idle.h
View File

@ -23,4 +23,11 @@ struct StepperIdle idleStepper;
bool idleOn; //Simply tracks whether idle was on last time around
unsigned int iacStepTime;
volatile byte *idle_pin_port;
volatile byte idle_pin_mask;
volatile bool idle_pwm_state;
unsigned int idle_pwm_max_count; //Used for variable PWM frequency
unsigned int idle_pwm_cur_value;
void initialiseIdle();

31
idle.ino
View File

@ -5,7 +5,7 @@ A full copy of the license may be found in the projects root directory
*/
/*
These functions over the PWM and stepper idle control
These functions cover the PWM and stepper idle control
*/
/*
@ -39,6 +39,11 @@ void initialiseIdle()
iacCrankDutyTable.xSize = 4;
iacCrankDutyTable.values = configPage4.iacCrankDuty;
iacCrankDutyTable.axisX = configPage4.iacCrankBins;
idle_pin_port = portOutputRegister(digitalPinToPort(pinIdle1));
idle_pin_mask = digitalPinToBitMask(pinIdle1);
idle_pwm_max_count = 512; //Timer3 ticks every 16us. 16 * 512 = 8192uS. 1000000/8192 = 122Hz
TIMSK3 |= (1 << OCIE3A); //Turn on the A compare unit (ie turn on the interrupt)
break;
case 3:
@ -107,13 +112,13 @@ void idleControl()
if( BIT_CHECK(currentStatus.engine, BIT_ENGINE_CRANK) )
{
//Currently cranking. Use the cranking table
analogWrite(pinIdle1, table2D_getValue(&iacCrankDutyTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET)); //All temps are offset by 40 degrees
idle_pwm_cur_value = table2D_getValue(&iacCrankDutyTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET) * 2; //All temps are offset by 40 degrees
idleOn = true;
}
else if( (currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET) < iacPWMTable.values[IDLE_TABLE_SIZE-1])
else if( currentStatus.coolant < (iacPWMTable.values[IDLE_TABLE_SIZE-1] + CALIBRATION_TEMPERATURE_OFFSET))
{
//Standard running
analogWrite(pinIdle1, table2D_getValue(&iacPWMTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET)); //All temps are offset by 40 degrees
idle_pwm_cur_value = table2D_getValue(&iacPWMTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET) * 2; //All temps are offset by 40 degrees
idleOn = true;
}
else if (idleOn) { digitalWrite(pinIdle1, LOW); idleOn = false; }
@ -200,3 +205,21 @@ void homeStepper()
idleStepper.targetIdleStep = 0;
idleStepper.stepperStatus = SOFF;
}
//The interrupt to turn off the idle pwm
ISR(TIMER3_COMPA_vect)
{
if (idle_pwm_state)
{
*idle_pin_port &= ~(idle_pin_mask); // Switch pin to low
OCR3A = TCNT3 + (idle_pwm_max_count - idle_pwm_cur_value);
idle_pwm_state = false;
}
else
{
*idle_pin_port |= (idle_pin_mask); // Switch pin high
OCR3A = TCNT3 + idle_pwm_cur_value;
idle_pwm_state = true;
}
}