Skip to content

Commit

Permalink
README框架调整,准备添加英文readme (#54)
Browse files Browse the repository at this point in the history
* feat: 添加LuaRobot,和机械臂采用luasocket通讯

* fix: 移除调试注释

* fix: 修正dotnet上传nuget的bug。

* fix: 修正dotnet release版本问题

* feat: 添加speedl和speedj的支持,完善文档

* fix: 修正合并错误

* fix: 更新版本号

* feat: README多语言的框架

* fix: readme错误修正

* fix: 更新版本号

* fix: 修正github action 的问题
  • Loading branch information
liufang-robot authored Sep 6, 2023
1 parent cae3717 commit 6f61630
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 10 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/linux_cpp_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/linux_python_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions README.en.md
Original file line number Diff line number Diff line change
@@ -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.
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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 |
Expand Down Expand Up @@ -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
# 运行单元测试
Expand Down Expand Up @@ -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 |
4 changes: 4 additions & 0 deletions doc/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# ChangeLog

## 1.1.7

README添加多语言支持

## 1.1.1

添加speedj和speedl的实现和文档
Expand Down

0 comments on commit 6f61630

Please sign in to comment.