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

Merge pull request #75 from PavelSindler/print_fan_speed

Browse Source 
Print fan speed: measuring pulse width
This commit is contained in:
XPila 2017-10-27 14:56:52 +02:00 committed by GitHub
commit a6f3fb2d3b
3 changed files with 7417 additions and 7383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin.h
View File

@ -334,6 +334,7 @@ extern int fanSpeedBckp;
extern float pause_lastpos[4]; extern float pause_lastpos[4];
extern unsigned long pause_time; extern unsigned long pause_time;
extern unsigned long start_pause_print; extern unsigned long start_pause_print;
extern unsigned long t_fan_rising_edge;
extern bool mesh_bed_leveling_flag; extern bool mesh_bed_leveling_flag;
extern bool mesh_bed_run_from_menu; extern bool mesh_bed_run_from_menu;
@ -372,6 +373,7 @@ void serialecho_temperatures();
void uvlo_(); void uvlo_();
void recover_print(uint8_t automatic); void recover_print(uint8_t automatic);
void setup_uvlo_interrupt(); void setup_uvlo_interrupt();
void setup_fan_interrupt();
extern void recover_machine_state_after_power_panic(); extern void recover_machine_state_after_power_panic();
extern void restore_print_from_eeprom(); extern void restore_print_from_eeprom();

14790
Firmware/Marlin_main.cpp
View File

File diff suppressed because it is too large Load Diff

8
Firmware/temperature.cpp
View File

@ -2178,10 +2178,10 @@ void check_fans() {
fan_edge_counter[0] ++; fan_edge_counter[0] ++;
fan_state[0] = !fan_state[0]; fan_state[0] = !fan_state[0];
} }
if (READ(TACH_1) != fan_state[1]) { //if (READ(TACH_1) != fan_state[1]) {
fan_edge_counter[1] ++; // fan_edge_counter[1] ++;
fan_state[1] = !fan_state[1]; // fan_state[1] = !fan_state[1];
} //}
} }
#ifdef PIDTEMP #ifdef PIDTEMP