Skip to content

Commit ee729f2

Browse files
committed
Update code base
1 parent 45ff073 commit ee729f2

File tree

72 files changed

+2102
-330
lines changed

Some content is hidden

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

72 files changed

+2102
-330
lines changed

.github/release_commit_log.txt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
Feature:
2-
- Update UVCDObjectDetectionLoop.ino
3-
- Add OSD draw boundary box
42

53
API Updates:
64
- Update code base
7-
- Update SSL Client API
8-
- Reset errno to 0 when starting a new SSL client connection
95

106
Misc:
11-
- Update ameba_pro2_nn_models 1.0.1
12-
- Remove "yolov4_tiny_320p", "yolov4_tiny_320p_nv12", "scrfd320p_nv12", "nanodet_plus_m_416", "nanodet_plus_m_320p"
13-
- Add "yolov3_tiny"
14-
- Update README.md
15-
- Update ameba_pro2_tools 1.3.11
16-
- Update sensor F55 iq files
7+
- Remove unused files

.github/release_log.txt

Lines changed: 3 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,9 @@
1-
Pre Release Version 4.0.8
1+
Pre Release Version 4.0.9
2+
3+
Version 4.0.9 – 2024/11/04
24

3-
Version 4.0.8 – 2024/07/03
4-
Version 4.0.8 – 2024/07/25
5-
Version 4.0.8 - 2024/08/05
6-
Version 4.0.8 - 2024/09/20
7-
Version 4.0.8 - 2024/10/03
8-
Version 4.0.8 - 2024/10/08
9-
Version 4.0.8 - 2024/10/25
105
Feature:
11-
- Update comment in WideDynamicRange.ino
12-
- Add feature Flash Memory
13-
- Add feature FCS mode for all supported sensors
14-
- Add sensor F53 support
15-
- Add OTA
16-
- Add USB UVCD
17-
- Add sensor IMX327 support
18-
- Add filesystem Example GetFreeAndUseSpace
19-
- Add sensor PS5268 support
20-
- Add Example UVC_ObjectDetectionLoop
21-
- Update UVCDObjectDetectionLoop.ino
22-
- Add OSD draw boundary box
236

247
API Updates:
25-
- Update SDK code base
26-
- Add flash memory related API
27-
- Update snapshot related API
28-
- Add OTA related API
29-
- Add USB UVCD related API
30-
- Update boot tick count process
31-
- Update "AmebaFatFS.cpp" and "AmebaFatFS.h"
32-
- Update "UVCD.cpp" and "UVCD.h"
33-
- Update "video_drv.c" and "video_drv.h"
34-
- Update "qrcode_drv.c"
35-
- Update code base
36-
- Update SSL Client API
37-
- Reset errno to 0 when starting a new SSL client connection
388

399
Misc:
40-
- Update CI_compile_examples.yml
41-
- CI test to fix process issue due to the V1.1.0 Arduino CLI update
42-
- Update All_NN_models
43-
- Update platform.txt
44-
- Update ameba_pro2_tools 1.3.5
45-
- Update tools for OTA process
46-
- Update tools for multi sensor build process
47-
- Update tools to accept username with spaces
48-
- Update tools for postbuild
49-
- Add FCS files
50-
- Update keywords.txt files
51-
- Update library.properties files
52-
- Update ameba_pro2_tools 1.3.6
53-
- Update multi sensor build process
54-
- Update postbuild tool for FCS
55-
- Update ameba_pro2_tools 1.3.7
56-
- Update prebuild and postbuild tools
57-
- Support Chinese username on win11
58-
- Update workflow
59-
- Update CI with ET mode
60-
- Update spell_check.yml
61-
- Update ameba_pro2_tools 1.3.8
62-
- Add sensor IMX327 realted support
63-
- Update ameba_pro2_tools 1.3.9
64-
- Add sensor PS5268 realted support
65-
- Update ameba_pro2_tools 1.3.10
66-
- Add sensor PS5268 iq files
67-
- Update ameba_pro2_nn_models 1.0.1
68-
- Remove "yolov4_tiny_320p", "yolov4_tiny_320p_nv12", "scrfd320p_nv12", "nanodet_plus_m_416", "nanodet_plus_m_320p"
69-
- Add "yolov3_tiny"
70-
- Update README.md
71-
- Update ameba_pro2_tools 1.3.11
72-
- Update sensor F55 iq files

.github/workflows/CI_compile_examples.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ jobs:
8484
# - Arduino_package/hardware/libraries/
8585
${{ env['examples-to-use'] }}
8686
platforms: |
87-
- source-url: https://github.com/ambiot/ambpro2_arduino/raw/dev/Arduino_package/package_realtek_amebapro2_early_index.json
87+
- source-url: https://github.com/Ameba-AIoT/ameba-arduino-pro2/raw/dev/Arduino_package/package_realtek_amebapro2_early_index.json
8888
name: realtek:AmebaPro2
8989
- source-path: Arduino_package/hardware/
9090
name: realtek:AmebaPro2
9191
libraries: |
92-
- source-url: https://github.com/ambiot/ambpro2_arduino/raw/dev/Arduino_zip_libraries/AmebaEink.zip
93-
# - source-url: https://github.com/ambiot/ambpro2_arduino/raw/dev/Arduino_zip_libraries/Ameba_TFT_eSPI.zip
92+
- source-url: https://github.com/Ameba-AIoT/ameba-arduino-pro2/raw/dev/Arduino_zip_libraries/AmebaEink.zip
93+
# - source-url: https://github.com/Ameba-AIoT/ameba-arduino-pro2/raw/dev/Arduino_zip_libraries/Ameba_TFT_eSPI.zip
9494
verbose: false
9595
enable-deltas-report: false
9696
if: ${{ github.ref == 'refs/heads/dev' || github.event.pull_request.base.ref == 'dev'}}
@@ -103,13 +103,13 @@ jobs:
103103
# - Arduino_package/hardware/libraries/
104104
${{ env['examples-to-use'] }}
105105
platforms: |
106-
- source-url: https://github.com/ambiot/ambpro2_arduino/raw/main/Arduino_package/package_realtek_amebapro2_index.json
106+
- source-url: https://github.com/Ameba-AIoT/ameba-arduino-pro2/raw/main/Arduino_package/package_realtek_amebapro2_index.json
107107
name: realtek:AmebaPro2
108108
- source-path: Arduino_package/hardware/
109109
name: realtek:AmebaPro2
110110
libraries: |
111-
- source-url: https://github.com/ambiot/ambpro2_arduino/raw/main/Arduino_zip_libraries/AmebaEink.zip
112-
# - source-url: https://github.com/ambiot/ambpro2_arduino/raw/main/Arduino_zip_libraries/Ameba_TFT_eSPI.zip
111+
- source-url: https://github.com/Ameba-AIoT/ameba-arduino-pro2/raw/main/Arduino_zip_libraries/AmebaEink.zip
112+
# - source-url: https://github.com/Ameba-AIoT/ameba-arduino-pro2/raw/main/Arduino_zip_libraries/Ameba_TFT_eSPI.zip
113113
verbose: false
114114
enable-deltas-report: false
115115
if: ${{ github.ref == 'refs/heads/main' || github.event.pull_request.base.ref == 'main' }}

.github/workflows/sdk_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ on:
1111

1212
env:
1313
REPO_NAME: "ameba_pro2"
14-
JSON_LINK_DEV: "https://github.com/ambiot/ambpro2_arduino/blob/dev/Arduino_package/package_realtek_amebapro2_early_index.json"
15-
JSON_LINK_MAIN: "https://github.com/ambiot/ambpro2_arduino/blob/main/Arduino_package/package_realtek_amebapro2_index.json"
14+
JSON_LINK_DEV: "https://github.com/Ameba-AIoT/ameba-arduino-pro2/blob/dev/Arduino_package/package_realtek_amebapro2_early_index.json"
15+
JSON_LINK_MAIN: "https://github.com/Ameba-AIoT/ameba-arduino-pro2/blob/main/Arduino_package/package_realtek_amebapro2_index.json"
1616
RRLEASE_BRANCH_NAME: "main"
1717
RRLEASE_COMMIT_LOG: "./.github/release_commit_log.txt"
1818
RRLEASE_LOG: "./.github/release_log.txt"

Ameba_misc/All_NN_models/amebapro2_fwfs_nn_models.json

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,23 @@
4848
"file":"mobilefacenet_int16.nb"
4949

5050
},
51-
"yolov7_tiny":{
51+
"yolov7_tiny":{
5252
"name" : "yolov7_tiny.nb",
5353
"source":"binary",
5454
"file":"yolov7_tiny.nb"
5555

5656
},
57-
"scrfd640":{
57+
"scrfd640":{
5858
"name" : "scrfd.nb",
5959
"source":"binary",
6060
"file":"scrfd_500m_bnkps_640x640_u8.nb"
6161
},
62-
"scrfd320p":{
62+
"scrfd320p":{
6363
"name" : "scrfd.nb",
6464
"source":"binary",
6565
"file":"scrfd_500m_bnkps_576x320_u8.nb"
6666
},
67-
"scrfd320p_nv12":{
67+
"scrfd320p_nv12":{
6868
"name" : "scrfd.nb",
6969
"source":"binary",
7070
"file":"scrfd_500m_bnkps_576x320_u8_nv12.nb"
@@ -79,9 +79,19 @@
7979
"source":"binary",
8080
"file":"nanodet_plus_m_576x320_uint8.nb"
8181
},
82-
"img_class": {
82+
"palm_detection_lite_int16":{
83+
"name" : "palm_detection.nb",
84+
"source":"binary",
85+
"file":"palm_detection_lite_int16.nb"
86+
},
87+
"hand_landmark_lite_int16":{
88+
"name" : "hand_landmark.nb",
89+
"source":"binary",
90+
"file":"hand_landmark_lite_int16.nb"
91+
},
92+
"img_class": {
8393
"name" : "img_class.nb",
8494
"source":"binary",
8595
"file":"img_class_cnn.nb"
86-
}
96+
}
8797
}
Binary file not shown.
Binary file not shown.

Arduino_package/hardware/system/component/media/mmfv2/module_vipnn.h

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,22 @@ printf("%d\r", (int)nn_used_##model==0)
4747
typedef struct landmark_s {
4848
struct __post_s {
4949
float x, y;
50-
} pos[5];
50+
} pos[10];
5151
} landmark_t;
5252
//----------------------------------------------------------------------------
5353
typedef struct landmarki_s {
5454
struct __posi_s {
5555
uint32_t x, y;
56-
} pos[5];
56+
} pos[10];
5757
} landmarki_t;
5858
//----------------------------------------------------------------------------
59+
#define HAND_LANDMARK_NUM (21)
60+
typedef struct landmark3d_s {
61+
struct __post3d_s {
62+
float x, y, z;
63+
} pos[HAND_LANDMARK_NUM];
64+
} landmark3d_t;
65+
//----------------------------------------------------------------------------
5966
typedef struct detobj_s {
6067
float classes;
6168
float score;
@@ -266,6 +273,7 @@ typedef struct vipnn_ctx_s {
266273
#define MAX_DETECT_OBJ_NUM 1024
267274
#define MAX_FACE_DETECT_NUM 16
268275
#define MAX_FACE_FEATURE_DIM 128
276+
#define MAX_HAND_DETECT_NUM 128
269277

270278
//-----------------------------------------------------------------------
271279
typedef struct vipnn_out_tensor_s {
@@ -325,6 +333,22 @@ typedef struct yamnet_res_s {
325333
float prob;
326334
} yamnet_res_t;
327335

336+
typedef struct palmdetect_res_s {
337+
union {
338+
float result[6];
339+
detobj_t res;
340+
};
341+
landmarki_t landmark;
342+
} palmdetect_res_t;
343+
344+
typedef struct handland_res_s {
345+
landmark3d_t landmark3d;
346+
unsigned char handedness;
347+
float theta, ratio;
348+
int w,h;
349+
int offset_x, offset_y;
350+
} handland_res_t;
351+
328352
#ifdef ARDUINO_SDK
329353
typedef struct classification_res_s {
330354
float prob;

Arduino_package/hardware/system/component/video/osd2/osd_render.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#define OSD_OBJ_MAX_CH 3 //fix value
99
#define OSD_OBJ_MAX_NUM RTS_OSD2_CH_BLK_MAX_NUMBER //fix value
1010
#define OSD_PT_MAX_NUM 5
11-
#define MAX_DRAW_MSG 30
12-
#define MAX_QUEUE_MSG 100
11+
#define MAX_DRAW_MSG 50
12+
#define MAX_QUEUE_MSG 500
1313

1414
#define CANVAS_CREATE_BMP 0x01
1515
#define CANVAS_MSG_DRAW 0x02
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#ifndef MODEL_HAND_LANDMARK_H
2+
#define MODEL_HAND_LANDMARK_H
3+
#include "module_vipnn.h"
4+
extern nnmodel_t hand_landmark_fwfs;
5+
6+
enum {
7+
HANDEDNESS_LEFT = 0,
8+
HANDEDNESS_RIGHT = 1,
9+
HANDEDNESS_NOTSURE = 2,
10+
HANDEDNESS_NOTFOUND = 3,
11+
};
12+
13+
#endif

0 commit comments

Comments
 (0)