diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2013-08-23 15:59:24 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2013-08-23 15:59:24 +0200 |
| commit | 540743129b2badb813b703208d121ff14553c147 (patch) | |
| tree | 6fadb4ebce68e1f0cb298a282be135c23fd156ed /libraries/Robot_Control/ArduinoRobot.cpp | |
| parent | 073b3ac9d4ae93ac0bb3a91afc65ae9d8f1d5d59 (diff) | |
| parent | 67c84855c2f3ce99b091a756bb2ca1a016260659 (diff) | |
Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
app/src/processing/app/Preferences.java
app/src/processing/app/debug/Uploader.java
Diffstat (limited to 'libraries/Robot_Control/ArduinoRobot.cpp')
| -rw-r--r-- | libraries/Robot_Control/ArduinoRobot.cpp | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/libraries/Robot_Control/ArduinoRobot.cpp b/libraries/Robot_Control/ArduinoRobot.cpp deleted file mode 100644 index 3adac73..0000000 --- a/libraries/Robot_Control/ArduinoRobot.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include "ArduinoRobot.h" -#include "Multiplexer.h" -#include "Wire.h" -#include "EasyTransfer2.h" - -//RobotControl::RobotControl(){} - -RobotControl::RobotControl():Arduino_LCD(LCD_CS,DC_LCD,RST_LCD){ - -} - -void RobotControl::begin(){ - Wire.begin(); - //Compass - //nothing here - - //TK sensors - uint8_t MuxPins[]={MUXA,MUXB,MUXC,MUXD}; - Multiplexer::begin(MuxPins,MUX_IN,4); - - //piezo - pinMode(BUZZ,OUTPUT); - - //communication - Serial1.begin(9600); - messageOut.begin(&Serial1); - messageIn.begin(&Serial1); - - //TFT initialization - //Arduino_LCD::initR(INITR_GREENTAB); -} - -void RobotControl::setMode(uint8_t mode){ - messageOut.writeByte(COMMAND_SWITCH_MODE); - messageOut.writeByte(mode); - messageOut.sendData(); -} - - -RobotControl Robot=RobotControl();
\ No newline at end of file |