Compare commits

...

15 Commits

Author SHA1 Message Date
b85d7e61f0 updated README.md 2024-03-04 11:30:38 +01:00
35f3917785 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	.gitignore
2024-03-04 11:30:17 +01:00
e3fdcfff35 updated README.md 2024-03-04 11:30:04 +01:00
dc10214e3d updated README.md 2024-03-04 11:25:18 +01:00
98d7868242 updated README.md 2024-03-04 11:24:49 +01:00
0a45317e11 updated README.md 2024-03-04 11:22:52 +01:00
0c41df14c3 updated README.md 2024-03-04 11:22:18 +01:00
528a2d8821 updated README.md 2024-03-04 11:21:44 +01:00
7616963082 Update serial submodule to latest 2024-03-04 11:11:21 +01:00
30120e42c2 „.gitmodules“ ändern 2024-03-02 16:51:39 +00:00
3f7a7f5984 added docker 2024-02-29 14:32:31 +01:00
a586ad83a2 initial commit 2024-02-29 14:15:19 +01:00
d056594620 initial commit 2024-02-29 14:15:00 +01:00
201ff8fb96 initial commit 2024-02-29 13:54:35 +01:00
7da3dae8da initial commit 2024-02-29 13:34:17 +01:00
9 changed files with 104 additions and 1 deletions

3
.gitignore vendored
View File

@ -1,4 +1,5 @@
/build/ /build/
/install/ /install/
/log/ /log/
.idea .idea/

8
.idea/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@ -0,0 +1,10 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<Languages>
<language minSize="73" name="Python" />
</Languages>
</inspection_tool>
</profile>
</component>

View File

@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

7
.idea/misc.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Black">
<option name="sdkName" value="Python 3.10" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10" project-jdk-type="Python SDK" />
</project>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/ws_universal_robotics.iml" filepath="$PROJECT_DIR$/.idea/ws_universal_robotics.iml" />
</modules>
</component>
</project>

10
.idea/vcs.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/src/Universal_Robots_ROS2_Description" vcs="Git" />
<mapping directory="$PROJECT_DIR$/src/Universal_Robots_ROS2_Driver" vcs="Git" />
<mapping directory="$PROJECT_DIR$/src/ros2_robotiq_gripper" vcs="Git" />
<mapping directory="$PROJECT_DIR$/src/serial" vcs="Git" />
</component>
</project>

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PyDocumentationSettings">
<option name="format" value="PLAIN" />
<option name="myDocStringFormat" value="Plain" />
</component>
<component name="TestRunnerService">
<option name="PROJECT_TEST_RUNNER" value="py.test" />
</component>
</module>

View File

@ -0,0 +1,38 @@
## UR Robotiq
*This project provides tools and integration to manage a Universal Robotics UR3e robot arm with the Robotiq 2F 140 gripper.*
## How to Download (with Submodules)
To download this repository and all of its included submodules, follow these steps:
1. **Prerequisites**
* Make sure you have Git installed on your system ([https://git-scm.com/downloads](https://git-scm.com/downloads)).
2. **Gitea SSH Connection**
* This is only usable in the University Network (the VPN hasn't worked so far either)
* Follow this tutorial: https://www.techaddressed.com/tutorials/add-verify-ssh-keys-gitea/
3. **Cloning the Repository**
* Open your terminal or command prompt.
* Navigate to the directory where you want to download the project.
* Run the following Git command:
```bash
git clone --recurse-submodules git@git.cps.unileoben.ac.at:Niko/UR_Robotiq.git
```
## How to Start the Docker Compose
1. **Prerequisites**
* Ensure you have Docker and Docker Compose installed on your system (Instructions can be found on the official Docker website: [https://www.docker.com/](https://www.docker.com/))
2. **Starting the Containers**
* Navigate to the project directory in your terminal:
```bash
cd UR-Robotiq
```
* Run the following command to start the Docker Compose:
```bash
docker-compose up -d
```