3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request from bubnikv/MK3

Browse source 
Slight optimization of the fan speed interrupt routine by accessing
This commit is contained in:
PavelSindler 2018-01-12 22:08:35 +01:00 • committed by GitHub
commit a0555f49c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions

9
Firmware/Marlin.h
View file

@ -242,6 +242,15 @@ void prepare_arc_move(char isclockwise);
void clamp_to_software_endstops(float target[3]); void clamp_to_software_endstops(float target[3]);
void refresh_cmd_timeout(void); void refresh_cmd_timeout(void);
// Timer counter, incremented by the 1ms Arduino timer.
// The standard Arduino timer() function returns this value atomically
// by disabling / enabling interrupts. This is costly, if the interrupts are known
// to be disabled.
extern volatile unsigned long timer0_millis;
// An unsynchronized equivalent to a standard Arduino millis() function.
// To be used inside an interrupt routine.
FORCE_INLINE unsigned long millis_nc() { return timer0_millis; }
#ifdef FAST_PWM_FAN #ifdef FAST_PWM_FAN
void setPwmFrequency(uint8_t pin, int val); void setPwmFrequency(uint8_t pin, int val);
#endif #endif

4
Firmware/Marlin_main.cpp
View file

@ -7443,10 +7443,10 @@ ISR(INT7_vect) {
if (fanSpeed < MIN_PRINT_FAN_SPEED) return; if (fanSpeed < MIN_PRINT_FAN_SPEED) return;
if ((1 << 6) & EICRB) { //interrupt was triggered by rising edge if ((1 << 6) & EICRB) { //interrupt was triggered by rising edge
t_fan_rising_edge = millis(); t_fan_rising_edge = millis_nc();
} }
else { //interrupt was triggered by falling edge else { //interrupt was triggered by falling edge
if ((millis() - t_fan_rising_edge) >= FAN_PULSE_WIDTH_LIMIT) {//this pulse was from sensor and not from pwm if ((millis_nc() - t_fan_rising_edge) >= FAN_PULSE_WIDTH_LIMIT) {//this pulse was from sensor and not from pwm
fan_edge_counter[1] += 2; //we are currently counting all edges so lets count two edges for one pulse fan_edge_counter[1] += 2; //we are currently counting all edges so lets count two edges for one pulse
} }
} }