Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tools to 1.3.3 #234

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Update tools to 1.3.3 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Ameba_misc/Ameba_tools/cmodel_backup/version_cpp/cmodel_backup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ int main(int argc, char* argv[]) {
#endif
size_t path_tool_find_keyword = path_tools.find(key_portable);
if (path_tool_find_keyword != std::string::npos) {
path_arduino15 = path_arduino15.append(findKeywordPath(path_tools, key_portable));
path_arduino15 = findKeywordPath(path_tools, key_portable);
} else {
path_arduino15.append(path_arduino15_add);
}
Expand Down
4 changes: 2 additions & 2 deletions Ameba_misc/Ameba_tools/ino_validation/version_cpp/ino_validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ strip ino_validation_macos
#include <cctype> // For std::isspace
#endif

#define PRINT_DEBUG 1
#define PRINT_DEBUG 0
#define MAX_PATH_LENGTH 1024

#define NUMBER_OF_MODELS 5
Expand Down Expand Up @@ -994,7 +994,7 @@ int main(int argc, char* argv[]) {
#endif
size_t path_tool_find_keyword = path_tools.find(key_portable);
if (path_tool_find_keyword != std::string::npos) {
path_arduino15 = path_arduino15.append(findKeywordPath(path_tools, key_portable));
path_arduino15 = findKeywordPath(path_tools, key_portable);
} else {
path_arduino15.append(path_arduino15_add);
}
Expand Down
2 changes: 1 addition & 1 deletion Ameba_misc/Ameba_tools/nn_json_modify/version_cpp/nn_json_modify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ int main(int argc, char* argv[]) {
#endif
size_t path_tool_find_keyword = path_tools.find(key_portable);
if (path_tool_find_keyword != std::string::npos) {
path_arduino15 = path_arduino15.append(findKeywordPath(path_tools, key_portable));
path_arduino15 = findKeywordPath(path_tools, key_portable);
} else {
path_arduino15.append(path_arduino15_add);
}
Expand Down
Binary file modified Arduino_package/ameba_pro2_tools_linux/cmodel_backup_linux
View file
Open in desktop
Binary file not shown.
Binary file modified Arduino_package/ameba_pro2_tools_linux/ino_validation_linux
View file
Open in desktop
Binary file not shown.
Binary file modified Arduino_package/ameba_pro2_tools_linux/nn_json_modify_linux
View file
Open in desktop
Binary file not shown.
Binary file modified Arduino_package/ameba_pro2_tools_macos/cmodel_backup_macos
View file
Open in desktop
Binary file not shown.
Binary file modified Arduino_package/ameba_pro2_tools_macos/ino_validation_macos
View file
Open in desktop
Binary file not shown.
Binary file modified Arduino_package/ameba_pro2_tools_macos/nn_json_modify_macos
View file
Open in desktop
Binary file not shown.
Binary file modified Arduino_package/ameba_pro2_tools_windows/cmodel_backup_windows.exe
View file
Open in desktop
Binary file not shown.
Binary file modified Arduino_package/ameba_pro2_tools_windows/ino_validation_windows.exe
View file
Open in desktop
Binary file not shown.
Binary file modified Arduino_package/ameba_pro2_tools_windows/nn_json_modify_windows.exe
View file
Open in desktop
Binary file not shown.
Binary file modified Arduino_package/ameba_pro2_tools_windows/prebuild_windows.exe
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions Arduino_package/hardware/platform.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ toolchain_p2.path={runtime.tools.{toolchain_p2_runtime_name}.path}
## tools path
ameba.tools_path={runtime.tools.ameba_pro2_tools.path}


## include path
### ameba SDK
compiler.ameba.c.include= "-I." "-I{ameba.proj_path}/inc" "-I{ameba.component_path}/mbed/hal" "-I{ameba.component_path}/mbed/hal_ext" "-I{ameba.component_path}/mbed/targets/hal/rtl8735b" "-I{ameba.component_path}/mbed/api" "-I{ameba.component_path}/stdlib" "-I{ameba.component_path}/at_cmd" "-I{ameba.component_path}/network" "-I{ameba.component_path}/network/cJSON" "-I{ameba.soc_path}/cmsis/cmsis-core/include" "-I{ameba.soc_path}/cmsis/rtl8735b/lib/include" "-I{ameba.soc_path}/cmsis/rtl8735b/include" "-I{ameba.soc_fw_path}/include" "-I{ameba.soc_fw_path}/source/ram_ns/halmac/halmac_88xx" "-I{ameba.soc_fw_path}/lib/source/ram/usb_otg/host/storage/inc/quirks" "-I{ameba.soc_fw_path}/lib/source/ram/usb_otg" "-I{ameba.soc_fw_path}/lib/source/ram/usb_otg/device/class/ethernet/inc" "-I{ameba.soc_fw_path}/source/ram_ns/halmac/halmac_88xx/halmac_8822b" "-I{ameba.soc_fw_path}/lib/include" "-I{ameba.soc_fw_path}/lib/source/ram/usb_otg/device/class/ethernet/src" "-I{ameba.soc_fw_path}/lib/source/ram/usb_otg/device/core/inc" "-I{ameba.soc_fw_path}/source/ram_ns/halmac/halmac_88xx/halmac_8735b" "-I{ameba.soc_fw_path}/source/ram_ns/halmac/halmac_88xx_v1" "-I{ameba.soc_fw_path}/lib/source/ram/usb_otg/device/class/vendor/inc" "-I{ameba.soc_fw_path}/lib/source/ram/usb_otg/host/storage/inc" "-I{ameba.soc_fw_path}/lib/source/ram/usb_otg/host/storage/inc/scatterlist" "-I{ameba.soc_fw_path}/source/ram_ns/halmac/halmac_88xx/halmac_8821c" "-I{ameba.soc_fw_path}/lib/source/ram/usb_otg/host/vendor_spec" "-I{ameba.soc_fw_path}/source/ram_ns/halmac" "-I{ameba.soc_fw_path}/source/ram_ns/halmac/halmac_88xx_v1/halmac_8814b" "-I{ameba.soc_fw_path}/lib/source/ram/usb_otg/host/storage/inc/scsi" "-I{ameba.soc_fw_path}/lib/source/ram/usb_otg/inc" "-I{ameba.soc_fw_path}/source/ram_ns/halmac/halmac_88xx/halmac_8195b" "-I{ameba.soc_fw_path}/lib/source/ram/usb_otg/device" "-I{ameba.soc_path}/misc/utilities/include" "-I{ameba.soc_path}/app/stdio_port" "-I{ameba.soc_path}/app/xmodem/rom" "-I{ameba.soc_path}/app/shell" "-I{ameba.soc_path}/app/shell/rom_ns" "-I{ameba.soc_path}/app/rtl_printf/include" "-I{ameba.component_path}/os/os_dep/include" "-I{ameba.component_path}/os/freertos" "-I{ameba.component_path}/os/freertos/{freertos_version}/Source/include" "-I{ameba.component_path}/wifi/driver/include" "-I{ameba.component_path}/wifi/driver/src/osdep" "-I{ameba.component_path}/wifi/driver/src/phl" "-I{ameba.component_path}/wifi/driver/src/hal" "-I{ameba.component_path}/wifi/driver/src/hal/halmac" "-I{ameba.component_path}/wifi/driver/src/hci" "-I{ameba.component_path}/wifi/driver/src/hal/phydm/rtl8735b" "-I{ameba.component_path}/wifi/driver/src/hal/phydm" "-I{ameba.component_path}/wifi/wpa_supplicant/wpa_supplicant" "-I{ameba.component_path}/os/freertos/freertos_posix/lib/include/FreeRTOS_POSIX" "-I{ameba.component_path}/os/freertos/freertos_posix/lib/include" "-I{ameba.component_path}/os/freertos/freertos_posix/lib/FreeRTOS-Plus-POSIX/include/portable/realtek/rtl8735b" "-I{ameba.component_path}/os/freertos/freertos_posix/lib/FreeRTOS-Plus-POSIX/include" "-I{ameba.component_path}/os/freertos/freertos_posix/lib/include/private" "-I{ameba.component_path}/lwip/api" "-I{ameba.component_path}/lwip/{lwip_version}/src/include" "-I{ameba.component_path}/lwip/{lwip_version}/src/include/lwip" "-I{ameba.component_path}/lwip/{lwip_version}/src/include/compat/posix" "-I{ameba.component_path}/lwip/{lwip_version}/port/realtek" "-I{ameba.component_path}/lwip/{lwip_version}/port/realtek/freertos" "-I{ameba.component_path}/ssl/{mbedtls_version}/include" "-I{ameba.component_path}/ssl/ssl_ram_map/rom" "-I{ameba.component_path}/usb/usb_class/device/class" "-I{ameba.component_path}/usb/usb_class/device" "-I{ameba.component_path}/usb/usb_class/host/uvc/inc" "-I{ameba.component_path}/video/driver/common" "-I{ameba.component_path}/video/driver/RTL8735B" "-I{ameba.component_path}/media/rtp_codec" "-I{ameba.component_path}/media/samples" "-I{ameba.component_path}/media/mmfv2" "-I{ameba.component_path}/wifi/api" "-I{ameba.component_path}/wifi/wifi_config" "-I{ameba.component_path}/wifi/wifi_fast_connect" "-I{ameba.component_path}/sdio/sd_host/inc" "-I{ameba.component_path}/file_system/fatfs" "-I{ameba.component_path}/file_system/fatfs/{fatfs_version}" "-I{ameba.component_path}/file_system/ftl_common" "-I{ameba.component_path}/file_system/vfs" "-I{ameba.component_path}/file_system/nn" "-I{ameba.component_path}/file_system/littlefs" "-I{ameba.component_path}/file_system/littlefs/{littlefs_version}" "-I{ameba.component_path}/audio/3rdparty/faac/libfaac" "-I{ameba.component_path}/audio/3rdparty/faac/include" "-I{ameba.component_path}/audio/3rdparty/haac" "-I{ameba.component_path}/media/muxer" "-I{ameba.component_path}/media/3rdparty/fmp4/libmov/include" "-I{ameba.component_path}/media/3rdparty/fmp4/libflv/include" "-I{ameba.soc_path}/cmsis/cmsis-dsp/include" "-I{ameba.component_path}/application/qr_code_scanner/inc" "-I{ameba.component_path}/audio/3rdparty/speex/speex" "-I{ameba.component_path}/audio/3rdparty/AEC/AEC" "-I{ameba.component_path}/audio/3rdparty/opus-1.3.1/include" "-I{ameba.component_path}/audio/3rdparty/libopusenc-0.2.1/include" "-I{ameba.component_path}/audio/3rdparty/fdk-aac-2.0.2/libAACenc/include" "-I{ameba.component_path}/audio/3rdparty/fdk-aac-2.0.2/libAACdec/include" "-I{ameba.component_path}/audio/3rdparty/fdk-aac-2.0.2/libSYS/include" "-I{ameba.soc_fw_path}/lib/source/ram/video" "-I{ameba.soc_fw_path}/lib/source/ram/video/semihost" "-I{ameba.soc_path}/cmsis/voe/rom" "-I{ameba.component_path}/os/freertos/{freertos_version}/Source/portable/GCC/ARM_CM33/non_secure" "-I{ameba.component_path}/os/freertos/{freertos_version}/Source/portable/GCC/ARM_CM33/secure" "-I{ameba.soc_fw_path}/lib/source/ram/video/voe_bin" "-I{ameba.component_path}/video/driver/RTL8735B" "-I{ameba.proj_path}/src/test_model/svm" "-I{ameba.proj_path}/src/test_model" "-I{ameba.proj_path}/src" "-I{ameba.soc_fw_path}/lib/source/ram/nn" "-I{ameba.soc_fw_path}/lib/source/ram/nn/model_itp" "-I{ameba.soc_fw_path}/lib/source/ram/nn/nn_api" "-I{ameba.soc_fw_path}/lib/source/ram/nn/nn_postprocess" "-I{ameba.soc_fw_path}/lib/source/ram/nn/nn_preprocess" "-I{ameba.soc_fw_path}/lib/source/ram/nn/run_facerecog" "-I{ameba.soc_fw_path}/lib/source/ram/nn/run_itp" "-I{ameba.soc_path}/misc/platform" "-I{ameba.component_path}/media/mmfv2" "-I{ameba.component_path}/media/rtp_codec" "-I{ameba.component_path}/audio/3rdparty/AEC" "-I{ameba.component_path}/mbed/hal_ext" "-I{ameba.component_path}/file_system/ftl" "-I{ameba.component_path}/file_system/system_data" "-I{ameba.component_path}/file_system/fwfs" "-I{ameba.ble_path}/driver" "-I{ameba.ble_path}/driver/hci" "-I{ameba.ble_path}/driver/inc" "-I{ameba.ble_path}/driver/inc/hci" "-I{ameba.ble_path}/driver/platform/amebapro2/inc" "-I{ameba.ble_path}/os/osif" "-I{ameba.ble_path}/rtk_stack/example" "-I{ameba.ble_path}/rtk_stack/inc/app" "-I{ameba.ble_path}/rtk_stack/inc/bluetooth/gap" "-I{ameba.ble_path}/rtk_stack/inc/bluetooth/profile" "-I{ameba.ble_path}/rtk_stack/inc/bluetooth/profile/client" "-I{ameba.ble_path}/rtk_stack/inc/bluetooth/profile/server" "-I{ameba.ble_path}/rtk_stack/inc/framework/bt" "-I{ameba.ble_path}/rtk_stack/inc/framework/remote" "-I{ameba.ble_path}/rtk_stack/inc/framework/sys" "-I{ameba.ble_path}/rtk_stack/inc/os" "-I{ameba.ble_path}/rtk_stack/inc/platform" "-I{ameba.ble_path}/rtk_stack/inc/stack" "-I{ameba.ble_path}/rtk_stack/src/ble/privacy" "-I{ameba.ble_path}/rtk_stack/platform/amebapro2/inc" "-I{ameba.ble_path}/rtk_stack/platform/amebapro2/lib" "-I{ameba.ble_path}/rtk_stack/platform/common/inc" "-I{ameba.ble_path}/rtk_stack/example/ble_central" "-I{ameba.ble_path}/rtk_stack/example/ble_peripheral" "-I{ameba.ble_path}/rtk_stack/example/ble_scatternet" "-I{ameba.ble_path}/rtk_stack/example/bt_beacon" "-I{ameba.ble_path}/rtk_stack/example/bt_config" "-I{ameba.ble_path}/rtk_stack/example/bt_airsync_config" "-I{ameba.ble_path}/rtk_stack/example/bt_mesh/provisioner" "-I{ameba.ble_path}/rtk_stack/example/bt_mesh/device" "-I{ameba.ble_path}/rtk_stack/example/bt_mesh_multiple_profile/provisioner_multiple_profile" "-I{ameba.ble_path}/rtk_stack/example/bt_mesh_multiple_profile/device_multiple_profile" "-I{ameba.ble_path}/rtk_stack/example/bt_mesh_test" "-I{ameba.ble_path}/rtk_stack/example/ble_throughput_test" "-I{ameba.component_path}/wifi/wpa_supplicant/src" "-I{ameba.component_path}/network/mqtt/MQTTClient" "-I{ameba.component_path}/network/mqtt/MQTTPacket" "-I{ameba.component_path}/network/tftp" "-I{ameba.component_path}/network/ftp" "-I{ameba.nn_path}/sdk/inc" "-I{ameba.nn_path}/driver/inc" "-I{ameba.nn_path}/hal/inc" "-I{ameba.nn_path}/hal/user" "-I{ameba.nn_path}/hal/user/freeRTOS" "-I{ameba.component_path}/example/media_framework/inc" "-I{ameba.proj_path}/src/doorbell-chime" "-I{ameba.component_path}/wifi/driver/src/core/option" "-I{ameba.component_path}/ssl/ssl_ram_map/rom" "-I{ameba.component_path}/audio/3rdparty/faac/libfaac" "-I{ameba.component_path}/file_system/fatfs/{fatfs_version}" "-I{ameba.soc_fw_path}/lib/source/ram/video/osd" "-I{ameba.component_path}/video/osd2" "-I{ameba.component_path}/video/eip" "-I{ameba.component_path}/video/md" "-I{ameba.component_path}/media/framework" "-I{ameba.soc_path}/misc/driver" "-I{ameba.soc_path}/misc/driver/xmodem" "-I{ameba.component_path}/network/coap/include" "-I{ameba.component_path}/usb/common_new" "-I{ameba.component_path}/usb/host_new" "-I{ameba.component_path}/usb/host_new/cdc_ecm" "-I{ameba.component_path}/usb/host_new/core" "-I{ameba.component_path}/usb/device_new/core" "-I{ameba.component_path}/usb"
Expand Down Expand Up @@ -206,11 +207,11 @@ recipe.output.save_file=flash_ntz.bin
tools.ameba_pro2_tools.upload.params.verbose=
tools.ameba_pro2_tools.upload.params.quiet=

tools.ameba_pro2_tools.upload.pattern.windows="{ameba.tools_path}/image_windows.exe" "{ameba.tools_path}" "{serial.port}" "{board}" "{upload.auto_mode}" "{upload.erase_flash}" "{upload.speed}" "uartfwburn.exe" "Auto_Flash_Pro2_V3.3_win.exe" "0x60000" "0x460000" "0x530000" {upload.verbose}
tools.ameba_pro2_tools.upload.pattern.windows="{runtime.tools.ameba_pro2_tools.path}/image_windows.exe" "{runtime.tools.ameba_pro2_tools.path}" "{serial.port}" "{board}" "{upload.auto_mode}" "{upload.erase_flash}" "{upload.speed}" "uartfwburn.exe" "Auto_Flash_Pro2_V3.3_win.exe" "0x60000" "0x460000" "0x530000" {upload.verbose}

tools.ameba_pro2_tools.upload.pattern.linux="{ameba.tools_path}/image_linux" "{ameba.tools_path}" "{serial.port}" "{board}" "{upload.auto_mode}" "{upload.erase_flash}" "{upload.speed}" "uartfwburn.linux" "Auto_Flash_Pro2_V3.3_linux" "0x60000" "0x460000" "0x530000" {upload.verbose}
tools.ameba_pro2_tools.upload.pattern.linux="{runtime.tools.ameba_pro2_tools.path}/image_linux" "{runtime.tools.ameba_pro2_tools.path}" "{serial.port}" "{board}" "{upload.auto_mode}" "{upload.erase_flash}" "{upload.speed}" "uartfwburn.linux" "Auto_Flash_Pro2_V3.3_linux" "0x60000" "0x460000" "0x530000" {upload.verbose}

tools.ameba_pro2_tools.upload.pattern.macosx="{ameba.tools_path}/image_macos" "{ameba.tools_path}" "{serial.port}" "{board}" "{upload.auto_mode}" "{upload.erase_flash}" "{upload.speed}" "uartfwburn.darwin" "Auto_Flash_Pro2_V3.3_mac" "0x60000" "0x460000" "0x530000" {upload.verbose}
tools.ameba_pro2_tools.upload.pattern.macosx="{runtime.tools.ameba_pro2_tools.path}/image_macos" "{runtime.tools.ameba_pro2_tools.path}" "{serial.port}" "{board}" "{upload.auto_mode}" "{upload.erase_flash}" "{upload.speed}" "uartfwburn.darwin" "Auto_Flash_Pro2_V3.3_mac" "0x60000" "0x460000" "0x530000" {upload.verbose}

#tools.ameba_pro2_tools.upload.network_pattern="{ameba.tools_path}/upload_ota.exe" -i "{serial.port}" -p "{network.port}" -f "{ameba.tools_path}\ota.bin"
#tools.ameba_pro2_tools.upload.network_pattern.windows="{ameba.tools_path}/upload_ota.exe" -i "{serial.port}" -p "{network.port}" -f "{ameba.tools_path}\ota.bin"
Expand Down
27 changes: 27 additions & 0 deletions Arduino_package/package_realtek_amebapro2_early_index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,33 @@
"size":"77770301"
}
]
},
{
"name": "ameba_pro2_tools",
"version": "1.3.3",
"systems": [
{
"host": "i686-mingw32",
"archiveFileName": "ameba_pro2_tools_windows-1.3.3.tar.gz",
"url": "https://github.com/ambiot/ambpro2_arduino/raw/dev/Arduino_package/release/ameba_pro2_tools_windows-1.3.3.tar.gz",
"checksum": "SHA-256:0195ec99bfc2f3544175df866c610d2f470be4a4988b981053a67018638a166a",
"size": "5308762"
},
{
"host": "x86_64-pc-linux-gnu",
"archiveFileName": "ameba_pro2_tools_linux-1.3.3.tar.gz",
"url": "https://github.com/ambiot/ambpro2_arduino/raw/dev/Arduino_package/release/ameba_pro2_tools_linux-1.3.3.tar.gz",
"checksum": "SHA-256:63f56ba89a83d426bf60684e4e7fd5c395ab514b94f40ee9c41c2c697687583f",
"size": "6475095"
},
{
"host": "x86_64-apple-darwin",
"archiveFileName": "ameba_pro2_tools_macos-1.3.3.tar.gz",
"url": "https://github.com/ambiot/ambpro2_arduino/raw/dev/Arduino_package/release/ameba_pro2_tools_macos-1.3.3.tar.gz",
"checksum": "SHA-256:e249ee07678405836261ff225199d72c6b6ce9593f256cfe91f1d751a5b3808d",
"size": "1095742"
}
]
},
{
"name": "ameba_pro2_tools",
Expand Down
Binary file added Arduino_package/release/ameba_pro2_tools_linux-1.3.3.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added Arduino_package/release/ameba_pro2_tools_macos-1.3.3.tar.gz
View file
Open in desktop
Binary file not shown.
Binary file added Arduino_package/release/ameba_pro2_tools_windows-1.3.3.tar.gz
View file
Open in desktop
Binary file not shown.