update

.gitattributes

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Git LFS 配置 - 处理大文件
 *.mp4 filter=lfs diff=lfs merge=lfs -text
 *.csv filter=lfs diff=lfs merge=lfs -text
@@ -12,3 +13,64 @@ __pycache__/
 *.so
 .coverage
 .pytest_cache/
+=======
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.arrow filter=lfs diff=lfs merge=lfs -text
+*.bin filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+*.ftz filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.h5 filter=lfs diff=lfs merge=lfs -text
+*.joblib filter=lfs diff=lfs merge=lfs -text
+*.lfs.* filter=lfs diff=lfs merge=lfs -text
+*.lz4 filter=lfs diff=lfs merge=lfs -text
+*.mds filter=lfs diff=lfs merge=lfs -text
+*.mlmodel filter=lfs diff=lfs merge=lfs -text
+*.model filter=lfs diff=lfs merge=lfs -text
+*.msgpack filter=lfs diff=lfs merge=lfs -text
+*.npy filter=lfs diff=lfs merge=lfs -text
+*.npz filter=lfs diff=lfs merge=lfs -text
+*.onnx filter=lfs diff=lfs merge=lfs -text
+*.ot filter=lfs diff=lfs merge=lfs -text
+*.parquet filter=lfs diff=lfs merge=lfs -text
+*.pb filter=lfs diff=lfs merge=lfs -text
+*.pickle filter=lfs diff=lfs merge=lfs -text
+*.pkl filter=lfs diff=lfs merge=lfs -text
+*.pt filter=lfs diff=lfs merge=lfs -text
+*.pth filter=lfs diff=lfs merge=lfs -text
+*.rar filter=lfs diff=lfs merge=lfs -text
+*.safetensors filter=lfs diff=lfs merge=lfs -text
+saved_model/**/* filter=lfs diff=lfs merge=lfs -text
+*.tar.* filter=lfs diff=lfs merge=lfs -text
+*.tar filter=lfs diff=lfs merge=lfs -text
+*.tflite filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.wasm filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
+*tfevents* filter=lfs diff=lfs merge=lfs -text
+# Audio files - uncompressed
+*.pcm filter=lfs diff=lfs merge=lfs -text
+*.sam filter=lfs diff=lfs merge=lfs -text
+*.raw filter=lfs diff=lfs merge=lfs -text
+# Audio files - compressed
+*.aac filter=lfs diff=lfs merge=lfs -text
+*.flac filter=lfs diff=lfs merge=lfs -text
+*.mp3 filter=lfs diff=lfs merge=lfs -text
+*.ogg filter=lfs diff=lfs merge=lfs -text
+*.wav filter=lfs diff=lfs merge=lfs -text
+# Image files - uncompressed
+*.bmp filter=lfs diff=lfs merge=lfs -text
+*.gif filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.tiff filter=lfs diff=lfs merge=lfs -text
+# Image files - compressed
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.jpeg filter=lfs diff=lfs merge=lfs -text
+*.webp filter=lfs diff=lfs merge=lfs -text
+# Video files - compressed
+*.mp4 filter=lfs diff=lfs merge=lfs -text
+*.webm filter=lfs diff=lfs merge=lfs -text
+>>>>>>> 1e471f3c4c4c835a000978e1540f25f6a6345aaf

README.md

@@ -1,3 +1,13 @@
+<<<<<<< HEAD
+=======
+---
+license: mit
+task_categories:
+- robotics
+tags:
+- tactile
+---
+>>>>>>> 1e471f3c4c4c835a000978e1540f25f6a6345aaf
 # 📦 FreeTacman
 ## Robot-free Visuo-Tactile Data Collection System for Contact-rich Manipulation
 
@@ -12,8 +22,13 @@ Please refer to our 🚀 [Website](http://opendrivelab.com/freetacman) | 📄 [P
 
 The dataset is organized into 50 task categories, each containing:
 
+<<<<<<< HEAD
 - **Video files**: Synchronized video recordings from the wrist-mounted and visuo-tactile cameras for each demonstration.
 - **Trajectory files**: Detailed 3D tracking data for TCP and gripper distance.
+=======
+- **Video files**: Synchronized video recordings from the wrist-mounted and visuo-tactile cameras for each demonstration
+- **Trajectory files**: Detailed tracking data for tool center point pose and gripper distance
+>>>>>>> 1e471f3c4c4c835a000978e1540f25f6a6345aaf
 
 
 ## 🧾 Data Format
@@ -31,6 +46,7 @@ Each trajectory file contains the following data columns:
 - `timestamp` - Unix Timestamp
 
 #### Tool Center Point (TCP) Data
+<<<<<<< HEAD
 - `TCP_pos_x`, `TCP_pos_y`, `TCP_pos_z` - TCP 3D position (mm)
 - `TCP_euler_x`, `TCP_euler_y`, `TCP_euler_z` - TCP orientation (Euler angles in degrees)
 - `quat_w`, `quat_x`, `quat_y`, `quat_z` - TCP orientation (quaternion representation)
@@ -39,6 +55,14 @@ Each trajectory file contains the following data columns:
 - `gripper_distance` - Gripper opening distance (mm)
 
 All positional data is measured in millimeters (mm), and orientation angles are in degrees.
+=======
+- `TCP_pos_x`, `TCP_pos_y`, `TCP_pos_z` - TCP position
+- `TCP_euler_x`, `TCP_euler_y`, `TCP_euler_z` - TCP orientation (euler angles)
+- `quat_w`, `quat_x`, `quat_y`, `quat_z` - TCP orientation (quaternion representation)
+
+#### Gripper Data
+- `gripper_distance` - Gripper opening distance
+>>>>>>> 1e471f3c4c4c835a000978e1540f25f6a6345aaf
 
 
 ## 📝 Citation
@@ -56,6 +80,7 @@ If you use this dataset in your research, please cite:
 
 ## 💼 License
 
+<<<<<<< HEAD
 This dataset is released under the Apache 2.0 License. See LICENSE file for details.
 
 ## 📧 Contact
@@ -63,3 +88,10 @@ This dataset is released under the Apache 2.0 License. See LICENSE file for deta
 For questions or issues regarding the dataset, please contact: Longyan Wu ([email protected])
 
 
+=======
+This dataset is released under the MIT License. See LICENSE file for details.
+
+## 📧 Contact
+
+For questions or issues regarding the dataset, please contact: Longyan Wu ([email protected]).
+>>>>>>> 1e471f3c4c4c835a000978e1540f25f6a6345aaf