tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/v2.4.2' into develop

Browse Source
This commit is contained in:
TinyO 2019-09-09 17:38:13 +08:00
commit bccc6db751
6 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/src/firmware/applicable.rst
View File

@ -22,7 +22,8 @@ MYNTEYE_S_2.0.0_alpha0.img 2.0.0-alpha0
============================ =========================== ============================ ===========================
S2100 Firmwares SDK Version 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.2.img 2.3.5(2.3.5 ~ 2.3.9)
MYNTEYE_S2100_1.1.img 2.3.4 MYNTEYE_S2100_1.1.img 2.3.4
============================ =========================== ============================ ===========================

7
docs/src/firmware/fw_changelog.rst
View File

@ -4,6 +4,13 @@ Change Log
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2
2019-09-09
-------------------
S21X0 Main Chip Firmware: MYNTEYE-S21X0-1.4.0.img
1. Support 2110 device.
2019-08-09 2019-08-09
------------------- -------------------

2
docs/src/firmware/update_main_chip.rst
View File

@ -12,7 +12,7 @@ You can download the firmware and MYNT EYE TOOL installation package in the ``Fi
Firmwares/ Firmwares/
├─Checksum.txt # File checksum ├─Checksum.txt # File checksum
├─MYNTEYE-S1030-2.5.0.img # S1030 firmware ├─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 └─mynt-eye-tool-setup.zip # MYNT EYE TOOL zip

0
samples/simple_demo/README.txt → scripts/win/nsis/README.txt
View File

32
scripts/win/winpack.sh
View File

@ -66,7 +66,7 @@ _mv_subs() {
################################################################################ ################################################################################
# build release # build release
make samples tools make samples
################################################################################ ################################################################################
# build debug # build debug
@ -95,22 +95,8 @@ _rm "$ROOT_DIR/samples/_build"
_rm "$ROOT_DIR/samples/_output" _rm "$ROOT_DIR/samples/_output"
mv "$ROOT_DIR/samples" "$ROOT_DIR/_install/samples" mv "$ROOT_DIR/samples" "$ROOT_DIR/_install/samples"
# tools # readme
mv "$ROOT_DIR/tools/_output/bin" "$ROOT_DIR/_install/bin/tools" mv "$BASE_DIR/nsis/README.txt" "$ROOT_DIR/_install"
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 # copy to _install
@ -119,7 +105,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/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/samples/"
cp -f "$ROOT_DIR/scripts/win/generate.bat" "$ROOT_DIR/_install/tools/"
################################################################################ ################################################################################
# archive exe # archive exe
@ -160,14 +145,8 @@ mv "$ROOT_DIR/_install/cmake" "$ROOT_DIR/cmake"
# samples # samples
mv "$ROOT_DIR/_install/samples" "$ROOT_DIR/samples" mv "$ROOT_DIR/_install/samples" "$ROOT_DIR/samples"
# tools # readme
mv "$ROOT_DIR/_install/tools" "$ROOT_DIR/tools" mv "$ROOT_DIR/_install/README.txt" "$BASE_DIR/nsis"
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 # clean build
@ -175,5 +154,4 @@ mv "$ROOT_DIR/_install/projects" "$ROOT_DIR/platforms/projects"
_rm "$ROOT_DIR/_build" _rm "$ROOT_DIR/_build"
_rm "$ROOT_DIR/_output" _rm "$ROOT_DIR/_output"
_echo_d "Win pack success" _echo_d "Win pack success"

1
src/mynteye/api/camera_models/equidistant_camera.cc
View File

@ -282,6 +282,7 @@ void EquidistantCamera::estimateIntrinsics(
std::vector<Eigen::Vector2d> center(boardSize.height); std::vector<Eigen::Vector2d> center(boardSize.height);
int arrayLength = boardSize.height; int arrayLength = boardSize.height;
double *radius = new double[arrayLength]; double *radius = new double[arrayLength];
memset(radius, 0, sizeof(double) * arrayLength);
for (int r = 0; r < boardSize.height; ++r) { for (int r = 0; r < boardSize.height; ++r) {
std::vector<cv::Point2d> circle; std::vector<cv::Point2d> circle;
for (int c = 0; c < boardSize.width; ++c) { for (int c = 0; c < boardSize.width; ++c) {