Skip to content

Commit ae70324

Browse files
SPRESENSESPRESENSE
authored
Merge pull request #200 from sonydevworld/develop
Merge develop into master for v3.0.0 release
2 parents 1eba2ab + 0632424 commit ae70324

File tree

64 files changed

+951
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+951
-175
lines changed

‎Arduino15/package_spresense_index.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
{
1212
"category": "SPRESENSE",
1313
"name": "Spresense Reference Board",
14-
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-v2.6.0.tar.gz",
14+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.0.0/spresense-v3.0.0.tar.gz",
1515
"help": {
1616
"online": "https://github.com/sonydevworld/spresense-arduino-compatible/releases"
1717
},
1818
"version": "1.0.0",
1919
"architecture": "spresense",
20-
"archiveFileName": "spresense-v2.6.0.tar.gz",
20+
"archiveFileName": "spresense-v3.0.0.tar.gz",
2121
"boards": [
2222
{
2323
"name": "Generic Spresense Module"
@@ -49,22 +49,22 @@
4949
"name": "spresense-sdk",
5050
"systems": [
5151
{
52-
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-sdk-v2.6.0.tar.gz",
52+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.0.0/spresense-sdk-v3.0.0.tar.gz",
5353
"host": "i686-mingw32",
54-
"archiveFileName": "spresense-sdk-v2.6.0.tar.gz",
54+
"archiveFileName": "spresense-sdk-v3.0.0.tar.gz",
5555
"size": "6257789"
5656
},
5757
{
5858
"_comment": "Allow x64-Linux build",
59-
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-sdk-v2.6.0.tar.gz",
59+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.0.0/spresense-sdk-v3.0.0.tar.gz",
6060
"host": "x86_64-pc-linux-gnu",
61-
"archiveFileName": "spresense-sdk-v2.6.0.tar.gz",
61+
"archiveFileName": "spresense-sdk-v3.0.0.tar.gz",
6262
"size": "6257789"
6363
},
6464
{
65-
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-sdk-v2.6.0.tar.gz",
65+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.0.0/spresense-sdk-v3.0.0.tar.gz",
6666
"host": "i386-apple-darwin11",
67-
"archiveFileName": "spresense-sdk-v2.6.0.tar.gz",
67+
"archiveFileName": "spresense-sdk-v3.0.0.tar.gz",
6868
"size": "6257789"
6969
}
7070
]
@@ -74,21 +74,21 @@
7474
"name": "spresense-tools",
7575
"systems": [
7676
{
77-
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-tools-v2.6.0.tar.gz",
77+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.0.0/spresense-tools-v3.0.0.tar.gz",
7878
"host": "i686-mingw32",
79-
"archiveFileName": "spresense-tools-v2.6.0.tar.gz",
79+
"archiveFileName": "spresense-tools-v3.0.0.tar.gz",
8080
"size": "59294138"
8181
},
8282
{
8383
"_comment": "Allow x64-Linux build",
84-
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-tools-v2.6.0.tar.gz",
84+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.0.0/spresense-tools-v3.0.0.tar.gz",
8585
"host": "x86_64-pc-linux-gnu",
86-
"archiveFileName": "spresense-tools-v2.6.0.tar.gz",
86+
"archiveFileName": "spresense-tools-v3.0.0.tar.gz",
8787
"size": "59294138"
8888
}, {
89-
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-tools-v2.6.0.tar.gz",
89+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.0.0/spresense-tools-v3.0.0.tar.gz",
9090
"host": "i386-apple-darwin11",
91-
"archiveFileName": "spresense-tools-v2.6.0.tar.gz",
91+
"archiveFileName": "spresense-tools-v3.0.0.tar.gz",
9292
"size": "59294138"
9393
}
9494
]

‎Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/cores/spresense/WInterrupt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <arch/chip/pin.h>
2626
#include <nuttx/irq.h>
2727
#include <nuttx/arch.h>
28-
#include <common/arm_arch.h>
28+
#include <common/arm_internal.h>
2929
#include <chip/hardware/cxd5602_memorymap.h>
3030
#include <chip/hardware/cxd5602_topreg.h>
3131

‎Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/cores/spresense/multi_print.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <cxd56_sph.h>
2626
#include <nuttx/irq.h>
2727
#include <nuttx/arch.h>
28-
#include <common/arm_arch.h>
28+
#include <common/arm_internal.h>
2929
#include <armv7-m/nvic.h>
3030
#include <fcntl.h>
3131
#include <sys/ioctl.h>

‎Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/cores/spresense/time.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
# error Please enable RTC High Resolution in NuttX
3737
#endif // CONFIG_RTC_HIRES
3838

39-
#ifndef CONFIG_CLOCK_MONOTONIC
40-
# error Please enable monotonic clock in NuttX
41-
#endif // CONFIG_CLOCK_MONOTONIC
42-
4339
#define DELAY_CORRECTION (700)
4440
#define DELAY_INTERVAL (50)
4541

‎Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/cores/spresense/timer_utility.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <sys/ioctl.h>
77
#include <assert.h>
88
#include <errno.h>
9-
#include <common/arm_arch.h>
9+
#include <common/arm_internal.h>
1010
#include <cxd56_clock.h>
1111
#include <hardware/cxd56_timer.h>
1212
#include <arch/chip/timer.h>

‎Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/cores/spresense/wiring_analog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <fcntl.h>
2727
#include <unistd.h>
2828
#include <sys/ioctl.h>
29-
#include <common/arm_arch.h>
29+
#include <common/arm_internal.h>
3030
#include <nuttx/arch.h>
3131
#include <nuttx/config.h>
3232
#include <sdk/config.h>

‎Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/cores/spresense/wiring_digital.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <arch/chip/pin.h>
2626
#include <chip/hardware/cxd5602_memorymap.h>
2727
#include <chip/hardware/cxd5602_topreg.h>
28-
#include <common/arm_arch.h>
28+
#include <common/arm_internal.h>
2929
#include <Arduino.h>
3030
#include "utility.h"
3131
#include "wiring_private.h"

‎Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/cores/spresense/wiring_pulse.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424

2525
#include <stdio.h>
26-
#include <common/arm_arch.h>
26+
#include <common/arm_internal.h>
2727
#include <Arduino.h>
2828
#include "wiring_private.h"
2929
#include "wiring.h"

‎Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/cores/spresense/wiring_tone.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <sys/ioctl.h>
2727
#include <nuttx/config.h>
2828
#include <sdk/config.h>
29-
#include <common/arm_arch.h>
29+
#include <common/arm_internal.h>
3030
#include <Arduino.h>
3131
#include "utility.h"
3232
#include "wiring_private.h"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,6 +1357,8 @@ err_t AudioClass::writeWavHeader(File& myFile)
13571357
return AUDIOLIB_ECODE_FILEACCESS_ERROR;
13581358
}
13591359

1360+
m_es_size = 0;
1361+
13601362
return AUDIOLIB_ECODE_OK;
13611363
}
13621364

‎Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Audio/MediaRecorder.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,8 @@ err_t MediaRecorder::writeWavHeader(File& myfile)
616616
return MEDIARECORDER_ECODE_FILEACCESS_ERROR;
617617
}
618618

619+
m_es_size = 0;
620+
619621
return MEDIARECORDER_ECODE_OK;
620622
}
621623

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,20 +118,20 @@ void loop()
118118

119119
theAudio->setBeep(1,-40,theNote.fs);
120120

121-
/* The usleep() function suspends execution of the calling thread for usec
122-
* microseconds. But the timer resolution depends on the OS system tick time
123-
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
124-
* it will sleep for a longer time than the time requested here.
121+
/* The usleep() function suspends execution of the calling thread for usec
122+
* microseconds. But the timer resolution depends on the OS system tick time
123+
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
124+
* it will sleep for a longer time than the time requested here.
125125
*/
126126

127127
usleep(theNote.time * 1000);
128128

129129
theAudio->setBeep(0,0,0);
130130

131-
/* The usleep() function suspends execution of the calling thread for usec
132-
* microseconds. But the timer resolution depends on the OS system tick time
133-
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
134-
* it will sleep for a longer time than the time requested here.
131+
/* The usleep() function suspends execution of the calling thread for usec
132+
* microseconds. But the timer resolution depends on the OS system tick time
133+
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
134+
* it will sleep for a longer time than the time requested here.
135135
*/
136136

137137
usleep(100000);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ void play_process( AudioClass *theAudio, AudioClass::PlayerId play_id, File& fil
5858
break;
5959
}
6060

61-
/* The usleep() function suspends execution of the calling thread for usec
62-
* microseconds. But the timer resolution depends on the OS system tick time
63-
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
64-
* it will sleep for a longer time than the time requested here.
61+
/* The usleep() function suspends execution of the calling thread for usec
62+
* microseconds. But the timer resolution depends on the OS system tick time
63+
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
64+
* it will sleep for a longer time than the time requested here.
6565
*/
6666

6767
usleep(40000);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ SDClass theSD;
6464
/**
6565
* @brief Audio(player0) attention callback
6666
*
67-
* When audio internal error occurc, this function will be called back.
67+
* When audio internal error occurs, this function will be called back.
6868
*/
6969

7070
static void attention_player_cb(const ErrorAttentionParam *atprm)
@@ -259,10 +259,10 @@ void play_process( MediaPlayer *thePlayer, struct PLAY_ELM_T *elm, File& file)
259259
* Please adjust in according with the processing contents
260260
* being processed at the same time by Application.
261261
*
262-
* The usleep() function suspends execution of the calling thread for usec
263-
* microseconds. But the timer resolution depends on the OS system tick time
264-
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
265-
* it will sleep for a longer time than the time requested here.
262+
* The usleep() function suspends execution of the calling thread for usec
263+
* microseconds. But the timer resolution depends on the OS system tick time
264+
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
265+
* it will sleep for a longer time than the time requested here.
266266
*/
267267

268268
usleep(40000);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ bool ErrEnd = false;
3030
/**
3131
* @brief Audio attention callback
3232
*
33-
* When audio internal error occurc, this function will be called back.
33+
* When audio internal error occurs, this function will be called back.
3434
*/
3535

3636
void audio_attention_cb(const ErrorAttentionParam *atprm)
@@ -153,10 +153,10 @@ void loop() {
153153
* Please adjust in according with the processing contents
154154
* being processed at the same time by Application.
155155
*
156-
* The usleep() function suspends execution of the calling thread for usec
157-
* microseconds. But the timer resolution depends on the OS system tick time
158-
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
159-
* it will sleep for a longer time than the time requested here.
156+
* The usleep() function suspends execution of the calling thread for usec
157+
* microseconds. But the timer resolution depends on the OS system tick time
158+
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
159+
* it will sleep for a longer time than the time requested here.
160160
*/
161161

162162
// usleep(10000);
@@ -190,4 +190,4 @@ exitRecording:
190190
puts("End Recording");
191191
exit(1);
192192

193-
}
193+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ bool ErrEnd = false;
4242
/**
4343
* @brief Frontend attention callback
4444
*
45-
* When audio internal error occurc, this function will be called back.
45+
* When audio internal error occurs, this function will be called back.
4646
*/
4747

4848
void frontend_attention_cb(const ErrorAttentionParam *param)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ bool ErrEnd = false;
3030
/**
3131
* @brief Audio attention callback
3232
*
33-
* When audio internal error occurc, this function will be called back.
33+
* When audio internal error occurs, this function will be called back.
3434
*/
3535

3636
static void audio_attention_cb(const ErrorAttentionParam *atprm)
@@ -158,10 +158,10 @@ void loop()
158158
* Please adjust in according with the processing contents
159159
* being processed at the same time by Application.
160160
*
161-
* The usleep() function suspends execution of the calling thread for usec
162-
* microseconds. But the timer resolution depends on the OS system tick time
163-
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
164-
* it will sleep for a longer time than the time requested here.
161+
* The usleep() function suspends execution of the calling thread for usec
162+
* microseconds. But the timer resolution depends on the OS system tick time
163+
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
164+
* it will sleep for a longer time than the time requested here.
165165
*/
166166

167167
usleep(40000);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ bool ErrEnd = false;
3030
/**
3131
* @brief Audio attention callback
3232
*
33-
* When audio internal error occurc, this function will be called back.
33+
* When audio internal error occurs, this function will be called back.
3434
*/
3535

3636
static void audio_attention_cb(const ErrorAttentionParam *atprm)
@@ -162,10 +162,10 @@ void loop()
162162
* Please adjust in according with the processing contents
163163
* being processed at the same time by Application.
164164
*
165-
* The usleep() function suspends execution of the calling thread for usec
166-
* microseconds. But the timer resolution depends on the OS system tick time
167-
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
168-
* it will sleep for a longer time than the time requested here.
165+
* The usleep() function suspends execution of the calling thread for usec
166+
* microseconds. But the timer resolution depends on the OS system tick time
167+
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
168+
* it will sleep for a longer time than the time requested here.
169169
*/
170170

171171
usleep(1000);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ bool ErrEnd = false;
3434
/**
3535
* @brief Audio attention callback
3636
*
37-
* When audio internal error occurc, this function will be called back.
37+
* When audio internal error occurs, this function will be called back.
3838
*/
3939

4040
static void attention_cb(const ErrorAttentionParam *atprm)
@@ -246,10 +246,10 @@ void loop()
246246
* Please adjust in according with the processing contents
247247
* being processed at the same time by Application.
248248
*
249-
* The usleep() function suspends execution of the calling thread for usec
250-
* microseconds. But the timer resolution depends on the OS system tick time
251-
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
252-
* it will sleep for a longer time than the time requested here.
249+
* The usleep() function suspends execution of the calling thread for usec
250+
* microseconds. But the timer resolution depends on the OS system tick time
251+
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
252+
* it will sleep for a longer time than the time requested here.
253253
*/
254254

255255
usleep(40000);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -465,10 +465,10 @@ void loop()
465465
* Please adjust in according with the processing contents
466466
* being processed at the same time by Application.
467467
*
468-
* The usleep() function suspends execution of the calling thread for usec
469-
* microseconds. But the timer resolution depends on the OS system tick time
470-
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
471-
* it will sleep for a longer time than the time requested here.
468+
* The usleep() function suspends execution of the calling thread for usec
469+
* microseconds. But the timer resolution depends on the OS system tick time
470+
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
471+
* it will sleep for a longer time than the time requested here.
472472
*/
473473

474474
usleep(1000);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ bool ErrEnd = false;
3838
/**
3939
* @brief Audio attention callback
4040
*
41-
* When audio internal error occurc, this function will be called back.
41+
* When audio internal error occurs, this function will be called back.
4242
*/
4343

4444
static void audio_attention_cb(const ErrorAttentionParam *atprm)
@@ -211,10 +211,10 @@ void loop()
211211
* Please adjust in according with the processing contents
212212
* being processed at the same time by Application.
213213
*
214-
* The usleep() function suspends execution of the calling thread for usec
215-
* microseconds. But the timer resolution depends on the OS system tick time
216-
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
217-
* it will sleep for a longer time than the time requested here.
214+
* The usleep() function suspends execution of the calling thread for usec
215+
* microseconds. But the timer resolution depends on the OS system tick time
216+
* which is 10 milliseconds (10,000 microseconds) by default. Therefore,
217+
* it will sleep for a longer time than the time requested here.
218218
*/
219219

220220
usleep(1000);

0 commit comments

Comments
 (0)