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

Remove dead macro timer02_set_pwm0 

It looks like it was removed here
https://github.com/prusa3d/Prusa-Firmware/pull/1979
4 years ago

No change in memory
This commit is contained in:
Guðni Már Gilbert 2023-05-12 17:41:31 +00:00 committed by DRracer
parent b6572066f4
commit 5295bfa040
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/system_timer.h
View File

@ -16,15 +16,12 @@
#define _tone tone4 #define _tone tone4
#define _noTone noTone4 #define _noTone noTone4
#define timer02_set_pwm0(pwm0)
#else //SYSTEM_TIMER_2 #else //SYSTEM_TIMER_2
#define _millis millis #define _millis millis
#define _micros micros #define _micros micros
#define _delay delay #define _delay delay
#define _tone tone #define _tone tone
#define _noTone noTone #define _noTone noTone
#define timer02_set_pwm0(pwm0)
#endif //SYSTEM_TIMER_2 #endif //SYSTEM_TIMER_2
// Timer counter, incremented by the 1ms Arduino timer. // Timer counter, incremented by the 1ms Arduino timer.

16
Firmware/temperature.cpp
View File

@ -288,7 +288,6 @@ void __attribute__((noinline)) PID_autotune(float temp, int extruder, int ncycle
if (extruder<0) if (extruder<0)
{ {
soft_pwm_bed = (MAX_BED_POWER)/2; soft_pwm_bed = (MAX_BED_POWER)/2;
timer02_set_pwm0(soft_pwm_bed << 1);
bias = d = (MAX_BED_POWER)/2; bias = d = (MAX_BED_POWER)/2;
target_temperature_bed = (int)temp; // to display the requested target bed temperature properly on the main screen target_temperature_bed = (int)temp; // to display the requested target bed temperature properly on the main screen
} }
@ -321,10 +320,8 @@ void __attribute__((noinline)) PID_autotune(float temp, int extruder, int ncycle
if(heating == true && input > temp) { if(heating == true && input > temp) {
if(_millis() - t2 > 5000) { if(_millis() - t2 > 5000) {
heating=false; heating=false;
if (extruder<0) if (extruder<0) {
{
soft_pwm_bed = (bias - d) >> 1; soft_pwm_bed = (bias - d) >> 1;
timer02_set_pwm0(soft_pwm_bed << 1);
} }
else else
soft_pwm[extruder] = (bias - d) >> 1; soft_pwm[extruder] = (bias - d) >> 1;
@ -381,7 +378,6 @@ void __attribute__((noinline)) PID_autotune(float temp, int extruder, int ncycle
if (extruder<0) if (extruder<0)
{ {
soft_pwm_bed = (bias + d) >> 1; soft_pwm_bed = (bias + d) >> 1;
timer02_set_pwm0(soft_pwm_bed << 1);
} }
else else
soft_pwm[extruder] = (bias + d) >> 1; soft_pwm[extruder] = (bias + d) >> 1;
@ -1797,12 +1793,10 @@ static void pid_bed(const float current, const int target)
if(current < BED_MAXTEMP) if(current < BED_MAXTEMP)
{ {
soft_pwm_bed = (int)pid_output >> 1; soft_pwm_bed = (int)pid_output >> 1;
timer02_set_pwm0(soft_pwm_bed << 1);
} }
else else
{ {
soft_pwm_bed = 0; soft_pwm_bed = 0;
timer02_set_pwm0(soft_pwm_bed << 1);
} }
#elif !defined(BED_LIMIT_SWITCHING) #elif !defined(BED_LIMIT_SWITCHING)
@ -1812,18 +1806,15 @@ static void pid_bed(const float current, const int target)
if(current >= target) if(current >= target)
{ {
soft_pwm_bed = 0; soft_pwm_bed = 0;
timer02_set_pwm0(soft_pwm_bed << 1);
} }
else else
{ {
soft_pwm_bed = MAX_BED_POWER>>1; soft_pwm_bed = MAX_BED_POWER>>1;
timer02_set_pwm0(soft_pwm_bed << 1);
} }
} }
else else
{ {
soft_pwm_bed = 0; soft_pwm_bed = 0;
timer02_set_pwm0(soft_pwm_bed << 1);
WRITE(HEATER_BED_PIN,LOW); WRITE(HEATER_BED_PIN,LOW);
} }
#else //#ifdef BED_LIMIT_SWITCHING #else //#ifdef BED_LIMIT_SWITCHING
@ -1833,18 +1824,15 @@ static void pid_bed(const float current, const int target)
if(current > target + BED_HYSTERESIS) if(current > target + BED_HYSTERESIS)
{ {
soft_pwm_bed = 0; soft_pwm_bed = 0;
timer02_set_pwm0(soft_pwm_bed << 1);
} }
else if(current <= target - BED_HYSTERESIS) else if(current <= target - BED_HYSTERESIS)
{ {
soft_pwm_bed = MAX_BED_POWER>>1; soft_pwm_bed = MAX_BED_POWER>>1;
timer02_set_pwm0(soft_pwm_bed << 1);
} }
} }
else else
{ {
soft_pwm_bed = 0; soft_pwm_bed = 0;
timer02_set_pwm0(soft_pwm_bed << 1);
WRITE(HEATER_BED_PIN,LOW); WRITE(HEATER_BED_PIN,LOW);
} }
#endif //BED_LIMIT_SWITCHING #endif //BED_LIMIT_SWITCHING
@ -1852,7 +1840,6 @@ static void pid_bed(const float current, const int target)
if(target==0) if(target==0)
{ {
soft_pwm_bed = 0; soft_pwm_bed = 0;
timer02_set_pwm0(soft_pwm_bed << 1);
} }
#endif //TEMP_SENSOR_BED #endif //TEMP_SENSOR_BED
} }
@ -2018,7 +2005,6 @@ void disable_heater()
#endif #endif
#if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1
// TODO: this doesn't take immediate effect! // TODO: this doesn't take immediate effect!
timer02_set_pwm0(0);
bedPWMDisabled = 0; bedPWMDisabled = 0;
#endif #endif
} }