Merge snapshot for v1.1.3 (#14)

Commits:
  d338d9d Updating GNSS example to use GPS satellites
  8e394ab Fix bug that object I/F can't select output device
  33db1f8 Increase number of buffer for audio filtered data
  138fdb8 Change save_file name for separate spk between debug and release
  ec95377 Remove ESP configuration from platform.txt
  e986e15 Support for arduino-cli tool
  6658e62 Improve performance of EEPROM access

Author: SPRESENSE

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/boards.txt

@@ -26,12 +26,14 @@ spresense.build.stack=-Wl,--defsym,__stack=_vectors+{upload.maximum_size}
 
 spresense.menu.Debug.Disabled=Disabled
 spresense.menu.Debug.Disabled.build.debug=
-spresense.menu.Debug.Disabled.build.kernel={runtime.tools.spresense-sdk.path}/spresense/release
+spresense.menu.Debug.Disabled.build.type=release
+spresense.menu.Debug.Disabled.build.kernel={runtime.tools.spresense-sdk.path}/spresense/{build.type}
 spresense.menu.Debug.Disabled.build.libpath={build.kernel}/prebuilt
 
 spresense.menu.Debug.Enabled=Enabled
 spresense.menu.Debug.Enabled.build.debug=-DBRD_DEBUG
-spresense.menu.Debug.Enabled.build.kernel={runtime.tools.spresense-sdk.path}/spresense/debug
+spresense.menu.Debug.Enabled.build.type=debug
+spresense.menu.Debug.Enabled.build.kernel={runtime.tools.spresense-sdk.path}/spresense/{build.type}
 spresense.menu.Debug.Enabled.build.libpath={build.kernel}/prebuilt
 
 spresense.menu.UploadSpeed.115200=115200

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Audio/MediaPlayer.cpp

@@ -102,6 +102,11 @@ err_t MediaPlayer::create(PlayerId id, AudioAttentionCb attcb)
 }
 
 /*--------------------------------------------------------------------------*/
+err_t MediaPlayer::activate(PlayerId id, MediaPlayerCallback mpcb)
+{
+  return MediaPlayer::activate(id, AS_SETPLAYER_OUTPUTDEVICE_SPHP, mpcb);
+}
+
 err_t MediaPlayer::activate(PlayerId id, uint8_t output_device, MediaPlayerCallback mpcb)
 {
   CMN_SimpleFifoHandle *handle =

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Audio/MediaPlayer.h

@@ -129,16 +129,28 @@ class MediaPlayer
    * @brief Activate the MediaPlayer
    *
    * @details This function activates media player system.
-   *          You should specify output device which you would like to sound.
-   *          You can set "Speaker/HeadPhone-out" or "I2S-out".
    *          The result of APIs will be returnd by callback function which is
    *          specified by this function.
    *
    */
 
   err_t activate(
       PlayerId id,             /**< Select Player ID. */
-      uint8_t output_device,   /**< Set output device. AS_SETPLAYER_OUTPUTDEVICE_SPHP, AS_SETPLAYER_OUTPUTDEVICE_I2SOUTPUT*/
+      MediaPlayerCallback mpcb /**< Sepcify callback function which is called to notify API results. */
+  );
+
+  /**
+   * @brief Activate the MediaPlayer (old interface)
+   *
+   * @details This function activates media player system.
+   *          The result of APIs will be returnd by callback function which is
+   *          specified by this function.
+   *
+   */
+
+  err_t activate(
+      PlayerId id,             /**< Select Player ID. */
+      uint8_t output_device,   /**< Set output device.(_not supported_)*/
       MediaPlayerCallback mpcb /**< Sepcify callback function which is called to notify API results. */
   );
 

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Audio/OutputMixer.cpp

@@ -93,10 +93,17 @@ err_t OutputMixer::create(AudioAttentionCb attcb)
 
 /*--------------------------------------------------------------------------*/
 err_t OutputMixer::activate(AsOutputMixerHandle handle, OutputMixerCallback omcb)
+{
+  return activate(handle, HPOutputDevice, omcb);
+}
+
+err_t OutputMixer::activate(AsOutputMixerHandle handle,
+                            uint8_t output_device,
+                            OutputMixerCallback omcb)
 {
   AsActivateOutputMixer mixer_act;
 
-  mixer_act.output_device = HPOutputDevice;
+  mixer_act.output_device = output_device;
   mixer_act.mixer_type    = MainOnly;
   mixer_act.cb            = omcb;
 

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Audio/OutputMixer.h

@@ -100,11 +100,26 @@ class OutputMixer
    * @details This function activates output mixer system.
    *          The result of APIs will be returnd by callback function which is
    *          specified by this function.
+   *          Output device is speaker output fixed.
+   */
+
+  err_t activate(
+      AsOutputMixerHandle handle, /**< Select output mixer handle. OutputMixer0 or OutputMixer1 */
+      OutputMixerCallback omcb    /**< Sepcify callback function which is called to notify API results. */
+  );
+
+  /**
+   * @brief Activate the OutputMixer with specify output device
    *
+   * @details This function activates output mixer system.
+   *          The result of APIs will be returnd by callback function which is
+   *          specified by this function.
+   *          This I/F can specify output device as speaker or i2s.
    */
 
   err_t activate(
       AsOutputMixerHandle handle, /**< Select output mixer handle. OutputMixer0 or OutputMixer1 */
+      uint8_t output_device,      /**< Select output device. HPOutputDevice or I2SOutputDevice */
       OutputMixerCallback omcb    /**< Sepcify callback function which is called to notify API results. */
   );
 

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Audio/examples/application/player_ObjIf/player_ObjIf.ino

@@ -159,10 +159,17 @@ void setup()
 
   theMixer->setRenderingClkMode(OUTPUTMIXER_RNDCLK_NORMAL);
 
-  /* Activate Objects. Set output device to Speakers/Headphones */
-  thePlayer->activate(MediaPlayer::Player0, AS_SETPLAYER_OUTPUTDEVICE_SPHP, mediaplayer_done_callback);
+  /* Activate Player Object */
 
-  theMixer->activate(OutputMixer0, outputmixer_done_callback);
+  thePlayer->activate(MediaPlayer::Player0, mediaplayer_done_callback);
+
+  /* Activate Mixer Object.
+   * Set output device to speaker with 2nd argument.
+   * If you want to change the output device to I2S,
+   * specify "I2SOutputDevice" as an argument.
+   */
+
+  theMixer->activate(OutputMixer0, HPOutputDevice, outputmixer_done_callback);
 
   usleep(100 * 1000);
 

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Audio/memutil/mem_layout.h

@@ -197,43 +197,43 @@
 /* Remainder AUDIO_WORK_AREA=0x00003884 */
 
 /* Layout1: */
-#define MEMMGR_L1_WORK_SIZE   0x00000060
+#define MEMMGR_L1_WORK_SIZE   0x00000068
 
 /* Skip 0x0004 bytes for alignment. */
 #define L1_OUTPUT_BUF_POOL_ALIGN    0x00000008
 #define L1_OUTPUT_BUF_POOL_L_FENCE  0x000c0004
 #define L1_OUTPUT_BUF_POOL_ADDR     0x000c0008
-#define L1_OUTPUT_BUF_POOL_SIZE     0x00006000
-#define L1_OUTPUT_BUF_POOL_U_FENCE  0x000c6008
-#define L1_OUTPUT_BUF_POOL_NUM_SEG  0x00000002
+#define L1_OUTPUT_BUF_POOL_SIZE     0x0000f000
+#define L1_OUTPUT_BUF_POOL_U_FENCE  0x000cf008
+#define L1_OUTPUT_BUF_POOL_NUM_SEG  0x00000005
 #define L1_OUTPUT_BUF_POOL_SEG_SIZE 0x00003000
 
 #define L1_MIC_IN_BUF_POOL_ALIGN    0x00000008
-#define L1_MIC_IN_BUF_POOL_L_FENCE  0x000c600c
-#define L1_MIC_IN_BUF_POOL_ADDR     0x000c6010
+#define L1_MIC_IN_BUF_POOL_L_FENCE  0x000cf00c
+#define L1_MIC_IN_BUF_POOL_ADDR     0x000cf010
 #define L1_MIC_IN_BUF_POOL_SIZE     0x00014000
-#define L1_MIC_IN_BUF_POOL_U_FENCE  0x000da010
+#define L1_MIC_IN_BUF_POOL_U_FENCE  0x000e3010
 #define L1_MIC_IN_BUF_POOL_NUM_SEG  0x00000005
 #define L1_MIC_IN_BUF_POOL_SEG_SIZE 0x00004000
 
 #define L1_ENC_APU_CMD_POOL_ALIGN    0x00000008
-#define L1_ENC_APU_CMD_POOL_L_FENCE  0x000da014
-#define L1_ENC_APU_CMD_POOL_ADDR     0x000da018
+#define L1_ENC_APU_CMD_POOL_L_FENCE  0x000e3014
+#define L1_ENC_APU_CMD_POOL_ADDR     0x000e3018
 #define L1_ENC_APU_CMD_POOL_SIZE     0x00000114
-#define L1_ENC_APU_CMD_POOL_U_FENCE  0x000da12c
+#define L1_ENC_APU_CMD_POOL_U_FENCE  0x000e312c
 #define L1_ENC_APU_CMD_POOL_NUM_SEG  0x00000003
 #define L1_ENC_APU_CMD_POOL_SEG_SIZE 0x0000005c
 
 /* Skip 0x0004 bytes for alignment. */
 #define L1_SRC_APU_CMD_POOL_ALIGN    0x00000008
-#define L1_SRC_APU_CMD_POOL_L_FENCE  0x000da134
-#define L1_SRC_APU_CMD_POOL_ADDR     0x000da138
+#define L1_SRC_APU_CMD_POOL_L_FENCE  0x000e3134
+#define L1_SRC_APU_CMD_POOL_ADDR     0x000e3138
 #define L1_SRC_APU_CMD_POOL_SIZE     0x00000114
-#define L1_SRC_APU_CMD_POOL_U_FENCE  0x000da24c
+#define L1_SRC_APU_CMD_POOL_U_FENCE  0x000e324c
 #define L1_SRC_APU_CMD_POOL_NUM_SEG  0x00000003
 #define L1_SRC_APU_CMD_POOL_SEG_SIZE 0x0000005c
 
-/* Remainder AUDIO_WORK_AREA=0x00022db0 */
+/* Remainder AUDIO_WORK_AREA=0x00019db0 */
 
 /* Layout2: */
 #define MEMMGR_L2_WORK_SIZE   0x00000090

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Audio/memutil/pool_layout.h

@@ -59,10 +59,10 @@ extern const PoolAttr MemoryPoolLayouts[NUM_MEM_LAYOUTS][NUM_MEM_POOLS] = {
  },
  {/* Layout:1 */
   /* pool_ID          type       seg fence  addr        size         */
-  { OUTPUT_BUF_POOL , BasicType,   2, true, 0x000c0008, 0x00006000 },  /* AUDIO_WORK_AREA */
-  { MIC_IN_BUF_POOL , BasicType,   5, true, 0x000c6010, 0x00014000 },  /* AUDIO_WORK_AREA */
-  { ENC_APU_CMD_POOL, BasicType,   3, true, 0x000da018, 0x00000114 },  /* AUDIO_WORK_AREA */
-  { SRC_APU_CMD_POOL, BasicType,   3, true, 0x000da138, 0x00000114 },  /* AUDIO_WORK_AREA */
+  { OUTPUT_BUF_POOL , BasicType,   5, true, 0x000c0008, 0x0000f000 },  /* AUDIO_WORK_AREA */
+  { MIC_IN_BUF_POOL , BasicType,   5, true, 0x000cf010, 0x00014000 },  /* AUDIO_WORK_AREA */
+  { ENC_APU_CMD_POOL, BasicType,   3, true, 0x000e3018, 0x00000114 },  /* AUDIO_WORK_AREA */
+  { SRC_APU_CMD_POOL, BasicType,   3, true, 0x000e3138, 0x00000114 },  /* AUDIO_WORK_AREA */
  },
  {/* Layout:2 */
   /* pool_ID          type       seg fence  addr        size         */

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino

@@ -15,9 +15,9 @@ void setup() {
   pinMode(LED_BUILTIN, OUTPUT);
 
 #if defined(ARDUINO_ARCH_SPRESENSE)
-  // Just remove a eeprom emulation file. When EEPROM is used later,
-  // the a zero-filled eeprom file is newly generated.
-  unlink(EEPROM_EMU);
+  // After removing a eeprom emulation file, the a zero-filled eeprom file
+  // is newly generated.
+  EEPROM.clear();
 #else
   /***
     Iterate through each byte of the EEPROM storage.

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/EEPROM/examples/eeprom_crc/eeprom_crc.ino

@@ -32,6 +32,10 @@ void loop() {
   /* Empty loop */
 }
 
+#if defined(ARDUINO_ARCH_SPRESENSE)
+uint8_t eeprom[E2END];
+#endif
+
 unsigned long eeprom_crc(void) {
 
   const unsigned long crc_table[16] = {
@@ -43,10 +47,19 @@ unsigned long eeprom_crc(void) {
 
   unsigned long crc = ~0L;
 
+#if defined(ARDUINO_ARCH_SPRESENSE)
+  EEPROM.get(0, eeprom);
+  for (int index = 0 ; index < EEPROM.length()  ; ++index) {
+    crc = crc_table[(crc ^ eeprom[index]) & 0x0f] ^ (crc >> 4);
+    crc = crc_table[(crc ^ (eeprom[index] >> 4)) & 0x0f] ^ (crc >> 4);
+    crc = ~crc;
+  }
+#else
   for (int index = 0 ; index < EEPROM.length()  ; ++index) {
     crc = crc_table[(crc ^ EEPROM[index]) & 0x0f] ^ (crc >> 4);
     crc = crc_table[(crc ^ (EEPROM[index] >> 4)) & 0x0f] ^ (crc >> 4);
     crc = ~crc;
   }
+#endif
   return crc;
 }

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/EEPROM/src/EEPROM.cpp

@@ -24,49 +24,13 @@
 
 #include "EEPROM.h"
 
-// Create a eeprom emulation file if it doesn't exist
-void EERef::createInitialFile() const
-{
-  int ret;
-  FILE *fp = NULL;
-  struct stat statBuf;
-  long filesize = -1;
-  long eepromsize = E2END;
-
-  /* Check whether the eeprom emulation file has already existed or not */
-  if (0 == stat(EEPROM_EMU, &statBuf)) {
-    filesize = statBuf.st_size;
-  }
-
-  if (eepromsize == filesize) {
-    /* Already existed if the file size is equal to the eeprom size */
-    return;
-  }
-
-  /* Create a new file */
-  if ((fp = fopen(EEPROM_EMU, "wb")) == NULL) {
-    printf("ERROR: eeprom open failure\n");
-  }
-  uint8_t *ptr = (uint8_t*)zalloc(eepromsize);
-  ret = fwrite(ptr, 1, eepromsize, fp);
-  if (ret != eepromsize) {
-    printf("ERROR: eeprom init failure (%d)\n", ret);
-  }
-
-  fclose(fp);
-  return;
-}
-
 // Read a byte from the address specified by index on a eeprom emulation file
 uint8_t EERef::operator*() const
 {
   int ret;
   FILE *fp = NULL;
   uint8_t value = 0;
 
-  /* Create a new file if the emulation file doesn't exist */
-  createInitialFile();
-
   if ((fp = fopen(EEPROM_EMU, "rb")) == NULL) {
     printf("ERROR: eeprom open failure\n");
     goto errout;
@@ -94,9 +58,6 @@ EERef& EERef::operator=( uint8_t in )
   int ret;
   FILE *fp = NULL;
 
-  /* Create a new file if the emulation file doesn't exist */
-  createInitialFile();
-
   if ((fp = fopen(EEPROM_EMU, "ab+")) == NULL) {
     printf("ERROR: eeprom open failure\n");
     goto errout;
@@ -118,3 +79,5 @@ EERef& EERef::operator=( uint8_t in )
 errout:
   return *this;
 }
+
+EEPROMClass EEPROM;