Skip to content

Commit

Permalink
Merge pull request #31 from SPRESENSE/release-v1.2.1
Browse files Browse the repository at this point in the history
Merge release-v1.2.0 into master for v1.2.1 release
  • Loading branch information
SPRESENSE committed Apr 25, 2019
2 parents 68cd85a + 1e385d6 commit 189633e
Show file tree
Hide file tree
Showing 46 changed files with 603 additions and 186 deletions.
47 changes: 39 additions & 8 deletions examples/audio_player/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,45 @@ Install 'nuttx.spk' to system.
After that, you can see worker binary 'MP3DEC', 'WAVDEC'
in directory sdk/modules/audio/dsp.
Store worker binary, playlist and play contents in the path specified by option.
- Default path
worker binary : /mnt/sd0/BIN
play list : /mnt/sd0/PLAYLIST
contents : /mnt/sd0/AUDIO

As a sample of Playlist, there is TRACK_DB.CSV in the PLAYLIST folder.
Also, as a sample of contents, there is Sound.mp 3 in the AUDIO folder.
Sound.mp3 is a sampling frequency of 48000, bit length 16, codec MP3 file.

The default storage location in example is microSD card(formatted with FAT32).
Create 'BIN', 'PLAYLIST', 'AUDIO' directories on Top of microSD card,

Store worker binary in 'BIN' directory.
Store playlist in 'PLAYSLIT' directory.
Store contents to be played back in 'AUDIO' directory.

Nuttx and windows have the following configuration.

- Nuttx configuration
/mnt/sd0/BIN
/mnt/sd0/PLAYLIST
/mnt/sd0/AUDIO

- Windows configuration(Case where microSD card is mounted on 'D' drive)
D:\BIN
D:\PLAYLIST
D:\AUDIO


As a sample of Playlist, there is TRACK_DB.CSV in examples/audio_player/PLAYLIST.
Also, as a sample of contents, there is Sound.mp3 in examples/audio_player/AUDIO.
(Sound.mp3 is a sampling frequency of 48000, bit length 16, codec MP3 file.)

The file list when using these samples is as follows.

- Nuttx file list
/mnt/sd0/BIN/MP3DEC
/mnt/sd0/BIN/WAVDEC
/mnt/sd0/PLAYLIST/TRACK_DB.CSV
/mnt/sd0/AUDIO/Sound.mp3

- Windows file list(Case where microSD card is mounted on 'D' drive)
D:\BIN\MP3DEC
D:\BIN\WAVDEC
D:\PLAYLIST\TRACK_DB.CSV
D:\AUDIO\Sound.mp3


Execute
--------------------------
Expand Down
2 changes: 1 addition & 1 deletion examples/audio_recorder/audio_recorder_main.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
#include "memutils/memory_manager/MemHandle.h"
#include "memutils/message/Message.h"
#include "audio/audio_high_level_api.h"
#include <audio/utilities/wav_containerformat.h>
#include "include/msgq_id.h"
#include "include/mem_layout.h"
#include "include/memory_layout.h"
#include "include/msgq_pool.h"
#include "include/pool_layout.h"
#include "include/fixed_fence.h"
#include "container_format_lib/wav_containerformat.h"

#include <arch/chip/cxd56_audio.h>

Expand Down
13 changes: 8 additions & 5 deletions examples/gnss_atcmd/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
config EXAMPLES_GNSS_ATCMD
bool "GNSS CXD5603 @command emulator example"
default n
select LIBC_FLOATINGPOINT
#depends on CXD56_GNSS && CDCACM
depends on CXD56_GNSS
select LIBC_FLOATINGPOINT
depends on CXD56_GNSS
---help---
Enable GNSS CXD5603 @command emulator example

Expand Down Expand Up @@ -43,9 +42,13 @@ config EXAMPLES_GNSS_ATCMD_TTYS2

endchoice

config EXAMPLES_GNSS_ATCMD_SUPPORT_DCREPORT
bool "Example supports QZ DC report output"
default y

config EXAMPLES_GNSS_ATCMD_SUPPORT_SPECRUM
bool "Example supports spectrum output"
default y
bool "Example supports spectrum output"
default y

config EXAMPLES_GNSS_ATCMD_PRIORITY
int "GNSS task priority"
Expand Down
Loading

0 comments on commit 189633e

Please sign in to comment.