Skip to content
This repository has been archived by the owner on Aug 25, 2024. It is now read-only.

Commit

Permalink
Merge pull request #86 from entelecheia/main
Browse files Browse the repository at this point in the history
  • Loading branch information
entelecheia authored Aug 25, 2024
2 parents f71c534 + bfa0cc3 commit c96e5a3
Show file tree
Hide file tree
Showing 20 changed files with 50 additions and 239 deletions.
2 changes: 1 addition & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projectName": "cobots-2024",
"projectOwner": "chu-aie",
"projectOwner": "entelecheia",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
Expand Down
6 changes: 3 additions & 3 deletions .copier-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ author: Young Joon Lee
build_and_release: true
code_template_answers_file: .copier-hyfi-config.yaml
code_template_source: gh:entelecheia/hyfi-template
codecov_graph_token: IFGaRC86K7
codecov_graph_token: qrjvi2RkQq
copyright_year: 2024
documentaion_tool: jupyter-book
documentation_url: https://cobots2024.halla.ai
documentation_url: https://cobots2024.jeju.ai
email: yj.lee@chu.ac.kr
favicon_path: https://assets.entelecheia.ai/favicon.png
friendly_name: 협동로봇활용 2024
github_repo_name: cobots-2024
github_username: chu-aie
github_username: entelecheia
google_analytics_id: G-BQJE5V9RK2
logo_path: ''
main_branch: main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: book/_build/html
cname: cobots2024.halla.ai
cname: cobots2024.jeju.ai
46 changes: 0 additions & 46 deletions .github/workflows/prerelease-to-test-pypi.yaml

This file was deleted.

53 changes: 0 additions & 53 deletions .github/workflows/prerelease.yaml

This file was deleted.

51 changes: 0 additions & 51 deletions .github/workflows/release-patch.yaml

This file was deleted.

44 changes: 0 additions & 44 deletions .github/workflows/release-test.yaml

This file was deleted.

26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,27 @@
[course-url]: https://course.entelecheia.ai
[lecture-img]: https://img.shields.io/badge/lecture-entelecheia.ai-blue
[lecture-url]: https://lecture.entelecheia.ai
[codecov-image]: https://codecov.io/gh/chu-aie/cobots-2024/branch/main/graph/badge.svg?token=IFGaRC86K7
[codecov-url]: https://codecov.io/gh/chu-aie/cobots-2024
[codecov-image]: https://codecov.io/gh/entelecheia/cobots-2024/branch/main/graph/badge.svg?token=qrjvi2RkQq
[codecov-url]: https://codecov.io/gh/entelecheia/cobots-2024
[pypi-image]: https://img.shields.io/pypi/v/cobots2024
[license-image]: https://img.shields.io/github/license/chu-aie/cobots-2024
[license-url]: https://github.com/chu-aie/cobots-2024/blob/main/LICENSE
[version-image]: https://img.shields.io/github/v/release/chu-aie/cobots-2024?sort=semver
[release-date-image]: https://img.shields.io/github/release-date/chu-aie/cobots-2024
[release-url]: https://github.com/chu-aie/cobots-2024/releases
[license-image]: https://img.shields.io/github/license/entelecheia/cobots-2024
[license-url]: https://github.com/entelecheia/cobots-2024/blob/main/LICENSE
[version-image]: https://img.shields.io/github/v/release/entelecheia/cobots-2024?sort=semver
[release-date-image]: https://img.shields.io/github/release-date/entelecheia/cobots-2024
[release-url]: https://github.com/entelecheia/cobots-2024/releases
[jupyter-book-image]: https://jupyterbook.org/en/stable/_images/badge.svg
[repo-url]: https://github.com/chu-aie/cobots-2024
[repo-url]: https://github.com/entelecheia/cobots-2024
[pypi-url]: https://pypi.org/project/cobots2024
[docs-url]: https://cobots2024.halla.ai
[changelog]: https://github.com/chu-aie/cobots-2024/blob/main/CHANGELOG.md
[contributing guidelines]: https://github.com/chu-aie/cobots-2024/blob/main/CONTRIBUTING.md
[docs-url]: https://cobots2024.jeju.ai
[changelog]: https://github.com/entelecheia/cobots-2024/blob/main/CHANGELOG.md
[contributing guidelines]: https://github.com/entelecheia/cobots-2024/blob/main/CONTRIBUTING.md

<!-- Links: -->

Collaborative Robot Applications

- Documentation: [https://cobots2024.halla.ai][docs-url]
- GitHub: [https://github.com/chu-aie/cobots-2024][repo-url]
- Documentation: [https://cobots2024.jeju.ai][docs-url]
- GitHub: [https://github.com/entelecheia/cobots-2024][repo-url]
- PyPI: [https://pypi.org/project/cobots2024][pypi-url]

이 과정은 협동로봇의 기본적인 이해부터 고급 프로그래밍 기술까지 다루며, 학생들이 협동로봇을 활용한 다양한 작업 공정을 설계하고 구현할 수 있는 능력을 배양하는 것을 목표로 합니다. 로봇 시스템 설치, 조작, 프로그래밍, 그리고 실제 작업 공정 구현까지의 전 과정을 학습합니다.
Expand Down
5 changes: 5 additions & 0 deletions docs/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<!DOCTYPE html>
<meta charset="utf-8" />
<title>Redirecting</title>
<meta http-equiv="refresh" content="0; URL=https://cobots2024.jeju.ai/" />
<link rel="canonical" href="https://cobots2024.jeju.ai/" />
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version = "0.5.1"
description = "Collaborative Robot Applications"
authors = ["Young Joon Lee <yj.lee@chu.ac.kr>"]
license = "CC-BY-4.0"
homepage = "https://cobots2024.halla.ai"
repository = "https://github.com/chu-aie/cobots-2024"
homepage = "https://cobots2024.jeju.ai"
repository = "https://github.com/entelecheia/cobots-2024"
readme = "README.md"
packages = [{ include = "cobots2024", from = "src" }]

Expand Down
2 changes: 1 addition & 1 deletion src/cobots2024/book/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ bibtex_bibfiles:

# Information about where the book exists on the web
repository:
url: https://github.com/chu-aie/cobots-2024 # Online location of your book
url: https://github.com/entelecheia/cobots-2024 # Online location of your book
path_to_book: src/cobots2024/book # Optional path to your book, relative to the repository root
branch: main # Which branch of the repository should be used when creating links (optional)

Expand Down
2 changes: 1 addition & 1 deletion src/cobots2024/book/_toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ parts:
title: 운영체제 2024
- url: https://mlops2024.halla.ai
title: 머신러닝시스템 2024
- url: https://cobots2024.halla.ai
- url: https://cobots2024.jeju.ai
title: 협동로봇활용 2024
- url: https://aibasics.halla.ai
title: AI 세상 속으로
22 changes: 11 additions & 11 deletions src/cobots2024/book/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@
[course-url]: https://course.entelecheia.ai
[lecture-img]: https://img.shields.io/badge/lecture-entelecheia.ai-blue
[lecture-url]: https://lecture.entelecheia.ai
[codecov-image]: https://codecov.io/gh/chu-aie/cobots-2024/branch/main/graph/badge.svg?token=IFGaRC86K7
[codecov-url]: https://codecov.io/gh/chu-aie/cobots-2024
[codecov-image]: https://codecov.io/gh/entelecheia/cobots-2024/branch/main/graph/badge.svg?token=qrjvi2RkQq
[codecov-url]: https://codecov.io/gh/entelecheia/cobots-2024
[pypi-image]: https://img.shields.io/pypi/v/cobots2024
[license-image]: https://img.shields.io/github/license/chu-aie/cobots-2024
[license-url]: https://github.com/chu-aie/cobots-2024/blob/main/LICENSE
[version-image]: https://img.shields.io/github/v/release/chu-aie/cobots-2024?sort=semver
[release-date-image]: https://img.shields.io/github/release-date/chu-aie/cobots-2024
[release-url]: https://github.com/chu-aie/cobots-2024/releases
[license-image]: https://img.shields.io/github/license/entelecheia/cobots-2024
[license-url]: https://github.com/entelecheia/cobots-2024/blob/main/LICENSE
[version-image]: https://img.shields.io/github/v/release/entelecheia/cobots-2024?sort=semver
[release-date-image]: https://img.shields.io/github/release-date/entelecheia/cobots-2024
[release-url]: https://github.com/entelecheia/cobots-2024/releases
[jupyter-book-image]: https://jupyterbook.org/en/stable/_images/badge.svg
[repo-url]: https://github.com/chu-aie/cobots-2024
[repo-url]: https://github.com/entelecheia/cobots-2024
[pypi-url]: https://pypi.org/project/cobots2024
[docs-url]: https://cobots2024.halla.ai
[changelog]: https://github.com/chu-aie/cobots-2024/blob/main/CHANGELOG.md
[contributing guidelines]: https://github.com/chu-aie/cobots-2024/blob/main/CONTRIBUTING.md
[docs-url]: https://cobots2024.jeju.ai
[changelog]: https://github.com/entelecheia/cobots-2024/blob/main/CHANGELOG.md
[contributing guidelines]: https://github.com/entelecheia/cobots-2024/blob/main/CONTRIBUTING.md

<!-- Links: -->

Expand Down
2 changes: 1 addition & 1 deletion src/cobots2024/book/projects/202021024/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

## 숙제

- ![스크린샷 2024-05-28 094325](https://github.com/chu-aie/cobots-2024/assets/162118894/c26b0bbf-e9c1-4c2c-8332-fafa15bf0b78)
- ![스크린샷 2024-05-28 094325](https://github.com/entelecheia/cobots-2024/assets/162118894/c26b0bbf-e9c1-4c2c-8332-fafa15bf0b78)

## 기말 과제

Expand Down
2 changes: 1 addition & 1 deletion src/cobots2024/book/projects/202021029/12w homework
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

## turtlesim 설치 후 실행 이미지

- ![turtlesim](https://github.com/chu-aie/cobots-2024/assets/103018072/f0efd95b-1080-47d6-860e-bb643ba0e5bf)
- ![turtlesim](https://github.com/entelecheia/cobots-2024/assets/103018072/f0efd95b-1080-47d6-860e-bb643ba0e5bf)

2 changes: 1 addition & 1 deletion src/cobots2024/book/projects/202021038/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@

## 숙제

- !![스크린샷 2024-05-21 155618](https://github.com/chu-aie/cobots-2024/assets/133960401/1f6ab0be-0499-4aee-a1ff-765e827b9fba)
- !![스크린샷 2024-05-21 155618](https://github.com/entelecheia/cobots-2024/assets/133960401/1f6ab0be-0499-4aee-a1ff-765e827b9fba)
2 changes: 1 addition & 1 deletion src/cobots2024/book/projects/202121010/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ move_to_pose(panda, panda_arm, initial_pose)
실행 결과는 다음 영상과 같습니다.

<video width="700px" controls="true" autoplay="true" loop="true">
<source src="https://github.com/chu-aie/cobots-2024/assets/104025187/609e8bdc-084e-425d-854a-ebe2abf24507
<source src="https://github.com/entelecheia/cobots-2024/assets/104025187/609e8bdc-084e-425d-854a-ebe2abf24507
" type="video/mp4">
</video>

Expand Down
6 changes: 3 additions & 3 deletions src/cobots2024/book/projects/202221014/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## 중간 계획서

![image](https://github.com/chu-aie/cobots-2024/assets/133697595/30a66e8b-fc21-491b-9757-483044c33f19)
![image](https://github.com/entelecheia/cobots-2024/assets/133697595/30a66e8b-fc21-491b-9757-483044c33f19)

### 프로젝트 개요

Expand Down Expand Up @@ -61,7 +61,7 @@

이 프로젝트는 ROS2를 기반으로 한 가상의 협동로봇팔을 사용하여 화분을 인식하고 관리하는 자동화된 시스템을 개발하는 것이다. 주요 작업으로는 화분에 물을 주고, 열매를 채집하는 작업이 포함된다. 실제 로봇이 아닌 가상 환경에서 진행되었으며, 이를 위해 WSL Ubuntu 22.04와 ROS2 Humble 버전을 사용하였다. 모든 작업은 Docker를 이용하여 가상 환경에서 진행되었다.

<img width="763" alt="ros2_ph" src="https://github.com/chu-aie/cobots-2024/assets/133697595/1b5d7a50-f9be-4f97-9f4c-c0307bec2ecd">
<img width="763" alt="ros2_ph" src="https://github.com/entelecheia/cobots-2024/assets/133697595/1b5d7a50-f9be-4f97-9f4c-c0307bec2ecd">

### 프로젝트 목표

Expand Down Expand Up @@ -511,7 +511,7 @@ close_gripper()

Gazebo 시뮬레이션을 통해 가상 로봇팔의 움직임과 작업을 테스트하였다. 각 작업(물뿌리기, 열매 채집)의 정확성을 확인하고, 필요한 조정을 수행하였다.

https://github.com/chu-aie/cobots-2024/assets/133697595/e6f28a67-8673-4f70-8d09-14dc053b0a4c
https://github.com/entelecheia/cobots-2024/assets/133697595/e6f28a67-8673-4f70-8d09-14dc053b0a4c

### 결과 및 논의

Expand Down
Loading

0 comments on commit c96e5a3

Please sign in to comment.