josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

heater.c: review on/off behaviour again. 

D'oh, this wasn't compiling without BANG_BANG.
This commit is contained in:
Markus Hitter 2012-10-14 22:50:28 +02:00
parent f455f6f709
commit 86e89dbac6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heater.c
View File

@ -69,6 +69,12 @@ struct {
uint8_t heater_output; ///< this is the PID value we eventually send to the heater uint8_t heater_output; ///< this is the PID value we eventually send to the heater
} heaters_runtime[NUM_HEATERS]; } heaters_runtime[NUM_HEATERS];
#ifdef BANG_BANG
#define HEATER_THRESHOLD ((BANG_BANG_ON + BANG_BANG_OFF) / 2)
#else
#define HEATER_THRESHOLD 8
#endif
/// default scaled P factor, equivalent to 8.0 /// default scaled P factor, equivalent to 8.0
#define DEFAULT_P 8192 #define DEFAULT_P 8192
/// default scaled I factor, equivalent to 0.5 /// default scaled I factor, equivalent to 0.5
@ -429,7 +435,7 @@ void heater_set(heater_t index, uint8_t value) {
#endif #endif
} }
else { else {
if (value >= ((BANG_BANG_ON + BANG_BANG_OFF) / 2)) if (value >= HEATER_THRESHOLD)
*(heaters[index].heater_port) |= MASK(heaters[index].heater_pin); *(heaters[index].heater_port) |= MASK(heaters[index].heater_pin);
else else
*(heaters[index].heater_port) &= ~MASK(heaters[index].heater_pin); *(heaters[index].heater_port) &= ~MASK(heaters[index].heater_pin);