Merge pull request #27 from ROBOTIS-GIT/develop

merged from develop
ROBOTIS-GIT · Feb 8, 2017 · 3efe545 · 3efe545
2 parents 4e48c26 + cc0d882
commit 3efe545
Show file tree

Hide file tree

Showing 677 changed files with 166,381 additions and 26,351 deletions.
diff --git a/99-opencr-cdc.rules b/99-opencr-cdc.rules
@@ -2,6 +2,8 @@
 
 #cp rules /etc/udev/rules.d/
 #sudo udevadm control --reload-rules
+#sudo udevadm trigger
 
 ATTRS{idVendor}=="0483" ATTRS{idProduct}=="5740", ENV{ID_MM_DEVICE_IGNORE}="1", MODE:="0666"
 ATTRS{idVendor}=="0483" ATTRS{idProduct}=="df11", MODE:="0666"
+ATTRS{idVendor}=="FFF1" ATTRS{idProduct}=="FF48", ENV{ID_MM_DEVICE_IGNORE}="1", MODE:="0666"
diff --git a/LICENSE b/LICENSE
diff --git a/arduino/opencr_arduino/libraries.zip → ...encr_arduino/libraries/OpenCR_ILI9341.zip b/arduino/opencr_arduino/libraries.zip → ...encr_arduino/libraries/OpenCR_ILI9341.zip