sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/audio/tonic.: Remove dependency on LIBM for creating a static table with frequencies notes.

Browse Source
This commit is contained in:
Alan Carvalho de Assis 2016-08-17 16:41:00 -06:00 committed by Gregory Nutt
parent 229a200734
commit d3a5bd4ba0
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/stm32f103-minimum/audio_tone/defconfig
View File

@ -917,7 +917,7 @@ CONFIG_STDIO_BUFFER_SIZE=64
CONFIG_STDIO_LINEBUFFER=y
CONFIG_NUNGET_CHARS=2
CONFIG_LIB_HOMEDIR="/"
CONFIG_LIBM=y
# CONFIG_LIBM is not set
# CONFIG_NOPRINTF_FIELDWIDTH is not set
# CONFIG_LIBC_FLOATINGPOINT is not set
# CONFIG_LIBC_LONG_LONG is not set

39
drivers/audio/tone.c
View File

@ -54,7 +54,6 @@
#include <unistd.h>
#include <string.h>
#include <semaphore.h>
#include <math.h>
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
@ -114,6 +113,24 @@ static char tune_buf[MAX_TUNE_LEN];
static const uint8_t g_note_tab[] = { 9, 11, 0, 2, 4, 5, 7 };
/* Notes in Frequency */
static const uint16_t g_notes_freq[84] =
{
0x0041, 0x0045, 0x0049, 0x004D, 0x0052, 0x0057, 0x005C,
0x0061, 0x0067, 0x006E, 0x0074, 0x007B, 0x0082, 0x008A,
0x0092, 0x009B, 0x00A4, 0x00AE, 0x00B8, 0x00C3, 0x00CF,
0x00DC, 0x00E9, 0x00F6, 0x0105, 0x0115, 0x0125, 0x0137,
0x0149, 0x015D, 0x0171, 0x0187, 0x019F, 0x01B8, 0x01D2,
0x01ED, 0x020B, 0x022A, 0x024B, 0x026E, 0x0293, 0x02BA,
0x02E3, 0x030F, 0x033E, 0x0370, 0x03A4, 0x03DB, 0x0416,
0x0454, 0x0496, 0x04DC, 0x0526, 0x0574, 0x05C7, 0x061F,
0x067D, 0x06E0, 0x0748, 0x07B7, 0x082D, 0x08A9, 0x092D,
0x09B9, 0x0A4D, 0x0AE9, 0x0B8F, 0x0C3F, 0x0CFA, 0x0DC0,
0x0E91, 0x0F6F, 0x105A, 0x1152, 0x125A, 0x1372, 0x149A,
0x15D3, 0x171F, 0x187F, 0x19F4, 0x1B80, 0x1D22, 0x1EDE
};
/* Global variable used by the tone generator */
static const char *g_tune;
@ -181,23 +198,6 @@ static void oneshot_callback(FAR struct oneshot_lowerhalf_s *lower,
next_note(upper);
}
/****************************************************************************
* Name: note_to_freq
*
* Description:
* This function converts a note value in the range C1 to B7 to frequency.
*
****************************************************************************/
static uint16_t note_to_freq(uint8_t note)
{
/* Compute the frequency in Hz */
uint16_t freq = 880.0f * expf(logf(2.0f) * ((int)note - 46) / 12.0f);
return freq;
}
/****************************************************************************
* Name: note_duration
*
@ -294,7 +294,7 @@ static void start_note(FAR struct tone_upperhalf_s *upper, uint8_t note)
{
FAR struct pwm_lowerhalf_s *tone = upper->devtone;
upper->tone.frequency = note_to_freq(note);
upper->tone.frequency = g_notes_freq[note - 1];
upper->tone.duty = 50;
tone->ops->start(tone, &upper->tone);
@ -866,7 +866,6 @@ static ssize_t tone_write(FAR struct file *filep, FAR const char *buffer,
{
FAR struct inode *inode = filep->f_inode;
FAR struct tone_upperhalf_s *upper = inode->i_private;
int ndx;
/* We need to receive a string #RRGGBB = 7 bytes */