diff options
-rw-r--r-- | apps/gui/pitchscreen.h | 5 | ||||
-rw-r--r-- | apps/tdspeed.c | 1 | ||||
-rw-r--r-- | firmware/export/sound.h | 7 | ||||
-rw-r--r-- | firmware/sound.c | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/apps/gui/pitchscreen.h b/apps/gui/pitchscreen.h index e421c6559e..41eb1fd415 100644 --- a/apps/gui/pitchscreen.h +++ b/apps/gui/pitchscreen.h | |||
@@ -22,11 +22,6 @@ | |||
22 | #ifndef _PITCHSCREEN_H_ | 22 | #ifndef _PITCHSCREEN_H_ |
23 | #define _PITCHSCREEN_H_ | 23 | #define _PITCHSCREEN_H_ |
24 | 24 | ||
25 | /* precision of the pitch and speed variables */ | ||
26 | /* One zero per decimal (100 means two decimal places */ | ||
27 | #define PITCH_SPEED_PRECISION 100L | ||
28 | #define PITCH_SPEED_100 (100L * PITCH_SPEED_PRECISION) /* 100% speed */ | ||
29 | |||
30 | int gui_syncpitchscreen_run(void); | 25 | int gui_syncpitchscreen_run(void); |
31 | 26 | ||
32 | #endif /* _PITCHSCREEN_H_ */ | 27 | #endif /* _PITCHSCREEN_H_ */ |
diff --git a/apps/tdspeed.c b/apps/tdspeed.c index cd01099a76..8cb495c08f 100644 --- a/apps/tdspeed.c +++ b/apps/tdspeed.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <stddef.h> | 24 | #include <stddef.h> |
25 | #include <stdio.h> | 25 | #include <stdio.h> |
26 | #include <string.h> | 26 | #include <string.h> |
27 | #include "sound.h" | ||
27 | #include "buffer.h" | 28 | #include "buffer.h" |
28 | #include "system.h" | 29 | #include "system.h" |
29 | #include "tdspeed.h" | 30 | #include "tdspeed.h" |
diff --git a/firmware/export/sound.h b/firmware/export/sound.h index 674b2f6ae2..3d12a47db3 100644 --- a/firmware/export/sound.h +++ b/firmware/export/sound.h | |||
@@ -64,4 +64,11 @@ void sound_set_pitch(int32_t pitch); | |||
64 | int32_t sound_get_pitch(void); | 64 | int32_t sound_get_pitch(void); |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | #ifdef HAVE_PITCHSCREEN | ||
68 | /* precision of the pitch and speed variables */ | ||
69 | /* One zero per decimal (100 means two decimal places */ | ||
70 | #define PITCH_SPEED_PRECISION 100L | ||
71 | #define PITCH_SPEED_100 (100L * PITCH_SPEED_PRECISION) /* 100% speed */ | ||
72 | #endif /* HAVE_PITCHSCREEN */ | ||
73 | |||
67 | #endif | 74 | #endif |
diff --git a/firmware/sound.c b/firmware/sound.c index 6a2f03df00..84ccd2b1bd 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -25,8 +25,6 @@ | |||
25 | #include "sound.h" | 25 | #include "sound.h" |
26 | #include "logf.h" | 26 | #include "logf.h" |
27 | #include "system.h" | 27 | #include "system.h" |
28 | /* for the pitch and speed precision #defines: */ | ||
29 | #include "pitchscreen.h" | ||
30 | #ifndef SIMULATOR | 28 | #ifndef SIMULATOR |
31 | #include "i2c.h" | 29 | #include "i2c.h" |
32 | #include "mas.h" | 30 | #include "mas.h" |