From 8af42ee597eaa8fbde3a044d21ea8316ba261866 Mon Sep 17 00:00:00 2001 From: TinyO Date: Tue, 3 Sep 2019 16:30:19 +0800 Subject: [PATCH 1/7] fix(*): d local params fix. --- src/mynteye/api/camera_models/equidistant_camera.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mynteye/api/camera_models/equidistant_camera.cc b/src/mynteye/api/camera_models/equidistant_camera.cc index 57eb3c1..406df61 100644 --- a/src/mynteye/api/camera_models/equidistant_camera.cc +++ b/src/mynteye/api/camera_models/equidistant_camera.cc @@ -282,6 +282,7 @@ void EquidistantCamera::estimateIntrinsics( std::vector center(boardSize.height); int arrayLength = boardSize.height; double *radius = new double[arrayLength]; + memset(radius, 0, sizeof(double) * arrayLength); for (int r = 0; r < boardSize.height; ++r) { std::vector circle; for (int c = 0; c < boardSize.width; ++c) { From 74a0a1eb85d2b8e38da312f07da349e7c49169ad Mon Sep 17 00:00:00 2001 From: TinyO Date: Fri, 6 Sep 2019 17:11:51 +0800 Subject: [PATCH 2/7] fix(*): win pack.sh --- scripts/win/winpack.sh | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/scripts/win/winpack.sh b/scripts/win/winpack.sh index e081ac9..36bb2a4 100644 --- a/scripts/win/winpack.sh +++ b/scripts/win/winpack.sh @@ -95,23 +95,6 @@ _rm "$ROOT_DIR/samples/_build" _rm "$ROOT_DIR/samples/_output" mv "$ROOT_DIR/samples" "$ROOT_DIR/_install/samples" -# tools -mv "$ROOT_DIR/tools/_output/bin" "$ROOT_DIR/_install/bin/tools" -mv "$ROOT_DIR/tools/_output/lib" "$ROOT_DIR/_install/lib/tools" -_rm "$ROOT_DIR/tools/_build" -_rm "$ROOT_DIR/tools/_output" -mv "$ROOT_DIR/tools/linter" "$ROOT_DIR/3rdparty/linter" -mv "$ROOT_DIR/tools" "$ROOT_DIR/_install/tools" - -# platforms/win -mv "$ROOT_DIR/platforms/win/README.txt" "$ROOT_DIR/_install" - -_rm "$ROOT_DIR/platforms/projects/vs2017/mynteyes_demo/.vs" -_rm "$ROOT_DIR/platforms/projects/vs2017/mynteyes_demo/x64" -_rm "$ROOT_DIR/platforms/projects/vs2017/mynteyes_demo/mynteyes_demo/x64" -_rm "$ROOT_DIR/platforms/projects/vs2017/mynteyes_demo/mynteyes_demo/mynteyes_demo.vcxproj.user" -mv "$ROOT_DIR/platforms/projects" "$ROOT_DIR/_install/projects" - ################################################################################ # copy to _install @@ -119,7 +102,6 @@ cp -f "$ROOT_DIR/scripts/win/cmake/mynteye-targets.cmake" "$ROOT_DIR/_install/li cp -f "$ROOT_DIR/scripts/win/cmake/mynteye-targets-release.cmake" "$ROOT_DIR/_install/lib/cmake/mynteye/" cp -f "$ROOT_DIR/scripts/win/generate.bat" "$ROOT_DIR/_install/samples/" -cp -f "$ROOT_DIR/scripts/win/generate.bat" "$ROOT_DIR/_install/tools/" ################################################################################ # archive exe @@ -160,15 +142,6 @@ mv "$ROOT_DIR/_install/cmake" "$ROOT_DIR/cmake" # samples mv "$ROOT_DIR/_install/samples" "$ROOT_DIR/samples" -# tools -mv "$ROOT_DIR/_install/tools" "$ROOT_DIR/tools" -mv "$ROOT_DIR/3rdparty/linter" "$ROOT_DIR/tools/linter" - -# platforms/win -mv "$ROOT_DIR/_install/README.txt" "$ROOT_DIR/platforms/win" - -mv "$ROOT_DIR/_install/projects" "$ROOT_DIR/platforms/projects" - ################################################################################ # clean build From 7071864eb70ab93c77b5632af4f70483f2ac6d1f Mon Sep 17 00:00:00 2001 From: TinyO Date: Mon, 9 Sep 2019 10:23:36 +0800 Subject: [PATCH 3/7] fix(*): win pack.sh lost readme things --- scripts/win/winpack.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/win/winpack.sh b/scripts/win/winpack.sh index 36bb2a4..9c17e5f 100644 --- a/scripts/win/winpack.sh +++ b/scripts/win/winpack.sh @@ -95,6 +95,9 @@ _rm "$ROOT_DIR/samples/_build" _rm "$ROOT_DIR/samples/_output" mv "$ROOT_DIR/samples" "$ROOT_DIR/_install/samples" +# platforms/win +mv "$ROOT_DIR/samples/simple_demo/README.txt" "$ROOT_DIR/_install" + ################################################################################ # copy to _install @@ -139,6 +142,9 @@ mv "$ROOT_DIR/_install/3rdparty/opencv" "$ROOT_DIR/3rdparty/opencv" # cmake mv "$ROOT_DIR/_install/cmake" "$ROOT_DIR/cmake" +# platforms/win +mv "$ROOT_DIR/_install/README.txt" "$ROOT_DIR/samples/simple_demo" + # samples mv "$ROOT_DIR/_install/samples" "$ROOT_DIR/samples" From 68e06e4335b51ec988b6d084c88baf3042d801da Mon Sep 17 00:00:00 2001 From: TinyO Date: Mon, 9 Sep 2019 11:00:01 +0800 Subject: [PATCH 4/7] fix(*): win pack.sh complie. --- scripts/win/winpack.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/win/winpack.sh b/scripts/win/winpack.sh index 9c17e5f..51a9ddc 100644 --- a/scripts/win/winpack.sh +++ b/scripts/win/winpack.sh @@ -142,9 +142,6 @@ mv "$ROOT_DIR/_install/3rdparty/opencv" "$ROOT_DIR/3rdparty/opencv" # cmake mv "$ROOT_DIR/_install/cmake" "$ROOT_DIR/cmake" -# platforms/win -mv "$ROOT_DIR/_install/README.txt" "$ROOT_DIR/samples/simple_demo" - # samples mv "$ROOT_DIR/_install/samples" "$ROOT_DIR/samples" From 97eb323bf3b67a00e9a759aeb7dfb286abe640b1 Mon Sep 17 00:00:00 2001 From: TinyO Date: Mon, 9 Sep 2019 11:46:38 +0800 Subject: [PATCH 5/7] fix(*): win pack.sh complie new. --- scripts/win/winpack.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/win/winpack.sh b/scripts/win/winpack.sh index 51a9ddc..2c29a11 100644 --- a/scripts/win/winpack.sh +++ b/scripts/win/winpack.sh @@ -142,6 +142,10 @@ mv "$ROOT_DIR/_install/3rdparty/opencv" "$ROOT_DIR/3rdparty/opencv" # cmake mv "$ROOT_DIR/_install/cmake" "$ROOT_DIR/cmake" +# platforms/win +mkdir "$ROOT_DIR/platforms" +mv "$ROOT_DIR/_install/README.txt" "$ROOT_DIR/platforms/win" + # samples mv "$ROOT_DIR/_install/samples" "$ROOT_DIR/samples" From 1744826e8f7ef0de534f592cc2800591f102490f Mon Sep 17 00:00:00 2001 From: TinyO Date: Mon, 9 Sep 2019 15:12:49 +0800 Subject: [PATCH 6/7] doc(*): update firmware things. --- docs/src/firmware/applicable.rst | 3 ++- docs/src/firmware/fw_changelog.rst | 7 +++++++ docs/src/firmware/update_main_chip.rst | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/src/firmware/applicable.rst b/docs/src/firmware/applicable.rst index d30271f..8bf010e 100644 --- a/docs/src/firmware/applicable.rst +++ b/docs/src/firmware/applicable.rst @@ -22,7 +22,8 @@ MYNTEYE_S_2.0.0_alpha0.img 2.0.0-alpha0 ============================ =========================== S2100 Firmwares SDK Version ============================ =========================== -MYNTEYE-S2100-1.3.2.img 2.4.0(2.4.0 ~ latest) +MYNTEYE-S21X0-1.4.0.img 2.4.2(2.4.2 ~ latest) +MYNTEYE-S2100-1.3.2.img 2.4.0(2.4.0 ~ 2.4.1) MYNTEYE_S2100_1.2.img 2.3.5(2.3.5 ~ 2.3.9) MYNTEYE_S2100_1.1.img 2.3.4 ============================ =========================== diff --git a/docs/src/firmware/fw_changelog.rst b/docs/src/firmware/fw_changelog.rst index a0f6743..67d9ece 100644 --- a/docs/src/firmware/fw_changelog.rst +++ b/docs/src/firmware/fw_changelog.rst @@ -4,6 +4,13 @@ Change Log .. toctree:: :maxdepth: 2 +2019-09-09 +------------------- + +S21X0 Main Chip Firmware: MYNTEYE-S21X0-1.4.0.img + +1. Support 2110 device. + 2019-08-09 ------------------- diff --git a/docs/src/firmware/update_main_chip.rst b/docs/src/firmware/update_main_chip.rst index a783a04..701f7ce 100644 --- a/docs/src/firmware/update_main_chip.rst +++ b/docs/src/firmware/update_main_chip.rst @@ -12,7 +12,7 @@ You can download the firmware and MYNT EYE TOOL installation package in the ``Fi Firmwares/ ├─Checksum.txt # File checksum ├─MYNTEYE-S1030-2.5.0.img # S1030 firmware - ├─MYNTEYE-S2100-1.3.2.img # S2100 firmware + ├─MYNTEYE-S21x0-1.4.0.img # S21X0 firmware ├─... └─mynt-eye-tool-setup.zip # MYNT EYE TOOL zip From 67078d69c5c903934d4a073a556abaf2c506b6fc Mon Sep 17 00:00:00 2001 From: John Zhao Date: Mon, 9 Sep 2019 16:19:10 +0800 Subject: [PATCH 7/7] fix(*): win pack.sh readme --- .../simple_demo => scripts/win/nsis}/README.txt | 0 scripts/win/winpack.sh | 14 ++++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) rename {samples/simple_demo => scripts/win/nsis}/README.txt (100%) diff --git a/samples/simple_demo/README.txt b/scripts/win/nsis/README.txt similarity index 100% rename from samples/simple_demo/README.txt rename to scripts/win/nsis/README.txt diff --git a/scripts/win/winpack.sh b/scripts/win/winpack.sh index 2c29a11..4f7cc46 100644 --- a/scripts/win/winpack.sh +++ b/scripts/win/winpack.sh @@ -66,7 +66,7 @@ _mv_subs() { ################################################################################ # build release -make samples tools +make samples ################################################################################ # build debug @@ -95,8 +95,8 @@ _rm "$ROOT_DIR/samples/_build" _rm "$ROOT_DIR/samples/_output" mv "$ROOT_DIR/samples" "$ROOT_DIR/_install/samples" -# platforms/win -mv "$ROOT_DIR/samples/simple_demo/README.txt" "$ROOT_DIR/_install" +# readme +mv "$BASE_DIR/nsis/README.txt" "$ROOT_DIR/_install" ################################################################################ # copy to _install @@ -142,18 +142,16 @@ mv "$ROOT_DIR/_install/3rdparty/opencv" "$ROOT_DIR/3rdparty/opencv" # cmake mv "$ROOT_DIR/_install/cmake" "$ROOT_DIR/cmake" -# platforms/win -mkdir "$ROOT_DIR/platforms" -mv "$ROOT_DIR/_install/README.txt" "$ROOT_DIR/platforms/win" - # samples mv "$ROOT_DIR/_install/samples" "$ROOT_DIR/samples" +# readme +mv "$ROOT_DIR/_install/README.txt" "$BASE_DIR/nsis" + ################################################################################ # clean build _rm "$ROOT_DIR/_build" _rm "$ROOT_DIR/_output" - _echo_d "Win pack success"