Skip to content

Commit 3a35cd5

Browse files
authored
Merge pull request #98 from ROBOTIS-GIT/develop
OpenCR Arduino Package 1.2.0 Release Fixed #83, #95, #96, #97
2 parents 92cdaf7 + 9bb2c68 commit 3a35cd5

File tree

195 files changed

+5326
-2259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+5326
-2259
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ notifications:
1818
branches:
1919
only:
2020
- master
21-
- develop

README.md

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
# OpenCR: Open Source Control Module for ROS
1+
# 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/)
22
![](http://emanual.robotis.com/assets/images/parts/controller/opencr10/opencr_product.png)
33

4-
|master|develop|
5-
|:---:|:---:|
6-
|[![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)|
7-
84
## ROBOTIS e-Manual for OpenCR
95
- [ROBOTIS e-Manual for OpenCR](http://emanual.robotis.com/docs/en/parts/controller/opencr10/)
106

arduino/opencr_arduino/opencr/cores/arduino/USBSerial.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ int USBSerial::read(void)
7979
}
8080

8181
void USBSerial::flush(void){
82-
82+
while( vcp_is_transmitted() == FALSE );
8383
}
8484

8585
size_t USBSerial::write(const uint8_t *buffer, size_t size)

arduino/opencr_arduino/opencr/cores/arduino/digitalWriteFast.h

+6-526
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include <Arduino.h>
2+
3+
4+
void yield(void)
5+
{
6+
//TODO : code implementations
7+
};

arduino/opencr_arduino/opencr/libraries/HX8347D/LCD.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void TFT::drawFrame(void)
147147
__LCD_WRITE_BYTE(frame_buf[i] & 0xFF);
148148
}
149149
*/
150-
SPI.transferFast(frame_buf, LCD_WIDTH*LCD_HEIGHT*2);
150+
SPI.writeFast(frame_buf, LCD_WIDTH*LCD_HEIGHT*2);
151151

152152
__LCD_CS_SET();
153153

0 commit comments

Comments
 (0)