Merge pull request sonydevworld#42 from SPRESENSE/merge-v2.0.2-develop

Merge tag v2.0.2 for develop
SPRESENSE · Dec 17, 2020 · 4a90fc7 · 4a90fc7
2 parents 8d272fb + 5490cbd
commit 4a90fc7
Show file tree

Hide file tree

Showing 37 changed files with 242 additions and 85 deletions.
diff --git a/Arduino15/package_spresense_index.json b/Arduino15/package_spresense_index.json
@@ -11,13 +11,13 @@
         {
           "category": "SPRESENSE",
           "name": "Spresense Reference Board",
-          "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.1/spresense-v2.0.1.tar.gz",
+          "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.2/spresense-v2.0.2.tar.gz",
           "help": {
             "online": "https://github.com/sonydevworld/spresense-arduino-compatible/releases"
           },
           "version": "1.0.0",
           "architecture": "spresense",
-          "archiveFileName": "spresense-v2.0.1.tar.gz",
+          "archiveFileName": "spresense-v2.0.2.tar.gz",
           "boards": [
             {
               "name": "Generic Spresense Module"
@@ -49,22 +49,22 @@
           "name": "spresense-sdk",
           "systems": [
             {
-              "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.1/spresense-sdk-v2.0.1.tar.gz",
+              "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.2/spresense-sdk-v2.0.2.tar.gz",
               "host": "i686-mingw32",
-              "archiveFileName": "spresense-sdk-v2.0.1.tar.gz",
+              "archiveFileName": "spresense-sdk-v2.0.2.tar.gz",
               "size": "6257789"
             },
             {
               "_comment": "Allow x64-Linux build",
-              "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.1/spresense-sdk-v2.0.1.tar.gz",
+              "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.2/spresense-sdk-v2.0.2.tar.gz",
               "host": "x86_64-pc-linux-gnu",
-              "archiveFileName": "spresense-sdk-v2.0.1.tar.gz",
+              "archiveFileName": "spresense-sdk-v2.0.2.tar.gz",
               "size": "6257789"
             },
             {
-              "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.1/spresense-sdk-v2.0.1.tar.gz",
+              "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.2/spresense-sdk-v2.0.2.tar.gz",
               "host": "i386-apple-darwin11",
-              "archiveFileName": "spresense-sdk-v2.0.1.tar.gz",
+              "archiveFileName": "spresense-sdk-v2.0.2.tar.gz",
               "size": "6257789"
             }
           ]
@@ -74,21 +74,21 @@
           "name": "spresense-tools",
           "systems": [
             {
-              "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.1/spresense-tools-v2.0.1.tar.gz",
+              "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.2/spresense-tools-v2.0.2.tar.gz",
               "host": "i686-mingw32",
-              "archiveFileName": "spresense-tools-v2.0.1.tar.gz",
+              "archiveFileName": "spresense-tools-v2.0.2.tar.gz",
               "size": "59294138"
             },
             {
               "_comment": "Allow x64-Linux build",
-              "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.1/spresense-tools-v2.0.1.tar.gz",
+              "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.2/spresense-tools-v2.0.2.tar.gz",
               "host": "x86_64-pc-linux-gnu",
-              "archiveFileName": "spresense-tools-v2.0.1.tar.gz",
+              "archiveFileName": "spresense-tools-v2.0.2.tar.gz",
               "size": "59294138"
             },            {
-              "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.1/spresense-tools-v2.0.1.tar.gz",
+              "url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.0.2/spresense-tools-v2.0.2.tar.gz",
               "host": "i386-apple-darwin11",
-              "archiveFileName": "spresense-tools-v2.0.1.tar.gz",
+              "archiveFileName": "spresense-tools-v2.0.2.tar.gz",
               "size": "59294138"
             }
           ]

diff --git a/...rdware/spresense/1.0.0/libraries/Audio/examples/application/dual_players/dual_players.ino b/...rdware/spresense/1.0.0/libraries/Audio/examples/application/dual_players/dual_players.ino
@@ -175,7 +175,11 @@ void setup()
 
   /* Mount SD card */
 
-  theSD.begin();
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
 
   /* Set output device to speaker */
 

diff --git a/...ense/1.0.0/libraries/Audio/examples/application/dual_players_objif/dual_players_objif.ino b/...ense/1.0.0/libraries/Audio/examples/application/dual_players_objif/dual_players_objif.ino
@@ -387,7 +387,11 @@ void setup()
 
   /* Mount SD card */
 
-  theSD.begin();
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
 
   /* Initialize memory pools and message libs */
 

diff --git a/...SPRESENSE/hardware/spresense/1.0.0/libraries/Audio/examples/application/player/player.ino b/...SPRESENSE/hardware/spresense/1.0.0/libraries/Audio/examples/application/player/player.ino
@@ -55,6 +55,13 @@ static void audio_attention_cb(const ErrorAttentionParam *atprm)
  */
 void setup()
 {
+  /* Initialize SD */
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
+
   // start audio system
   theAudio = AudioClass::getInstance();
 

diff --git a/...rdware/spresense/1.0.0/libraries/Audio/examples/application/player_hires/player_hires.ino b/...rdware/spresense/1.0.0/libraries/Audio/examples/application/player_hires/player_hires.ino
@@ -90,6 +90,13 @@ void setup()
       exit(1);
     }
 
+  /* Initialize SD */
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
+
   /* Open file placed on SD card */
   myFile = theSD.open("HiResSound.wav");
 

diff --git a/...rdware/spresense/1.0.0/libraries/Audio/examples/application/player_objIf/player_objIf.ino b/...rdware/spresense/1.0.0/libraries/Audio/examples/application/player_objIf/player_objIf.ino
@@ -179,6 +179,13 @@ void setup()
    */
   thePlayer->init(MediaPlayer::Player0, AS_CODECTYPE_MP3, "/mnt/sd0/BIN", AS_SAMPLINGRATE_48000, AS_CHANNEL_STEREO);
 
+  /* Initialize SD */
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
+
   myFile = theSD.open("Sound.mp3");
 
   /* Verify file open */

diff --git a/.../spresense/1.0.0/libraries/Audio/examples/application/player_playlist/player_playlist.ino b/.../spresense/1.0.0/libraries/Audio/examples/application/player_playlist/player_playlist.ino
@@ -250,9 +250,12 @@ void setup()
   printf("Repeat=%s\n", (preset.repeat) ? "On" : "Off");
   printf("Auto=%s\n", (preset.autoplay) ? "On" : "Off");
 
-  /* Use SD card */
-
-  theSD.begin();
+  /* Initialize SD */
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
 
   /* Initialize playlist */
 

diff --git a/...E/hardware/spresense/1.0.0/libraries/Audio/examples/application/player_wav/player_wav.ino b/...E/hardware/spresense/1.0.0/libraries/Audio/examples/application/player_wav/player_wav.ino
@@ -66,7 +66,12 @@ static const uint32_t sc_prestore_frames = 10;
 
 void setup()
 {
-  theSD.begin();
+  /* Initialize SD */
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
 
   // Get wav file info
 
@@ -218,4 +223,4 @@ stop_player:
   theAudio->stopPlayer(AudioClass::Player0);
   myFile.close();
   exit(1);
-}
+}
diff --git a/...SENSE/hardware/spresense/1.0.0/libraries/Audio/examples/application/rec_play/rec_play.ino b/...SENSE/hardware/spresense/1.0.0/libraries/Audio/examples/application/rec_play/rec_play.ino
@@ -61,6 +61,13 @@ static void audio_attention_cb(const ErrorAttentionParam *atprm)
  */
 void setup()
 {
+  /* Initialize SD */
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
+
   // start audio system
   theAudio = AudioClass::getInstance();
 

diff --git a/...SENSE/hardware/spresense/1.0.0/libraries/Audio/examples/application/recorder/recorder.ino b/...SENSE/hardware/spresense/1.0.0/libraries/Audio/examples/application/recorder/recorder.ino
@@ -74,6 +74,13 @@ static const int32_t recoding_size = recoding_byte_per_second * recoding_time;
 
 void setup()
 {
+  /* Initialize SD */
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
+
   theAudio = AudioClass::getInstance();
 
   theAudio->begin(audio_attention_cb);
@@ -92,8 +99,6 @@ void setup()
 
   /* Open file for data write on SD card */
 
-  theSD.begin();
-
   if (theSD.exists(RECORD_FILE_NAME))
     {
       printf("Remove existing file [%s].\n", RECORD_FILE_NAME);

diff --git a/...re/spresense/1.0.0/libraries/Audio/examples/application/recorder_objif/recorder_objif.ino b/...re/spresense/1.0.0/libraries/Audio/examples/application/recorder_objif/recorder_objif.ino
@@ -124,6 +124,13 @@ static bool mediarecorder_done_callback(AsRecorderEvent event, uint32_t result,
 
 void setup()
 {
+  /* Initialize SD */
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
+
   /* Initialize memory pools and message libs */
 
   initMemoryPools();
@@ -161,8 +168,6 @@ void setup()
 
   /* Open file for data write on SD card */
 
-  theSD.begin();
-
   if (theSD.exists(RECORD_FILE_NAME))
     {
       printf("Remove existing file [%s].\n", RECORD_FILE_NAME);

diff --git a/...rdware/spresense/1.0.0/libraries/Audio/examples/application/recorder_wav/recorder_wav.ino b/...rdware/spresense/1.0.0/libraries/Audio/examples/application/recorder_wav/recorder_wav.ino
@@ -89,6 +89,13 @@ static const int32_t recoding_size = recoding_byte_per_second * recoding_time;
 
 void setup()
 {
+  /* Initialize SD */
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
+
   theAudio = AudioClass::getInstance();
 
   theAudio->begin(audio_attention_cb);
@@ -108,8 +115,6 @@ void setup()
 
   /* Open file for data write on SD card */
 
-  theSD.begin();
-
   if (theSD.exists(RECORD_FILE_NAME))
     {
       printf("Remove existing file [%s].\n", RECORD_FILE_NAME);

diff --git a/...ense/1.0.0/libraries/Audio/examples/application/recorder_wav_objif/recorder_wav_objif.ino b/...ense/1.0.0/libraries/Audio/examples/application/recorder_wav_objif/recorder_wav_objif.ino
@@ -143,6 +143,13 @@ void setup()
 
   usleep(100 * 1000); /* waiting for Mic startup */
 
+  /* Initialize SD */
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
+
   /*
    * Initialize recorder to decode stereo wav stream with 48kHz sample rate
    * Search for SRC filter in "/mnt/sd0/BIN" directory
@@ -156,8 +163,6 @@ void setup()
                     "/mnt/sd0/BIN");
 
   /* Open file for data write on SD card */
-
-  theSD.begin();
 
   if (theSD.exists(RECORD_FILE_NAME))
     {
@@ -218,7 +223,7 @@ err_t execute_aframe(uint32_t* size)
     {
       signal_process(*size);
     }else{
-      return err;
+      return err;
     }
   int ret = s_myFile.write((uint8_t*)&s_buffer, *size);
   if (ret < 0)

diff --git a/.../libraries/Audio/examples/application/recorder_with_rendering/recorder_with_rendering.ino b/.../libraries/Audio/examples/application/recorder_with_rendering/recorder_with_rendering.ino
@@ -147,7 +147,12 @@ void mediaplayer_decode_callback(AsPcmDataParam pcm_param)
 
 void setup()
 {
-  theSD.begin();
+  /* Initialize SD */
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
 
   /* Initialize memory pools and message libs */
 

diff --git a/.../spresense/1.0.0/libraries/Audio/examples/application/rendering_objif/rendering_objif.ino b/.../spresense/1.0.0/libraries/Audio/examples/application/rendering_objif/rendering_objif.ino
@@ -23,6 +23,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <arch/board/board.h>
+
 #define READSAMPLE (240)
 #define BYTEWIDTH (2)
 #define CHNUM (2)
@@ -129,7 +131,7 @@ static enum State {
   Stopping,
 } s_state = Ready;
 
-static bool getFrame(AsPcmDataParam *pcm)
+static bool getFrame(AsPcmDataParam *pcm, bool direct_read)
 {
   /* Alloc MemHandle */
   if (pcm->mh.allocSeg(S0_REND_PCM_BUF_POOL, READSIZE) != ERR_OK) {
@@ -140,14 +142,18 @@ static bool getFrame(AsPcmDataParam *pcm)
   pcm->identifier = 0;
   pcm->callback = 0;
   pcm->bit_length = 16;
-  pcm->size = myBuffer.readbuf((uint8_t *)pcm->mh.getPa());
+  pcm->size = (direct_read) ? myFile.read((uint8_t *)pcm->mh.getPa(), READSIZE) : myBuffer.readbuf((uint8_t *)pcm->mh.getPa());
   pcm->sample = pcm->size / BYTEWIDTH / CHNUM;  
   pcm->is_end = (pcm->size < READSIZE);
   pcm->is_valid = (pcm->size > 0);
 
   return true;
 }
 
+static bool getFrame(AsPcmDataParam *pcm)
+{
+  return getFrame(pcm, false);
+}
 
 static bool start(uint8_t no)
 {
@@ -179,7 +185,7 @@ static bool start(uint8_t no)
   /* Start rendering. */
   for (int i = 0; i < RREREQUEST; i++) {
     AsPcmDataParam pcm_param;
-    if (!getFrame(&pcm_param)) {
+    if (!getFrame(&pcm_param, true)) {
       break;
     }
 
@@ -214,7 +220,7 @@ static bool restart()
 
   for (int i = 0; i < RREREQUEST; i++) {
     AsPcmDataParam pcm_param;
-    if (getFrame(&pcm_param)) {
+    if (getFrame(&pcm_param, true)) {
       /* Send PCM */
       int err = theMixer->sendData(OutputMixer0,
                                    outmixer_send_callback,
@@ -345,8 +351,12 @@ void setup()
   initMemoryPools();
   createStaticPools(MEM_LAYOUT_PLAYER);
 
-  /* Use SD card */
-  theSD.begin();
+  /* Initialize SD */
+  while (!theSD.begin())
+    {
+      /* wait until SD card is mounted. */
+      Serial.println("Insert SD card.");
+    }
 
   /* Start audio system */
   theMixer  = OutputMixer::getInstance();
@@ -370,6 +380,9 @@ void setup()
   /* Set main volume */
   theMixer->setVolume(0, 0, 0);
 
+  /* Unmute */
+  board_external_amp_mute_control(false);
+
   printf("setup() complete\n");
 }
 

diff --git a/Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Audio/library.properties b/Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Audio/library.properties
@@ -1,5 +1,5 @@
 name=Audio
-version=1.4.4
+version=1.4.5
 author=Sony Semiconductor Solutions
 maintainer=Sony Semiconductor Solutions
 sentence=Spresense Audio Subsystem Library