Skip to content

Commit 1eba2ab

Browse files
SPRESENSESPRESENSE
authored
Merge pull request #175 from sonydevworld/develop
Merge develop into master for v2.6.0 release
2 parents 8b249ba + 1e7c592 commit 1eba2ab

File tree

6 files changed

+41
-29
lines changed

6 files changed

+41
-29
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.5.1/spresense-v2.5.1.tar.gz",
14+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-v2.6.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.5.1.tar.gz",
20+
"archiveFileName": "spresense-v2.6.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.5.1/spresense-sdk-v2.5.1.tar.gz",
52+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-sdk-v2.6.0.tar.gz",
5353
"host": "i686-mingw32",
54-
"archiveFileName": "spresense-sdk-v2.5.1.tar.gz",
54+
"archiveFileName": "spresense-sdk-v2.6.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.5.1/spresense-sdk-v2.5.1.tar.gz",
59+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-sdk-v2.6.0.tar.gz",
6060
"host": "x86_64-pc-linux-gnu",
61-
"archiveFileName": "spresense-sdk-v2.5.1.tar.gz",
61+
"archiveFileName": "spresense-sdk-v2.6.0.tar.gz",
6262
"size": "6257789"
6363
},
6464
{
65-
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.5.1/spresense-sdk-v2.5.1.tar.gz",
65+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-sdk-v2.6.0.tar.gz",
6666
"host": "i386-apple-darwin11",
67-
"archiveFileName": "spresense-sdk-v2.5.1.tar.gz",
67+
"archiveFileName": "spresense-sdk-v2.6.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.5.1/spresense-tools-v2.5.1.tar.gz",
77+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-tools-v2.6.0.tar.gz",
7878
"host": "i686-mingw32",
79-
"archiveFileName": "spresense-tools-v2.5.1.tar.gz",
79+
"archiveFileName": "spresense-tools-v2.6.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.5.1/spresense-tools-v2.5.1.tar.gz",
84+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-tools-v2.6.0.tar.gz",
8585
"host": "x86_64-pc-linux-gnu",
86-
"archiveFileName": "spresense-tools-v2.5.1.tar.gz",
86+
"archiveFileName": "spresense-tools-v2.6.0.tar.gz",
8787
"size": "59294138"
8888
}, {
89-
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.5.1/spresense-tools-v2.5.1.tar.gz",
89+
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v2.6.0/spresense-tools-v2.6.0.tar.gz",
9090
"host": "i386-apple-darwin11",
91-
"archiveFileName": "spresense-tools-v2.5.1.tar.gz",
91+
"archiveFileName": "spresense-tools-v2.6.0.tar.gz",
9292
"size": "59294138"
9393
}
9494
]

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

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,40 @@ spresense.menu.Memory.1280.upload.maximum_data_size=1310720
8484
spresense.menu.Memory.1408.upload.maximum_data_size=1441792
8585
spresense.menu.Memory.1536.upload.maximum_data_size=1572864
8686

87-
spresense.build.extra_flags=-DSUBCORE={index}
8887
spresense.menu.Core.Main.build.extra_flags=
88+
spresense.menu.Core.Sub1.build.extra_flags=-DSUBCORE=1
89+
spresense.menu.Core.Sub2.build.extra_flags=-DSUBCORE=2
90+
spresense.menu.Core.Sub3.build.extra_flags=-DSUBCORE=3
91+
spresense.menu.Core.Sub4.build.extra_flags=-DSUBCORE=4
92+
spresense.menu.Core.Sub5.build.extra_flags=-DSUBCORE=5
8993

90-
spresense.build.type_prefix=subcore-
9194
spresense.menu.Core.Main.build.type_prefix=
95+
spresense.menu.Core.Sub1.build.type_prefix=subcore-
96+
spresense.menu.Core.Sub2.build.type_prefix=subcore-
97+
spresense.menu.Core.Sub3.build.type_prefix=subcore-
98+
spresense.menu.Core.Sub4.build.type_prefix=subcore-
99+
spresense.menu.Core.Sub5.build.type_prefix=subcore-
92100

93-
spresense.build.variant=spresense_sub
94101
spresense.menu.Core.Main.build.variant=spresense
102+
spresense.menu.Core.Sub1.build.variant=spresense_sub
103+
spresense.menu.Core.Sub2.build.variant=spresense_sub
104+
spresense.menu.Core.Sub3.build.variant=spresense_sub
105+
spresense.menu.Core.Sub4.build.variant=spresense_sub
106+
spresense.menu.Core.Sub5.build.variant=spresense_sub
95107

96-
spresense.build.stack=
97108
spresense.menu.Core.Main.build.stack=-Wl,--defsym,__reserved_ramsize=1572864-{upload.maximum_size}
109+
spresense.menu.Core.Sub1.build.stack=
110+
spresense.menu.Core.Sub2.build.stack=
111+
spresense.menu.Core.Sub3.build.stack=
112+
spresense.menu.Core.Sub4.build.stack=
113+
spresense.menu.Core.Sub5.build.stack=
98114

99-
spresense.build.libs="{build.libpath}/libapps.a" "{build.libpath}/libarch.a" "{build.libpath}/libarm_cortexM4lf_math.a" "{build.libpath}/libbinfmt.a" "{build.libpath}/libboard.a" "{build.libpath}/libboards.a" "{build.libpath}/libc.a" "{build.libpath}/libcmsis_nn.a" "{build.libpath}/libdrivers.a" "{build.libpath}/libfs.a" "{build.libpath}/libmm.a" "{build.libpath}/libsched.a" "{build.libpath}/libxx.a"
100115
spresense.menu.Core.Main.build.libs="{build.libpath}/libapps.a" "{build.libpath}/libarch.a" "{build.libpath}/libarm_cortexM4lf_math.a" "{build.libpath}/libaudio.a" "{build.libpath}/libbinfmt.a" "{build.libpath}/libboard.a" "{build.libpath}/libboards.a" "{build.libpath}/libc.a" "{build.libpath}/libcmsis_nn.a" "{build.libpath}/libdrivers.a" "{build.libpath}/libfs.a" "{build.libpath}/libmm.a" "{build.libpath}/libnet.a" "{build.libpath}/libnnablart.a" "{build.libpath}/libsched.a" "{build.libpath}/libsslutils.a" "{build.libpath}/libxx.a"
116+
spresense.menu.Core.Sub1.build.libs="{build.libpath}/libapps.a" "{build.libpath}/libarch.a" "{build.libpath}/libarm_cortexM4lf_math.a" "{build.libpath}/libbinfmt.a" "{build.libpath}/libboard.a" "{build.libpath}/libboards.a" "{build.libpath}/libc.a" "{build.libpath}/libcmsis_nn.a" "{build.libpath}/libdrivers.a" "{build.libpath}/libfs.a" "{build.libpath}/libmm.a" "{build.libpath}/libsched.a" "{build.libpath}/libxx.a"
117+
spresense.menu.Core.Sub2.build.libs="{build.libpath}/libapps.a" "{build.libpath}/libarch.a" "{build.libpath}/libarm_cortexM4lf_math.a" "{build.libpath}/libbinfmt.a" "{build.libpath}/libboard.a" "{build.libpath}/libboards.a" "{build.libpath}/libc.a" "{build.libpath}/libcmsis_nn.a" "{build.libpath}/libdrivers.a" "{build.libpath}/libfs.a" "{build.libpath}/libmm.a" "{build.libpath}/libsched.a" "{build.libpath}/libxx.a"
118+
spresense.menu.Core.Sub3.build.libs="{build.libpath}/libapps.a" "{build.libpath}/libarch.a" "{build.libpath}/libarm_cortexM4lf_math.a" "{build.libpath}/libbinfmt.a" "{build.libpath}/libboard.a" "{build.libpath}/libboards.a" "{build.libpath}/libc.a" "{build.libpath}/libcmsis_nn.a" "{build.libpath}/libdrivers.a" "{build.libpath}/libfs.a" "{build.libpath}/libmm.a" "{build.libpath}/libsched.a" "{build.libpath}/libxx.a"
119+
spresense.menu.Core.Sub4.build.libs="{build.libpath}/libapps.a" "{build.libpath}/libarch.a" "{build.libpath}/libarm_cortexM4lf_math.a" "{build.libpath}/libbinfmt.a" "{build.libpath}/libboard.a" "{build.libpath}/libboards.a" "{build.libpath}/libc.a" "{build.libpath}/libcmsis_nn.a" "{build.libpath}/libdrivers.a" "{build.libpath}/libfs.a" "{build.libpath}/libmm.a" "{build.libpath}/libsched.a" "{build.libpath}/libxx.a"
120+
spresense.menu.Core.Sub5.build.libs="{build.libpath}/libapps.a" "{build.libpath}/libarch.a" "{build.libpath}/libarm_cortexM4lf_math.a" "{build.libpath}/libbinfmt.a" "{build.libpath}/libboard.a" "{build.libpath}/libboards.a" "{build.libpath}/libc.a" "{build.libpath}/libcmsis_nn.a" "{build.libpath}/libdrivers.a" "{build.libpath}/libfs.a" "{build.libpath}/libmm.a" "{build.libpath}/libsched.a" "{build.libpath}/libxx.a"
101121

102122
### without SYSBUS
103123
spresense.build.ldscript=-T{variant.path}/ramconfig.ld

‎Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/RTC/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=RTC
2-
version=1.2.1
2+
version=1.2.2
33
author=Sony Semiconductor Solutions
44
maintainer=Sony Semiconductor Solutions
55
sentence=Spresense RTC Library

‎Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/RTC/src/RtcTime.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ RtcTime::RtcTime(uint32_t sec, long nsec)
2727
update();
2828
}
2929

30-
RtcTime::RtcTime(int year, int month, int day, int hour, int minute, int second)
31-
: _year(year), _month(month), _day(day),
32-
_hour(hour), _minute(minute), _second(second)
33-
{
34-
RtcTime(_year, _month, _day, _hour, _minute, _second, 0);
35-
};
36-
3730
RtcTime::RtcTime(int year, int month, int day, int hour, int minute, int second, long nsec)
3831
: _nsec(nsec),
3932
_year(year), _month(month), _day(day),

‎Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/RTC/src/RtcTime.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class RtcTime
3838
* @brief Create RtcTime object
3939
*/
4040
RtcTime(uint32_t sec = 0, long nsec = 0);
41-
RtcTime(int year, int month, int day, int hour = 0, int minute = 0, int second = 0);
4241
RtcTime(int year, int month, int day, int hour = 0, int minute = 0, int second = 0, long nsec = 0);
4342
RtcTime(const char* date, const char* time);
4443

‎tools/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.1
1+
2.6.0

0 commit comments

Comments
 (0)