From 6f61630668f1252a0de0e72d26dc3c8bff9ba4f2 Mon Sep 17 00:00:00 2001 From: liufang-robot <61956285+liufang-robot@users.noreply.github.com> Date: Wed, 6 Sep 2023 22:45:52 +0800 Subject: [PATCH] =?UTF-8?q?README=E6=A1=86=E6=9E=B6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E5=87=86=E5=A4=87=E6=B7=BB=E5=8A=A0=E8=8B=B1=E6=96=87?= =?UTF-8?q?readme=20(#54)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 添加LuaRobot，和机械臂采用luasocket通讯 * fix: 移除调试注释 * fix: 修正dotnet上传nuget的bug。 * fix: 修正dotnet release版本问题 * feat: 添加speedl和speedj的支持，完善文档 * fix: 修正合并错误 * fix: 更新版本号 * feat: README多语言的框架 * fix: readme错误修正 * fix: 更新版本号 * fix: 修正github action 的问题 --- .github/workflows/linux_cpp_build.yml | 3 --- .github/workflows/linux_python_build.yml | 3 --- CMakeLists.txt | 2 +- Doxyfile | 2 +- README.en.md | 3 +++ README.md | 10 ++++++++-- doc/changelog.md | 4 ++++ 7 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 README.en.md diff --git a/.github/workflows/linux_cpp_build.yml b/.github/workflows/linux_cpp_build.yml index 6d9a6c5..62d305a 100644 --- a/.github/workflows/linux_cpp_build.yml +++ b/.github/workflows/linux_cpp_build.yml @@ -5,9 +5,6 @@ on: pull_request: jobs: linux_cpp_build: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/linux_python_build.yml b/.github/workflows/linux_python_build.yml index 8b70fd0..ac0fc55 100644 --- a/.github/workflows/linux_python_build.yml +++ b/.github/workflows/linux_python_build.yml @@ -3,9 +3,6 @@ run-name: ${{ github.actor }} Linux python build on: workflow_dispatch: pull_request: - push: - branches: - - master jobs: linux_python_build: runs-on: ubuntu-latest diff --git a/CMakeLists.txt b/CMakeLists.txt index ac6c6bf..1340105 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") option(CMAKE_EXPORT_COMPILE_COMMANDS "Export compile command" TRUE) -project(lebai VERSION 1.1.6 LANGUAGES CXX) +project(lebai VERSION 1.1.7 LANGUAGES CXX) set(PROJECT_NAMESPACE lebai) message(STATUS "${PROJECT_NAME} version: ${PROJECT_VERSION}") # message(STATUS "major: ${PROJECT_VERSION_MAJOR}") diff --git a/Doxyfile b/Doxyfile index 7d04050..f11def3 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "lebai sdk" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.1.6 +PROJECT_NUMBER = 1.1.7 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/README.en.md b/README.en.md new file mode 100644 index 0000000..b40059b --- /dev/null +++ b/README.en.md @@ -0,0 +1,3 @@ +[![en](https://img.shields.io/badge/lang-en-green.svg)](https://github.com/lebai-robotics/lebai-sdk/blob/master/README.en.md) + +lebai-sdk's source code repository, can be used to control the Lebai robot arm. \ No newline at end of file diff --git a/README.md b/README.md index 2284a57..b166fdb 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +# Languages +[![zh](https://img.shields.io/badge/lang-zh-red.svg)](https://github.com/lebai-robotics/lebai-sdk/blob/master/README.md) +[![en](https://img.shields.io/badge/lang-en-green.svg)](https://github.com/lebai-robotics/lebai-sdk/blob/master/README.en.md) + lebai-sdk的源代码仓库，可以用于控制乐白机械臂. | OS | C++ | Python | C# | Java | @@ -78,7 +82,9 @@ sudo apt install python-dev python-setuptools ### 编译 ```bash # 生成编译配置 -cmake -S. -Bbuild -DBUILD_PYTHON=ON -DBUILD_DEB=ON -DBUILD_TESTING=OFF +cmake -S. -Bbuild -DBUILD_PYTHON=ON -DBUILD_DEB=ON -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF +# 生成编译配置，只C++,同时生成DEB包 +cmake -S. -Bbuild -DBUILD_PYTHON=OFF -DBUILD_DEB=ON -DBUILD_TESTING=OFF # 编译 cmake --build build # 运行单元测试 @@ -137,7 +143,7 @@ lebai-sdk使用如下第三方软件: | 软件名 | 协议 | 官方网站 | | ----------- | ----------- |----------- | -| Asio | Boost | https://think-async.com/Asio/ | +| Asio | [MPL2](https://www.mozilla.org/en-US/MPL/2.0/FAQ/) | https://think-async.com/Asio/ | | rapidjson | MIT | https://rapidjson.org/ | | websocketpp | BSD | https://www.zaphoyd.com/websocketpp | | mdns | public domain | https://github.com/mjansson/mdns | diff --git a/doc/changelog.md b/doc/changelog.md index ab74cd5..bb03c11 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,5 +1,9 @@ # ChangeLog +## 1.1.7 + +README添加多语言支持 + ## 1.1.1 添加speedj和speedl的实现和文档