Merge pull request #98 from ROBOTIS-GIT/develop

OpenCR Arduino Package 1.2.0 Release Fixed #83, #95, #96, #97
ROBOTIS-GIT · May 25, 2018 · 3a35cd5 · 3a35cd5
2 parents 92cdaf7 + 9bb2c68
commit 3a35cd5
Show file tree

Hide file tree

Showing 195 changed files with 5,326 additions and 2,259 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,4 +18,3 @@ notifications:
 branches:
   only:
     - master
-    - develop
diff --git a/README.md b/README.md
@@ -1,10 +1,6 @@
-# OpenCR: Open Source Control Module for ROS
+# OpenCR: Open Source Control Module for ROS [![Build Status](https://travis-ci.org/ROBOTIS-GIT/OpenCR.svg?branch=master)](https://travis-ci.org/ROBOTIS-GIT/OpenCR/)
 ![](http://emanual.robotis.com/assets/images/parts/controller/opencr10/opencr_product.png)
 
-|master|develop|
-|:---:|:---:|
-|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/OpenCR.svg?branch=master)](https://travis-ci.org/ROBOTIS-GIT/OpenCR/)| [![Build Status](https://travis-ci.org/ROBOTIS-GIT/OpenCR.svg?branch=develop)](https://travis-ci.org/ROBOTIS-GIT/OpenCR/branches)|
-
 ## ROBOTIS e-Manual for OpenCR
 - [ROBOTIS e-Manual for OpenCR](http://emanual.robotis.com/docs/en/parts/controller/opencr10/)
 

diff --git a/arduino/opencr_arduino/opencr/cores/arduino/USBSerial.cpp b/arduino/opencr_arduino/opencr/cores/arduino/USBSerial.cpp
@@ -79,7 +79,7 @@ int USBSerial::read(void)
 }
 
 void USBSerial::flush(void){
-
+  while( vcp_is_transmitted() == FALSE );
 }
 
 size_t USBSerial::write(const uint8_t *buffer, size_t size)

diff --git a/arduino/opencr_arduino/opencr/cores/arduino/digitalWriteFast.h b/arduino/opencr_arduino/opencr/cores/arduino/digitalWriteFast.h
diff --git a/arduino/opencr_arduino/opencr/cores/arduino/yield.cpp b/arduino/opencr_arduino/opencr/cores/arduino/yield.cpp
@@ -0,0 +1,7 @@
+#include <Arduino.h>
+
+
+void yield(void)
+{
+  //TODO : code implementations
+};
diff --git a/arduino/opencr_arduino/opencr/libraries/HX8347D/LCD.cpp b/arduino/opencr_arduino/opencr/libraries/HX8347D/LCD.cpp
@@ -147,7 +147,7 @@ void TFT::drawFrame(void)
     __LCD_WRITE_BYTE(frame_buf[i] & 0xFF);
   }
   */
-  SPI.transferFast(frame_buf, LCD_WIDTH*LCD_HEIGHT*2);
+  SPI.writeFast(frame_buf, LCD_WIDTH*LCD_HEIGHT*2);
 
   __LCD_CS_SET();