piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Warning removed

Browse Source
This commit is contained in:
bsongis@gmail.com
2013-06-25 19:46:21 +00:00
parent 381af741fb
commit 8bac09c126
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio_arm.cpp
+2 -2
View File
@@ -440,7 +440,7 @@ int AudioQueue::mixBeep(AudioContext &context, AudioBuffer *buffer, int volume,
if (fragment.tone.duration > 0) {
result = AUDIO_BUFFER_SIZE;
if (fragment.tone.freq && context.state.tone.freq!=fragment.tone.freq && (!fragment.tone.freqIncr || abs(context.state.tone.freq-fragment.tone.freq) > 100)) {
int periods = DIM(context.state.tone.points) / ((AUDIO_SAMPLE_RATE / fragment.tone.freq) + 1);
int periods = BEEP_POINTS_COUNT / ((AUDIO_SAMPLE_RATE / fragment.tone.freq) + 1);
context.state.tone.count = (periods * AUDIO_SAMPLE_RATE) / fragment.tone.freq;
if (context.state.tone.idx >= context.state.tone.count) context.state.tone.idx = 0;
#if 1
@@ -473,7 +473,7 @@ int AudioQueue::mixBeep(AudioContext &context, AudioBuffer *buffer, int volume,
context.state.tone.idx = context.state.tone.idx + 1;
if (context.state.tone.idx >= context.state.tone.count) {
context.state.tone.idx = 0;
if (end && i+DIM(context.state.tone.points) > points) break;
if (end && i+BEEP_POINTS_COUNT>points) break;
}
}
src/audio_arm.h
+2 -1
View File
@@ -51,6 +51,7 @@
#define BEEP_DEFAULT_FREQ (2250)
#define BEEP_KEY_UP_FREQ (BEEP_DEFAULT_FREQ+150)
#define BEEP_KEY_DOWN_FREQ (BEEP_DEFAULT_FREQ-150)
#define BEEP_POINTS_COUNT 100
#define AUDIO_BUFFER_FREE (0)
#define AUDIO_BUFFER_FILLED (1)
@@ -104,7 +105,7 @@ class AudioContext {
#endif
struct {
int16_t points[100];
int16_t points[BEEP_POINTS_COUNT];
uint8_t count;
uint8_t idx;
uint16_t freq;