djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7553 from kamtom480/sdk2.6.0

Browse Source 
spresense: update SDK to 2.6.0
This commit is contained in:
Dan Halbert 2023-02-13 09:04:35 -05:00 committed by GitHub
commit ec90d79d61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/cxd56/README.md
View File

@ -75,7 +75,7 @@ Bootloader information:
* You have to accept the End User License Agreement to be able to download and use the Spresense bootloader binary.
Download the spresense binaries zip archive from: [Spresense firmware v2-3-000](https://developer.sony.com/file/download/download-spresense-firmware-v2-3-000)
Download the spresense binaries zip archive from: [Spresense firmware v2-4-000](https://developer.sony.com/file/download/download-spresense-firmware-v2-4-000)
Extract spresense binaries in your PC to ports/spresense/spresense-exported-sdk/firmware/

36
ports/cxd56/common-hal/camera/Camera.c
View File

@ -47,7 +47,7 @@ typedef struct {
uint16_t height;
} image_size_t;
STATIC const image_size_t image_size_table[] = {
STATIC const image_size_t isx012_image_size_table[] = {
{ VIDEO_HSIZE_QVGA, VIDEO_VSIZE_QVGA },
{ VIDEO_HSIZE_VGA, VIDEO_VSIZE_VGA },
{ VIDEO_HSIZE_HD, VIDEO_VSIZE_HD },
@ -57,12 +57,40 @@ STATIC const image_size_t image_size_table[] = {
{ VIDEO_HSIZE_5M, VIDEO_VSIZE_5M },
};
STATIC const image_size_t isx019_image_size_table[] = {
{ VIDEO_HSIZE_QVGA, VIDEO_VSIZE_QVGA },
{ VIDEO_HSIZE_VGA, VIDEO_VSIZE_VGA },
{ VIDEO_HSIZE_HD, VIDEO_VSIZE_HD },
{ VIDEO_HSIZE_QUADVGA, VIDEO_VSIZE_QUADVGA },
};
static const char *get_imgsensor_name() {
static struct v4l2_capability cap;
ioctl(camera_dev.fd, VIDIOC_QUERYCAP, (unsigned long)&cap);
return (const char *)cap.driver;
}
static bool camera_check_width_and_height(uint16_t width, uint16_t height) {
for (int i = 0; i < MP_ARRAY_SIZE(image_size_table); i++) {
if (image_size_table[i].width == width && image_size_table[i].height == height) {
return true;
const char *sensor;
sensor = get_imgsensor_name();
if (strncmp(sensor, "ISX012", strlen("ISX012")) == 0) {
for (int i = 0; i < MP_ARRAY_SIZE(isx012_image_size_table); i++) {
if (isx012_image_size_table[i].width == width && isx012_image_size_table[i].height == height) {
return true;
}
}
} else if (strncmp(sensor, "ISX019", strlen("ISX019"))) {
for (int i = 0; i < MP_ARRAY_SIZE(isx019_image_size_table); i++) {
if (isx019_image_size_table[i].width == width && isx019_image_size_table[i].height == height) {
return true;
}
}
}
return false;
}

1
ports/cxd56/configs/circuitpython/defconfig
View File

@ -113,4 +113,5 @@ CONFIG_USEC_PER_TICK=1000
CONFIG_USERMAIN_STACKSIZE=8192
CONFIG_USER_ENTRYPOINT="spresense_main"
CONFIG_VIDEO_ISX012=y
CONFIG_VIDEO_ISX019=y
CONFIG_VIDEO_STREAM=y

2
ports/cxd56/spresense-exported-sdk

@ -1 +1 @@
Subproject commit 6a148be8497704d4afb5d14c175a12a592813fac
Subproject commit 4f902ca3ffeb327e6c325940ef5133eda588c2e4

4
ports/cxd56/supervisor/port.c
View File

@ -111,13 +111,13 @@ bool port_has_fixed_stack(void) {
uint32_t *port_stack_get_limit(void) {
struct tcb_s *rtcb = this_task();
return rtcb->adj_stack_ptr - (uint32_t)rtcb->adj_stack_size;
return rtcb->stack_base_ptr;
}
uint32_t *port_stack_get_top(void) {
struct tcb_s *rtcb = this_task();
return rtcb->adj_stack_ptr;
return rtcb->stack_base_ptr + (uint32_t)rtcb->adj_stack_size;
}
uint32_t *port_heap_get_bottom(void) {