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

Re-enable Tone

Browse Source
This commit is contained in:
leptun 2019-07-30 16:05:40 +03:00
parent da7ce65bb4
commit 9ff1f6c3ee
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/system_timer.h
View File

@ -11,8 +11,8 @@
#define _millis millis2 #define _millis millis2
#define _micros micros2 #define _micros micros2
#define _delay delay2 #define _delay delay2
#define _tone tone2 #define _tone tone
#define _noTone noTone2 #define _noTone noTone
#define timer02_set_pwm0(pwm0) #define timer02_set_pwm0(pwm0)
@ -20,8 +20,8 @@
#define _millis millis #define _millis millis
#define _micros micros #define _micros micros
#define _delay delay #define _delay delay
#define _tone(x, y) /*tone*/ #define _tone tone
#define _noTone(x) /*noTone*/ #define _noTone noTone
#define timer02_set_pwm0(pwm0) #define timer02_set_pwm0(pwm0)
#endif //SYSTEM_TIMER_2 #endif //SYSTEM_TIMER_2

10
Firmware/timer02.c
View File

@ -136,14 +136,4 @@ void delay2(unsigned long ms)
} }
} }
void tone2(__attribute__((unused)) uint8_t _pin, __attribute__((unused)) unsigned int frequency/*, unsigned long duration*/)
{
PIN_SET(BEEPER);
}
void noTone2(__attribute__((unused)) uint8_t _pin)
{
PIN_CLR(BEEPER);
}
#endif //SYSTEM_TIMER_2 #endif //SYSTEM_TIMER_2

7
Firmware/timer02.h
View File

@ -23,13 +23,6 @@ extern unsigned long micros2(void);
///! Reimplemented original delay() using timer2 ///! Reimplemented original delay() using timer2
extern void delay2(unsigned long ms); extern void delay2(unsigned long ms);
///! Reimplemented original tone() using timer2
///! Does not perform any PWM tone generation, it just sets the beeper pin to 1
extern void tone2(uint8_t _pin, unsigned int frequency/*, unsigned long duration*/);
///! Turn off beeping - set beeper pin to 0
extern void noTone2(uint8_t _pin);
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif //defined(__cplusplus) #endif //defined(__cplusplus)