sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Default timer to off in setup

Browse Source
This commit is contained in:
Ben V. Brown
2020-11-01 13:39:45 +11:00
parent f445e2771c
commit 9f4bcf2875
2 changed files with 72 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
workspace/TS100/Core/BSP/Pine64/IRQ.cpp
View File

@@ -12,114 +12,110 @@ volatile uint8_t i2c_read_process = 0;
volatile uint8_t i2c_write_process = 0; volatile uint8_t i2c_write_process = 0;
volatile uint8_t i2c_slave_address = 0; volatile uint8_t i2c_slave_address = 0;
volatile uint8_t i2c_error_code = 0; volatile uint8_t i2c_error_code = 0;
volatile uint8_t* i2c_write; volatile uint8_t *i2c_write;
volatile uint8_t* i2c_read; volatile uint8_t *i2c_read;
volatile uint16_t i2c_nbytes; volatile uint16_t i2c_nbytes;
volatile uint16_t i2c_write_dress; volatile uint16_t i2c_write_dress;
volatile uint16_t i2c_read_dress; volatile uint16_t i2c_read_dress;
volatile uint8_t i2c_process_flag = 0; volatile uint8_t i2c_process_flag = 0;
void ADC0_1_IRQHandler(void) { void ADC0_1_IRQHandler(void) {
adc_interrupt_flag_clear(ADC0, ADC_INT_FLAG_EOIC); adc_interrupt_flag_clear(ADC0, ADC_INT_FLAG_EOIC);
//unblock the PID controller thread // unblock the PID controller thread
BaseType_t xHigherPriorityTaskWoken = pdFALSE; BaseType_t xHigherPriorityTaskWoken = pdFALSE;
if (pidTaskNotification) { if (pidTaskNotification) {
vTaskNotifyGiveFromISR(pidTaskNotification, &xHigherPriorityTaskWoken); vTaskNotifyGiveFromISR(pidTaskNotification, &xHigherPriorityTaskWoken);
portYIELD_FROM_ISR(xHigherPriorityTaskWoken); portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
} }
} }
volatile uint16_t PWMSafetyTimer = 0; volatile uint16_t PWMSafetyTimer = 0;
volatile uint8_t pendingPWM = 0; volatile uint8_t pendingPWM = 0;
void TIMER1_IRQHandler(void) { void TIMER1_IRQHandler(void) {
if (timer_interrupt_flag_get(TIMER1, TIMER_INT_UP) == SET) { if (timer_interrupt_flag_get(TIMER1, TIMER_INT_UP) == SET) {
timer_interrupt_flag_clear(TIMER1, TIMER_INT_UP); timer_interrupt_flag_clear(TIMER1, TIMER_INT_UP);
//rollover turn on output if required // rollover turn on output if required
if (PWMSafetyTimer && pendingPWM) { if (PWMSafetyTimer && pendingPWM) {
timer_channel_output_pulse_value_config(TIMER2, TIMER_CH_0, 80); timer_channel_output_pulse_value_config(TIMER2, TIMER_CH_0, 50);
} }
if (PWMSafetyTimer) { if (PWMSafetyTimer) {
PWMSafetyTimer--; PWMSafetyTimer--;
} }
} }
if (timer_interrupt_flag_get(TIMER1, TIMER_INT_CH1) == SET) { if (timer_interrupt_flag_get(TIMER1, TIMER_INT_CH1) == SET) {
timer_interrupt_flag_clear(TIMER1, TIMER_INT_CH1); timer_interrupt_flag_clear(TIMER1, TIMER_INT_CH1);
//This is triggered on pwm setpoint trigger; we want to copy the pending PWM value into the output control reg // This is triggered on pwm setpoint trigger; we want to copy the pending
// PWM value into the output control reg
timer_channel_output_pulse_value_config(TIMER2, TIMER_CH_0, 0); timer_channel_output_pulse_value_config(TIMER2, TIMER_CH_0, 0);
if (pendingPWM) { if (pendingPWM) {
timer_channel_output_pulse_value_config(TIMER1, TIMER_CH_1, pendingPWM); timer_channel_output_pulse_value_config(TIMER1, TIMER_CH_1, pendingPWM);
} }
} }
} }
void setTipPWM(uint8_t pulse) { void setTipPWM(uint8_t pulse) {
PWMSafetyTimer = 10; // This is decremented in the handler for PWM so that the tip pwm is PWMSafetyTimer =
// disabled if the PID task is not scheduled often enough. 10; // This is decremented in the handler for PWM so that the tip pwm is
pendingPWM = pulse; // disabled if the PID task is not scheduled often enough.
pendingPWM = pulse;
} }
static bool fastPWM; static bool fastPWM;
static void switchToFastPWM(void) { static void switchToFastPWM(void) {
fastPWM = true; fastPWM = true;
totalPWM = powerPWM + tempMeasureTicks * 2; totalPWM = powerPWM + tempMeasureTicks * 2;
TIMER_CAR(TIMER1) = (uint32_t)totalPWM; TIMER_CAR(TIMER1) = (uint32_t)totalPWM;
// ~3.5 Hz rate
TIMER_CH0CV(TIMER1) = powerPWM + holdoffTicks * 2;
//1 kHz tick rate
TIMER_PSC(TIMER1) = 12000;
/* generate an update event */
TIMER_SWEVG(TIMER1) |= (uint32_t) TIMER_SWEVG_UPG;
// ~3.5 Hz rate
TIMER_CH0CV(TIMER1) = powerPWM + holdoffTicks * 2;
// 1 kHz tick rate
TIMER_PSC(TIMER1) = 12000;
/* generate an update event */
TIMER_SWEVG(TIMER1) |= (uint32_t)TIMER_SWEVG_UPG;
} }
static void switchToSlowPWM(void) { static void switchToSlowPWM(void) {
fastPWM = false; fastPWM = false;
totalPWM = powerPWM + tempMeasureTicks; totalPWM = powerPWM + tempMeasureTicks;
TIMER_CAR(TIMER1) = (uint32_t)totalPWM; TIMER_CAR(TIMER1) = (uint32_t)totalPWM;
// ~1.84 Hz rate // ~1.84 Hz rate
TIMER_CH0CV(TIMER1) = powerPWM + holdoffTicks; TIMER_CH0CV(TIMER1) = powerPWM + holdoffTicks;
// 500 Hz tick rate // 500 Hz tick rate
TIMER_PSC(TIMER1) = 24000; TIMER_PSC(TIMER1) = 24000;
/* generate an update event */ /* generate an update event */
TIMER_SWEVG(TIMER1) |= (uint32_t) TIMER_SWEVG_UPG; TIMER_SWEVG(TIMER1) |= (uint32_t)TIMER_SWEVG_UPG;
} }
bool tryBetterPWM(uint8_t pwm) { bool tryBetterPWM(uint8_t pwm) {
if (fastPWM && pwm == powerPWM) { if (fastPWM && pwm == powerPWM) {
// maximum power for fast PWM reached, need to go slower to get more // maximum power for fast PWM reached, need to go slower to get more
switchToSlowPWM(); switchToSlowPWM();
return true; return true;
} else if (!fastPWM && pwm < 230) { } else if (!fastPWM && pwm < 230) {
// 254 in fast PWM mode gives the same power as 239 in slow // 254 in fast PWM mode gives the same power as 239 in slow
// allow for some reasonable hysteresis by switching only when it goes // allow for some reasonable hysteresis by switching only when it goes
// below 230 (equivalent to 245 in fast mode) // below 230 (equivalent to 245 in fast mode)
switchToFastPWM(); switchToFastPWM();
return true; return true;
} }
return false; return false;
} }
void EXTI5_9_IRQHandler(void) { void EXTI5_9_IRQHandler(void) {
#ifdef POW_PD #ifdef POW_PD
if (RESET != exti_interrupt_flag_get(EXTI_5)) { if (RESET != exti_interrupt_flag_get(EXTI_5)) {
exti_interrupt_flag_clear(EXTI_5); exti_interrupt_flag_clear(EXTI_5);
if (RESET == gpio_input_bit_get(FUSB302_IRQ_GPIO_Port, FUSB302_IRQ_Pin)) { if (RESET == gpio_input_bit_get(FUSB302_IRQ_GPIO_Port, FUSB302_IRQ_Pin)) {
InterruptHandler::irqCallback(); InterruptHandler::irqCallback();
} }
} }
#endif #endif
} }
//These are unused for now // These are unused for now
void I2C0_EV_IRQHandler(void) { void I2C0_EV_IRQHandler(void) {}
} void I2C0_ER_IRQHandler(void) {}
void I2C0_ER_IRQHandler(void) {
}

2
workspace/TS100/Core/BSP/Pine64/Setup.c
View File

@@ -273,7 +273,7 @@ void setup_timers() {
timer_ocintpara.ocidlestate = TIMER_OC_IDLE_STATE_LOW; timer_ocintpara.ocidlestate = TIMER_OC_IDLE_STATE_LOW;
timer_ocintpara.ocnidlestate = TIMER_OCN_IDLE_STATE_LOW; timer_ocintpara.ocnidlestate = TIMER_OCN_IDLE_STATE_LOW;
timer_channel_output_config(TIMER2, TIMER_CH_0, &timer_ocintpara); timer_channel_output_config(TIMER2, TIMER_CH_0, &timer_ocintpara);
timer_channel_output_pulse_value_config(TIMER2, TIMER_CH_0, 50); timer_channel_output_pulse_value_config(TIMER2, TIMER_CH_0, 0);
timer_channel_output_mode_config(TIMER2, TIMER_CH_0, TIMER_OC_MODE_PWM0); timer_channel_output_mode_config(TIMER2, TIMER_CH_0, TIMER_OC_MODE_PWM0);
timer_channel_output_shadow_config(TIMER2, TIMER_CH_0, timer_channel_output_shadow_config(TIMER2, TIMER_CH_0,
TIMER_OC_SHADOW_DISABLE); TIMER_OC_SHADOW_DISABLE);