Skip to content

Commit

Permalink
Merge pull request #236 from sonydevworld/develop
Browse files Browse the repository at this point in the history 
Merge from develop v3.3.0
  • Loading branch information
@SPRESENSE
SPRESENSE authored Dec 4, 2024
2 parents 5779633 + 71b82f3 commit b2e6327
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 19 deletions.
28 changes: 14 additions & 14 deletions Arduino15/package_spresense_index.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
{
"category": "SPRESENSE",
"name": "Spresense Reference Board",
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.2.0/spresense-v3.2.0.tar.gz",
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.3.0/spresense-v3.3.0.tar.gz",
"help": {
"online": "https://github.com/sonydevworld/spresense-arduino-compatible/releases"
},
"version": "1.0.0",
"architecture": "spresense",
"archiveFileName": "spresense-v3.2.0.tar.gz",
"archiveFileName": "spresense-v3.3.0.tar.gz",
"boards": [
{
"name": "Generic Spresense Module"
Expand Down Expand Up @@ -49,22 +49,22 @@
"name": "spresense-sdk",
"systems": [
{
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.2.0/spresense-sdk-v3.2.0.tar.gz",
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.3.0/spresense-sdk-v3.3.0.tar.gz",
"host": "i686-mingw32",
"archiveFileName": "spresense-sdk-v3.2.0.tar.gz",
"archiveFileName": "spresense-sdk-v3.3.0.tar.gz",
"size": "6257789"
},
{
"_comment": "Allow x64-Linux build",
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.2.0/spresense-sdk-v3.2.0.tar.gz",
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.3.0/spresense-sdk-v3.3.0.tar.gz",
"host": "x86_64-pc-linux-gnu",
"archiveFileName": "spresense-sdk-v3.2.0.tar.gz",
"archiveFileName": "spresense-sdk-v3.3.0.tar.gz",
"size": "6257789"
},
{
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.2.0/spresense-sdk-v3.2.0.tar.gz",
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.3.0/spresense-sdk-v3.3.0.tar.gz",
"host": "i386-apple-darwin11",
"archiveFileName": "spresense-sdk-v3.2.0.tar.gz",
"archiveFileName": "spresense-sdk-v3.3.0.tar.gz",
"size": "6257789"
}
]
Expand All @@ -74,21 +74,21 @@
"name": "spresense-tools",
"systems": [
{
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.2.0/spresense-tools-v3.2.0.tar.gz",
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.3.0/spresense-tools-v3.3.0.tar.gz",
"host": "i686-mingw32",
"archiveFileName": "spresense-tools-v3.2.0.tar.gz",
"archiveFileName": "spresense-tools-v3.3.0.tar.gz",
"size": "59294138"
},
{
"_comment": "Allow x64-Linux build",
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.2.0/spresense-tools-v3.2.0.tar.gz",
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.3.0/spresense-tools-v3.3.0.tar.gz",
"host": "x86_64-pc-linux-gnu",
"archiveFileName": "spresense-tools-v3.2.0.tar.gz",
"archiveFileName": "spresense-tools-v3.3.0.tar.gz",
"size": "59294138"
}, {
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.2.0/spresense-tools-v3.2.0.tar.gz",
"url": "https://github.com/sonydevworld/spresense-arduino-compatible/releases/download/v3.3.0/spresense-tools-v3.3.0.tar.gz",
"host": "i386-apple-darwin11",
"archiveFileName": "spresense-tools-v3.2.0.tar.gz",
"archiveFileName": "spresense-tools-v3.3.0.tar.gz",
"size": "59294138"
}
]
Expand Down
23 changes: 21 additions & 2 deletions Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Camera/Camera.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Camera.h - Camera include file for the Spresense SDK
* Copyright 2018, 2020-2022 Sony Semiconductor Solutions Corporation
* Copyright 2018, 2020-2022, 2024 Sony Semiconductor Solutions Corporation
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -190,6 +190,20 @@ enum CAM_COLOR_FX {
* @brief Camera ISO Sensitivity parameter definitions.
* @{
*/
#define CAM_ISO_SENSITIVITY_1 (1000) /**< [en] ISO Sensitivity 1 <BR> [jp] ISO感度 1 */
#define CAM_ISO_SENSITIVITY_1_2 (1200) /**< [en] ISO Sensitivity 1.2 <BR> [jp] ISO感度 1.2 */
#define CAM_ISO_SENSITIVITY_1_6 (1600) /**< [en] ISO Sensitivity 1.6 <BR> [jp] ISO感度 1.6 */
#define CAM_ISO_SENSITIVITY_2 (2000) /**< [en] ISO Sensitivity 2 <BR> [jp] ISO感度 2 */
#define CAM_ISO_SENSITIVITY_2_5 (2500) /**< [en] ISO Sensitivity 2.5 <BR> [jp] ISO感度 2.5 */
#define CAM_ISO_SENSITIVITY_3_2 (3200) /**< [en] ISO Sensitivity 3.2 <BR> [jp] ISO感度 3.2 */
#define CAM_ISO_SENSITIVITY_4 (4000) /**< [en] ISO Sensitivity 4 <BR> [jp] ISO感度 4 */
#define CAM_ISO_SENSITIVITY_5 (5000) /**< [en] ISO Sensitivity 5 <BR> [jp] ISO感度 5 */
#define CAM_ISO_SENSITIVITY_6 (6000) /**< [en] ISO Sensitivity 6 <BR> [jp] ISO感度 6 */
#define CAM_ISO_SENSITIVITY_8 (8000) /**< [en] ISO Sensitivity 8 <BR> [jp] ISO感度 8 */
#define CAM_ISO_SENSITIVITY_10 (10000) /**< [en] ISO Sensitivity 10 <BR> [jp] ISO感度 10 */
#define CAM_ISO_SENSITIVITY_12 (12000) /**< [en] ISO Sensitivity 12 <BR> [jp] ISO感度 12 */
#define CAM_ISO_SENSITIVITY_16 (16000) /**< [en] ISO Sensitivity 16 <BR> [jp] ISO感度 16 */
#define CAM_ISO_SENSITIVITY_20 (20000) /**< [en] ISO Sensitivity 20 <BR> [jp] ISO感度 20 */
#define CAM_ISO_SENSITIVITY_25 (25000) /**< [en] ISO Sensitivity 25 <BR> [jp] ISO感度 25 */
#define CAM_ISO_SENSITIVITY_32 (32000) /**< [en] ISO Sensitivity 32 <BR> [jp] ISO感度 32 */
#define CAM_ISO_SENSITIVITY_40 (40000) /**< [en] ISO Sensitivity 40 <BR> [jp] ISO感度 40 */
Expand All @@ -209,6 +223,11 @@ enum CAM_COLOR_FX {
#define CAM_ISO_SENSITIVITY_1000 (1000000) /**< [en] ISO Sensitivity 1000 <BR> [jp] ISO感度 1000 */
#define CAM_ISO_SENSITIVITY_1250 (1250000) /**< [en] ISO Sensitivity 1250 <BR> [jp] ISO感度 1250 */
#define CAM_ISO_SENSITIVITY_1600 (1600000) /**< [en] ISO Sensitivity 1600 <BR> [jp] ISO感度 1600 */
#define CAM_ISO_SENSITIVITY_2000 (2000000) /**< [en] ISO Sensitivity 2000 <BR> [jp] ISO感度 2000 */
#define CAM_ISO_SENSITIVITY_2500 (2500000) /**< [en] ISO Sensitivity 2500 <BR> [jp] ISO感度 2500 */
#define CAM_ISO_SENSITIVITY_3200 (3200000) /**< [en] ISO Sensitivity 3200 <BR> [jp] ISO感度 3200 */
#define CAM_ISO_SENSITIVITY_4000 (4000000) /**< [en] ISO Sensitivity 4000 <BR> [jp] ISO感度 4000 */
#define CAM_ISO_SENSITIVITY_5000 (5000000) /**< [en] ISO Sensitivity 5000 <BR> [jp] ISO感度 5000 */
/** @} */

/**
Expand Down Expand Up @@ -705,7 +724,7 @@ class CameraClass {
* @return [en] Error code defined as #CamErr. <BR>
* [ja] #CamErr で定義されているエラーコード
*/
CamErr setISOSensitivity(int iso_sense /**< [en] ISO Sensitivity value. Use macros named @ref CAM_ISO_SENSITIVITY <BR> [ja] ISO感度値。 @ref CAM_ISO_SENSITIVITY と定義されたマクロから選択する */);
CamErr setISOSensitivity(int iso_sense /**< [en] ISO Sensitivity value. Use macros named @ref CAM_ISO_SENSITIVITY . If used device is ISX012, the minimum value is CAM_ISO_SENSITIVITY_25 and the maximum value is CAM_ISO_SENSITIVITY_1600.(The used device can be gotten by theCamera.getDeviceType().) <BR> [ja] ISO感度値。 @ref CAM_ISO_SENSITIVITY と定義されたマクロから選択する 。 使用デバイスがISX012の場合は、最小値はCAM_ISO_SENSITIVITY_25、最大値はCAM_ISO_SENSITIVITY_1600 となります。(使用デバイスはtheCamera.getDeviceType().で得ることができます。) */);

/**
* @brief Get ISO Sensivity value.
Expand Down
2 changes: 1 addition & 1 deletion Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/Camera/library.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Camera
version=1.9.0
version=1.10.0
author=Sony Semiconductor Solutions
maintainer=Sony Semiconductor Solutions
sentence=Spresense Camera Library
Expand Down
2 changes: 1 addition & 1 deletion tools/configs/spresense.conf
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
default device/adc device/camera device/charger device/emmc device/hostif device/pwm device/sdcard device/nrf52 feature/asmp feature/audio_player feature/audio_recorder feature/audio_recognizer feature/audio_synthesizer feature/dnnrt_mp feature/fwuputils feature/gnss feature/imageproc feature/libcxx feature/lte_stub_mbedtls feature/step_counter feature/digital_filters feature/audiolite feature/gnss_addon -- +CXD56_I2C_DRIVER=n +CXD56_I2C1 +CXD56_I2C1_SCUSEQ=n +CXD56_LTE_LATE_INITIALIZE=y +CXD56_CAMERA_LATE_INITIALIZE=y +CXD56_HPADC0_INPUT_GAIN_M6DB +CXD56_HPADC1_INPUT_GAIN_M6DB +CXD56_USE_SYSBUS=n -LTE_SYSCTL=y +BUILTIN=n -CXD56_EMMC_POWER_PIN_I2S0_BCK=y +CXD56_EMMC_POWER_PIN_NONE=y +CXD56_EMMC_LATE_INITIALIZE=y +LTE_LAPI_ENABLE_DEPRECATED_API=n +CXD56_GNSS_ADDON_LATE_INITIALIZE=y +GPSUTILS_CXD5610NMEA_LIB=y +BOARD_USBDEV_SERIALSTR=y
default device/adc device/camera device/charger device/emmc device/hostif device/pwm device/sdcard device/nrf52 feature/asmp feature/audio_player feature/audio_recorder feature/audio_recognizer feature/audio_synthesizer feature/dnnrt_mp feature/fwuputils feature/gnss feature/imageproc feature/libcxx feature/lte_stub_mbedtls feature/step_counter feature/digital_filters feature/audiolite feature/gnss_addon feature/wifi_halow -- +CXD56_I2C_DRIVER=n +CXD56_I2C1 +CXD56_I2C1_SCUSEQ=n +CXD56_LTE_LATE_INITIALIZE=y +CXD56_CAMERA_LATE_INITIALIZE=y +CXD56_HPADC0_INPUT_GAIN_M6DB +CXD56_HPADC1_INPUT_GAIN_M6DB +CXD56_USE_SYSBUS=n -LTE_SYSCTL=y +BUILTIN=n -CXD56_EMMC_POWER_PIN_I2S0_BCK=y +CXD56_EMMC_POWER_PIN_NONE=y +CXD56_EMMC_LATE_INITIALIZE=y +LTE_LAPI_ENABLE_DEPRECATED_API=n +CXD56_GNSS_ADDON_LATE_INITIALIZE=y +GPSUTILS_CXD5610NMEA_LIB=y +BOARD_USBDEV_SERIALSTR=y +CXD56_NRC_HALOW_LATE_INITIALIZE=y
2 changes: 1 addition & 1 deletion tools/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.0
3.3.0

0 comments on commit b2e6327

Please sign in to comment.