From 165bacb45553df399a34b35119726820398e72e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B9=E5=8F=A3=E7=90=B4=E7=9A=84=E9=92=A2=E9=93=81?= =?UTF-8?q?=E4=BE=A0?= Date: Wed, 24 Aug 2016 09:34:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B8=80=E4=B8=8BREADME?= =?UTF-8?q?=E7=9A=84=E6=8E=92=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 62b0ca57..9f720ec2 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,14 @@ # Makeblock Library v3.24 -Revision of history: -Author Time Version Descr -Mark Yan 2015/07/24 3.0.0 Rebuild the old lib. -Rafael Lee 2015/09/02 3.1.0 Added some comments and macros. -Lawrence 2015/09/09 3.2.0 Include some Arduino's official headfiles which path specified. -Mark Yan 2015/11/02 3.2.1 fix bug on MACOS. -Mark Yan 2016/01/21 3.2.2 fix some library bugs. -Mark Yan 2016/05/17 3.2.3 add support for MegaPi and Auriga Board. -Mark Yan 2016/07/27 3.2.4 fix some JIRA issue, add PID motion for Megapi/Auriga on board encoder motor. - Arduino Library for Makeblock Electronic Modules -How to use: +###How to use: 1. Download the source from the git https://github.com/Makeblock-official/Makeblock-Libraries 2. copy the makeblock folder to your arduino default library. Your Arduino library folder should now look like this (on Windows): [arduino installation directory]\libraries\makeblock\src - (On MACOS): [arduino Package Contents]\contents\Jave\libraries\makeblock\src + (on MACOS): [arduino Package Contents]\contents\Jave\libraries\makeblock\src 3. Open the Arduino Application. (If it's already open, you will need to restart it to see changes.) @@ -39,3 +29,14 @@ How to use: Auriga <-------> MeAuriga.h MegaPi <-------> MeMegaPi.h + +###Revision of history: +|Author | Time | Version | Descr | +| -------- | :-----: | :----: | :----: | +|Mark Yan | 2015/07/24 | 3.0.0 | Rebuild the old lib.| +|Rafael Lee | 2015/09/02 | 3.1.0 | Added some comments and macros.| +|Lawrence | 2015/09/09 | 3.2.0 | Include some Arduino's official headfiles which path specified.| +|Mark Yan | 2015/11/02 | 3.2.1 | fix bug on MACOS.| +|Mark Yan | 2016/01/21 | 3.2.2 | fix some library bugs.| +|Mark Yan | 2016/05/17 | 3.2.3 | add support for MegaPi and Auriga Board.| +|Mark Yan | 2016/07/27 | 3.2.4 | fix some JIRA issue, add PID motion for Megapi/Auriga on board encoder motor.| \ No newline at end of file From 0d9ad7dc805a1c3d5f8497b72b921318b1d6b950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B9=E5=8F=A3=E7=90=B4=E7=9A=84=E9=92=A2=E9=93=81?= =?UTF-8?q?=E4=BE=A0?= Date: Wed, 24 Aug 2016 09:38:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=B9README=E7=9A=84=E6=8E=92=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9f720ec2..d2baa120 100644 --- a/README.md +++ b/README.md @@ -6,16 +6,16 @@ Arduino Library for Makeblock Electronic Modules 1. Download the source from the git https://github.com/Makeblock-official/Makeblock-Libraries -2. copy the makeblock folder to your arduino default library. Your Arduino library folder should now look like this - (on Windows): [arduino installation directory]\libraries\makeblock\src +2. copy the makeblock folder to your arduino default library. Your Arduino library folder should now look like thisasd + (on Windows): [arduino installation directory]\libraries\makeblock\src (on MACOS): [arduino Package Contents]\contents\Jave\libraries\makeblock\src 3. Open the Arduino Application. (If it's already open, you will need to restart it to see changes.) -4. Click "File-> Examples". Here are some test programs in MakeBlockDrive-> example +4. Click "File-> Examples". Here are some test programs in "MakeBlockDrive-> example" 5. Depending on the type of board you're using, you need to modify the header file to match. - For example, if you're using a mCore. You should change "#include " to "#include " + For example, if you're using a mCore. You should change `#include ` to `#include ` Corresponding boards and there header file are: Orion <--------> MeOrion.h From ccf8948e4050a52819e29081d6be1dfcda3fbfe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B9=E5=8F=A3=E7=90=B4=E7=9A=84=E9=92=A2=E9=93=81?= =?UTF-8?q?=E4=BE=A0?= Date: Wed, 24 Aug 2016 09:38:53 +0800 Subject: [PATCH 3/3] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d2baa120..9fe378fe 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Arduino Library for Makeblock Electronic Modules 1. Download the source from the git https://github.com/Makeblock-official/Makeblock-Libraries -2. copy the makeblock folder to your arduino default library. Your Arduino library folder should now look like thisasd +2. copy the makeblock folder to your arduino default library. Your Arduino library folder should now look like this (on Windows): [arduino installation directory]\libraries\makeblock\src (on MACOS): [arduino Package Contents]\contents\Jave\libraries\makeblock\src @@ -39,4 +39,4 @@ Arduino Library for Makeblock Electronic Modules |Mark Yan | 2015/11/02 | 3.2.1 | fix bug on MACOS.| |Mark Yan | 2016/01/21 | 3.2.2 | fix some library bugs.| |Mark Yan | 2016/05/17 | 3.2.3 | add support for MegaPi and Auriga Board.| -|Mark Yan | 2016/07/27 | 3.2.4 | fix some JIRA issue, add PID motion for Megapi/Auriga on board encoder motor.| \ No newline at end of file +|Mark Yan | 2016/07/27 | 3.2.4 | fix some JIRA issue, add PID motion for Megapi/Auriga on board encoder motor.|