Merge branch 'refactor-for-v3'

mirobot · May 9, 2016 · bfb3937 · bfb3937
2 parents daabd88 + 0095636
commit bfb3937
Show file tree

Hide file tree

Showing 123 changed files with 7,081 additions and 633 deletions.
diff --git a/examples/collision/collision.ino b/examples/collision/collision.ino
@@ -1,5 +1,4 @@
 #include <Mirobot.h>
-#include <EEPROM.h>
 
 /*
 This sketch demonstrates simple collision detection without using the built in library
@@ -10,7 +9,7 @@ typedef enum {M_NORMAL, M_RIGHT_REVERSE, M_RIGHT_TURN, M_LEFT_REVERSE, M_LEFT_TU
 collideState_ty collideState;
 
 void setup(){
-  mirobot.setup();
+  mirobot.begin();
 }
 
 void loop(){

diff --git a/examples/firmware-v1/firmware-v1.ino b/examples/firmware-v1/firmware-v1.ino
@@ -1,14 +1,12 @@
 #include <Mirobot.h>
-#include <EEPROM.h>
 
 Mirobot mirobot;
 
 void setup(){
-  Serial.begin(57600);
-  mirobot.version(1);
-  mirobot.setup(Serial);
+  mirobot.begin(1);
+  mirobot.enableSerial();
 }
 
 void loop(){
-  mirobot.process();
+  mirobot.loop();
 }
diff --git a/examples/firmware-v2/firmware-v2.ino b/examples/firmware-v2/firmware-v2.ino
@@ -1,13 +1,12 @@
 #include <Mirobot.h>
-#include <EEPROM.h>
 
 Mirobot mirobot;
 
 void setup(){
-  Serial.begin(57600);
-  mirobot.setup(Serial);
+  mirobot.begin();
+  mirobot.enableSerial();
 }
 
 void loop(){
-  mirobot.process();
+  mirobot.loop();
 }
diff --git a/examples/line_follower/line_follower.ino b/examples/line_follower/line_follower.ino
@@ -1,5 +1,4 @@
 #include <Mirobot.h>
-#include <EEPROM.h>
 
 /*
 This sketch demonstrates simple line following without using the built in library
@@ -8,7 +7,7 @@ This sketch demonstrates simple line following without using the built in librar
 Mirobot mirobot;
 
 void setup(){
-  mirobot.setup();
+  mirobot.begin();
 }
 
 void loop(){

diff --git a/examples/manual_example/manual_example.ino b/examples/manual_example/manual_example.ino
@@ -1,5 +1,4 @@
 #include <Mirobot.h>
-#include <EEPROM.h>
 
 /*
 This sketch shows how you can program Mirobot directly in the Arduino environment.
@@ -8,7 +7,7 @@ This sketch shows how you can program Mirobot directly in the Arduino environmen
 Mirobot mirobot;
 
 void setup(){
-  mirobot.setup();
+  mirobot.begin();
 }
 
 void loop(){

diff --git a/keywords.txt b/keywords.txt
@@ -1,5 +1,6 @@
 Mirobot	KEYWORD1
-setup	KEYWORD2
+begin	KEYWORD2
+enableSerial	KEYWORD2
 forward	KEYWORD2
 back	KEYWORD2
 right	KEYWORD2
@@ -9,14 +10,14 @@ pendown	KEYWORD2
 pause	KEYWORD2
 resume	KEYWORD2
 stop	KEYWORD2
-reset	KEYWORD2
 follow	KEYWORD2
 followState	KEYWORD2
 collide	KEYWORD2
 collideState	KEYWORD2
 beep	KEYWORD2
 ready	KEYWORD2
-process	KEYWORD2
+loop	KEYWORD2
+versionNum	KEYWORD2
 blocking	KEYWORD2
 collideNotify	KEYWORD2
-followNotify	KEYWORD2
+followNotify	KEYWORD2