]> rtime.felk.cvut.cz Git - eurobot/public.git/blobdiff - src/robomon/RobomonAtlantis.cpp
Unify ORTE initialization
[eurobot/public.git] / src / robomon / RobomonAtlantis.cpp
index 7261eb7e852c1535870460d97544d25fb028ac2e..63270a711a1911992a5058d9cedd9d7e6ebe86ac 100644 (file)
@@ -44,7 +44,6 @@
 #include <QKeyEvent>
 #include <QDebug>
 #include <QMessageBox>
-#include "GlWidget.h"
 
 RobomonAtlantis::RobomonAtlantis(QWidget *parent)
        : QWidget(parent)
@@ -66,6 +65,10 @@ RobomonAtlantis::RobomonAtlantis(QWidget *parent)
        createOrte();
        createRobots();
        createActions();
+       createMap();
+
+//     connect(vidle, SIGNAL(valueChanged(int)),
+//             robotEstPosBest, SLOT(setVidle(int)));
 
        setFocusPolicy(Qt::StrongFocus);
        sharedMemoryOpened = false;
@@ -78,7 +81,7 @@ RobomonAtlantis::RobomonAtlantis(QWidget *parent)
 void RobomonAtlantis::createLeftLayout()
 {
        leftLayout = new QVBoxLayout();
-       
+
        createDebugGroupBox();
        debugWindowEnabled = true;
        createPlaygroundGroupBox();
@@ -89,7 +92,7 @@ void RobomonAtlantis::createLeftLayout()
 void RobomonAtlantis::createRightLayout()
 {
        rightLayout = new QVBoxLayout();
-       
+
        createPositionGroupBox();
        createMiscGroupBox();
        createFSMGroupBox();
@@ -110,15 +113,12 @@ void RobomonAtlantis::createPlaygroundGroupBox()
 
        playgroundScene = new PlaygroundScene();
        playgroundSceneView = new PlaygroundView(playgroundScene);
-       if (0) {
-               playgroundSceneView->setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
-               playgroundSceneView->setRenderHints(QPainter::Antialiasing);
-       }
        //playgroundSceneView->setMinimumWidth(630);
        //playgroundSceneView->setMinimumHeight(445);
         playgroundSceneView->setMatrix(QMatrix(1,0,0,-1,0,0), true);
        playgroundSceneView->fitInView(playgroundScene->itemsBoundingRect());
        playgroundSceneView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+       playgroundSceneView->setMouseTracking(true);
        layout->addWidget(playgroundSceneView);
 
        playgroundGroupBox->setLayout(layout);
@@ -129,7 +129,7 @@ void RobomonAtlantis::createPositionGroupBox()
        positionGroupBox = new QGroupBox(tr("Position state"));
        positionGroupBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
        QGridLayout *layout = new QGridLayout();
-       
+
        actPosX = new QLineEdit();
        actPosY = new QLineEdit();
        actPosPhi = new QLineEdit();
@@ -137,7 +137,7 @@ void RobomonAtlantis::createPositionGroupBox()
        estPosX = new QLineEdit();
        estPosY = new QLineEdit();
        estPosPhi = new QLineEdit();
-       
+
        actPosX->setReadOnly(true);
        actPosY->setReadOnly(true);
        actPosPhi->setReadOnly(true);
@@ -177,12 +177,15 @@ void RobomonAtlantis::createMiscGroupBox()
        obstacleSimulationCheckBox->setShortcut(tr("o"));
        layout->addWidget(obstacleSimulationCheckBox);
 
-       startPlug = new QCheckBox("Start plug");
+       startPlug = new QCheckBox("&Start plug");
        layout->addWidget(startPlug);
-       
-       puckInside = new QCheckBox("Puck inside");
-       layout->addWidget(puckInside);
-       
+
+       colorChoser = new QCheckBox("&Team color");
+       layout->addWidget(colorChoser);
+        
+        strategyButton= new QPushButton(tr("Strategy"));
+        layout->addWidget(strategyButton);
+
        miscGroupBox->setLayout(layout);
 }
 
@@ -227,11 +230,17 @@ void RobomonAtlantis::createActuatorsGroupBox()
        actuatorsGroupBox = new QGroupBox(tr("Actuators"));
        actuatorsGroupBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
        QHBoxLayout *layout = new QHBoxLayout();
+//     vidle = new QDial();
 
-       createMotorsGroupBox();
+//     vidle->setMinimum(VIDLE_VYSIP);
+//     vidle->setMaximum((VIDLE_UP-VIDLE_VYSIP)+VIDLE_VYSIP);
+//     vidle->setEnabled(true);
+
+       //createMotorsGroupBox();
 
        layout->setAlignment(Qt::AlignLeft);
-       layout->addWidget(enginesGroupBox);
+//     layout->addWidget(vidle);
+       //layout->addWidget(enginesGroupBox);
        actuatorsGroupBox->setLayout(layout);
 }
 
@@ -272,51 +281,13 @@ void RobomonAtlantis::createPowerGroupBox()
        powerGroupBox->setLayout(layout);
 }
 
-void RobomonAtlantis::createMotorsGroupBox()
-{
-       enginesGroupBox = new QGroupBox(tr("Motors"));
-       QVBoxLayout *layout = new QVBoxLayout();
-       QHBoxLayout *layout1 = new QHBoxLayout();
-       QHBoxLayout *layout2 = new QHBoxLayout();
-
-       leftMotorSlider = new QSlider(Qt::Vertical);
-       rightMotorSlider = new QSlider(Qt::Vertical);
-       bothMotorsCheckBox = new QCheckBox(tr("Lock both"));
-       stopMotorsPushButton = new QPushButton(tr("Stop Motors"));
-
-       leftMotorSlider->setMinimum(-100);
-       leftMotorSlider->setMaximum(100);
-       leftMotorSlider->setTracking(false);
-       leftMotorSlider->setTickPosition(QSlider::TicksLeft);
-
-       rightMotorSlider->setMinimum(-100);
-       rightMotorSlider->setMaximum(100);
-       rightMotorSlider->setTracking(false);
-       rightMotorSlider->setTickPosition(QSlider::TicksRight);
-
-       stopMotorsPushButton->setMaximumWidth(90);
-
-       layout1->addWidget(leftMotorSlider);
-       layout1->addWidget(MiscGui::createLabel("0"));
-       layout1->addWidget(rightMotorSlider);
-
-       layout2->addWidget(bothMotorsCheckBox);
-
-       layout->addWidget(MiscGui::createLabel("100"));
-       layout->addLayout(layout1);
-       layout->addWidget(MiscGui::createLabel("-100"));
-       layout->addLayout(layout2);
-       layout->addWidget(stopMotorsPushButton);
-       enginesGroupBox->setLayout(layout);
-}
-
 void RobomonAtlantis::createRobots()
 {
        robotRefPos = new Robot("Ref", QPen(Qt::darkBlue), QBrush(Qt::NoBrush));
        robotRefPos->setZValue(11);
        trailRefPos = new Trail(QPen(Qt::darkBlue));
        trailRefPos->setZValue(11);
-       
+
        robotEstPosBest = new Robot("Est", QPen(), QBrush(Qt::darkGray));
        robotEstPosBest->setZValue(10);
        trailEstPosBest = new Trail(QPen());
@@ -336,9 +307,9 @@ void RobomonAtlantis::createRobots()
        playgroundScene->addItem(robotEstPosBest);
        playgroundScene->addItem(robotEstPosIndepOdo);
        playgroundScene->addItem(robotEstPosOdo);
-       
+
        showTrails(false);
-       
+
        playgroundScene->addItem(trailRefPos);
        playgroundScene->addItem(trailPosIndepOdo);
        playgroundScene->addItem(trailOdoPos);
@@ -346,7 +317,17 @@ void RobomonAtlantis::createRobots()
        hokuyoScan = new HokuyoScan();
        hokuyoScan->setZValue(10);
        playgroundScene->addItem(hokuyoScan);
-       
+
+}
+
+void RobomonAtlantis::createMap()
+{
+       mapImage = new Map();
+       mapImage->setZValue(5);
+       mapImage->setTransform(QTransform().scale(MAP_CELL_SIZE_MM, MAP_CELL_SIZE_MM), true);
+
+
+       playgroundScene->addItem(mapImage);
 }
 
 /**********************************************************************
@@ -355,23 +336,26 @@ void RobomonAtlantis::createRobots()
 void RobomonAtlantis::createActions()
 {
        /* power management */
-       connect(voltage33CheckBox, SIGNAL(stateChanged(int)), 
+       connect(voltage33CheckBox, SIGNAL(stateChanged(int)),
                        this, SLOT(setVoltage33(int)));
-       connect(voltage50CheckBox, SIGNAL(stateChanged(int)), 
+       connect(voltage50CheckBox, SIGNAL(stateChanged(int)),
                        this, SLOT(setVoltage50(int)));
-       connect(voltage80CheckBox, SIGNAL(stateChanged(int)), 
+       connect(voltage80CheckBox, SIGNAL(stateChanged(int)),
                        this, SLOT(setVoltage80(int)));
 
        /* motors */
-       connect(leftMotorSlider, SIGNAL(valueChanged(int)), 
-                       this, SLOT(setLeftMotor(int)));
-       connect(rightMotorSlider, SIGNAL(valueChanged(int)), 
-                       this, SLOT(setRightMotor(int)));
-       connect(stopMotorsPushButton, SIGNAL(clicked()), 
-                       this, SLOT(stopMotors()));
+//     connect(leftMotorSlider, SIGNAL(valueChanged(int)),
+//                     this, SLOT(setLeftMotor(int)));
+//     connect(rightMotorSlider, SIGNAL(valueChanged(int)),
+//                     this, SLOT(setRightMotor(int)));
+//     connect(stopMotorsPushButton, SIGNAL(clicked()),
+//                     this, SLOT(stopMotors()));
 
        connect(startPlug, SIGNAL(stateChanged(int)), this, SLOT(sendStart(int)));
-       
+       connect(colorChoser, SIGNAL(stateChanged(int)), this, SLOT(setTeamColor(int)));
+        connect(strategyButton, SIGNAL(pressed()), this, SLOT(changeStrategy_1()));
+        connect(strategyButton, SIGNAL(released()), this, SLOT(changeStrategy_0()));
+
        /* obstacle simulation */
        simulationEnabled = 0;
        connect(obstacleSimulationCheckBox, SIGNAL(stateChanged(int)),
@@ -380,10 +364,22 @@ void RobomonAtlantis::createActions()
                        this, SLOT(setObstacleSimulation(int)));
        connect(obstacleSimulationCheckBox, SIGNAL(stateChanged(int)),
                        playgroundScene, SLOT(showObstacle(int)));
-       connect(playgroundScene, SIGNAL(obstacleChanged(QPointF)), 
+       connect(playgroundScene, SIGNAL(obstacleChanged(QPointF)),
                        this, SLOT(changeObstacle(QPointF)));
 }
 
+void RobomonAtlantis::changeStrategy_1()
+{
+        orte.robot_switches.strategy = true;
+        ORTEPublicationSend(orte.publication_robot_switches);
+}
+
+void RobomonAtlantis::changeStrategy_0()
+{
+        orte.robot_switches.strategy = false;
+        ORTEPublicationSend(orte.publication_robot_switches);
+}
+
 void RobomonAtlantis::setVoltage33(int state)
 {
        if (state)
@@ -408,42 +404,47 @@ void RobomonAtlantis::setVoltage80(int state)
                orte.pwr_ctrl.voltage80 = false;
 }
 
-void RobomonAtlantis::setLeftMotor(int value)
-{
-       short int leftMotor;
-       short int rightMotor;
-       
-       if(bothMotorsCheckBox->isChecked())
-               rightMotorSlider->setValue(value);
+// void RobomonAtlantis::setLeftMotor(int value)
+// {
+//     short int leftMotor;
+//     short int rightMotor;
 
-       leftMotor = (short int)(MOTOR_LIMIT * (leftMotorSlider->value()/100.0));
-       rightMotor = (short int)(MOTOR_LIMIT * (rightMotorSlider->value()/100.0));
-       
-       orte.motion_speed.left = leftMotor;
-       orte.motion_speed.right = rightMotor;
-       
-}
+//     if(bothMotorsCheckBox->isChecked())
+//             rightMotorSlider->setValue(value);
 
-void RobomonAtlantis::setRightMotor(int value)
-{
-       short int leftMotor;
-       short int rightMotor;
-       
-       if(bothMotorsCheckBox->isChecked())
-               leftMotorSlider->setValue(value);
+//     leftMotor = (short int)(MOTOR_LIMIT * (leftMotorSlider->value()/100.0));
+//     rightMotor = (short int)(MOTOR_LIMIT * (rightMotorSlider->value()/100.0));
 
-       leftMotor = (short int)(MOTOR_LIMIT * (leftMotorSlider->value()/100.0));
-       rightMotor = (short int)(MOTOR_LIMIT * (rightMotorSlider->value()/100.0));
-       
-       orte.motion_speed.left = leftMotor;
-       orte.motion_speed.right = rightMotor;
-       
-}
+//     orte.motion_speed.left = leftMotor;
+//     orte.motion_speed.right = rightMotor;
+
+// }
+
+// void RobomonAtlantis::setRightMotor(int value)
+// {
+//     short int leftMotor;
+//     short int rightMotor;
+
+//     if(bothMotorsCheckBox->isChecked())
+//             leftMotorSlider->setValue(value);
+
+//     leftMotor = (short int)(MOTOR_LIMIT * (leftMotorSlider->value()/100.0));
+//     rightMotor = (short int)(MOTOR_LIMIT * (rightMotorSlider->value()/100.0));
+
+//     orte.motion_speed.left = leftMotor;
+//     orte.motion_speed.right = rightMotor;
+
+// }
+
+// void RobomonAtlantis::stopMotors()
+// {
+//     leftMotorSlider->setValue(0);
+//     rightMotorSlider->setValue(0);
+// }
 
-void RobomonAtlantis::stopMotors()
+void RobomonAtlantis::useOpenGL(bool use)
 {
-       leftMotorSlider->setValue(0);
-       rightMotorSlider->setValue(0);
+       playgroundSceneView->useOpenGL(&use);
 }
 
 void RobomonAtlantis::showMap(bool show)
@@ -452,16 +453,18 @@ void RobomonAtlantis::showMap(bool show)
 
        if (sharedMemoryOpened == false)
                return;
-       
+
        if (show) {
                mapTimer = new QTimer(this);
                connect(mapTimer, SIGNAL(timeout()), this, SLOT(paintMap()));
                mapTimer->start(200);
        } else {
-               mapTimer->stop();
-               disconnect(mapTimer, SIGNAL(timeout()), this, SLOT(paintMap()));
+               if(mapTimer != NULL) {
+                       mapTimer->stop();
+                       disconnect(mapTimer, SIGNAL(timeout()), this, SLOT(paintMap()));
+               }
        }
-       playgroundScene->showMap(show);
+       mapImage->setVisible(show);
 }
 
 void RobomonAtlantis::paintMap()
@@ -470,11 +473,11 @@ void RobomonAtlantis::paintMap()
         struct map *map = ShmapIsMapInit();
 
         if (!map) return;
-       
-       for(int i=0; i < MAP_WIDTH; i++) {
-               for(int j=0; j<MAP_HEIGHT; j++) {
+
+       for(int i = 0; i < MAP_WIDTH; i++) {
+               for(int j = 0; j < MAP_HEIGHT; j++) {
                         QColor color;
-                               
+
                         struct map_cell *cell = &map->cells[j][i];
                         color = lightGray;
 
@@ -491,6 +494,10 @@ void RobomonAtlantis::paintMap()
                                 color = red;
                         if (cell->flags & MAP_FLAG_GOAL)
                                 color = green;
+                       if (cell->flags & MAP_FLAG_PLAN_MARGIN) {
+                               QColor c(240, 170, 50); /* orange */
+                               color = c;
+                       }
                         if (cell->detected_obstacle) {
                                 QColor c1(color), c2(blue);
                                 double f = (double)cell->detected_obstacle/MAP_NEW_OBSTACLE*0.7;
@@ -501,17 +508,17 @@ void RobomonAtlantis::paintMap()
                         }
                         if (cell->flags & MAP_FLAG_DET_OBST)
                                 color = cyan;
-                        
-                        playgroundScene->setMapColor(i, j, color);
+
+                       color.setAlpha(200);
+                        mapImage->setPixelColor(i, MAP_HEIGHT - j - 1, color);
                 }
        }
 }
 
 void RobomonAtlantis::setSimulation(int state)
 {
-       if(state) { 
-               robottype_publisher_hokuyo_scan_create(&orte, 
-                                                      dummy_publisher_callback, this);
+       if(state) {
+               robottype_publisher_hokuyo_scan_create(&orte, NULL, this);
        } else {
                if (!simulationEnabled)
                        return;
@@ -520,7 +527,7 @@ void RobomonAtlantis::setSimulation(int state)
        simulationEnabled = state;
 }
 
-/*!     
+/*!
        \fn RobomonAtlantis::setObstacleSimulation(int state)
  */
 void RobomonAtlantis::setObstacleSimulation(int state)
@@ -529,12 +536,12 @@ void RobomonAtlantis::setObstacleSimulation(int state)
                /* TODO Maybe it is possible to attach only once to Shmap */
                ShmapInit(0);
                obstacleSimulationTimer = new QTimer(this);
-               connect(obstacleSimulationTimer, SIGNAL(timeout()), 
+               connect(obstacleSimulationTimer, SIGNAL(timeout()),
                        this, SLOT(simulateObstaclesHokuyo()));
                obstacleSimulationTimer->start(100);
                setMouseTracking(true);
        } else {
-               if (obstacleSimulationTimer) 
+               if (obstacleSimulationTimer)
                        delete obstacleSimulationTimer;
                //double distance = 0.8;
        }
@@ -546,16 +553,17 @@ void RobomonAtlantis::simulateObstaclesHokuyo()
        double distance, wall_distance;
        unsigned int i;
        uint16_t *hokuyo = orte.hokuyo_scan.data;
-       
+
        for (i=0; i<HOKUYO_ARRAY_SIZE; i++) {
                wall_distance = distanceToWallHokuyo(i);
-               distance = distanceToObstacleHokuyo(i, simulatedObstacle, SIM_OBST_SIZE_M/*meters*/);
-               if (wall_distance < distance) 
+
+               distance = distanceToCircularObstacleHokuyo(i, simulatedObstacle, SIM_OBST_SIZE_M);
+               if (wall_distance < distance)
                        distance = wall_distance;
                hokuyo[i] = distance*1000;
        }
        ORTEPublicationSend(orte.publication_hokuyo_scan);
-       
+
 }
 
 void RobomonAtlantis::changeObstacle(QPointF position)
@@ -568,7 +576,7 @@ void RobomonAtlantis::changeObstacle(QPointF position)
        simulatedObstacle.x = position.x();
        simulatedObstacle.y = position.y();
        simulateObstaclesHokuyo();
-}       
+}
 
 /**********************************************************************
  * EVENTS
@@ -582,6 +590,12 @@ bool RobomonAtlantis::event(QEvent *event)
                case QEVENT(QEV_HOKUYO_SCAN):
                        hokuyoScan->newScan(&orte.hokuyo_scan);
                        break;
+               case QEVENT(QEV_JAWS_CMD):
+                       robotEstPosBest->setJaws(orte.jaws_cmd.req_pos.left);
+                       robotRefPos->setJaws(orte.jaws_cmd.req_pos.left);
+                       robotEstPosIndepOdo->setJaws(orte.jaws_cmd.req_pos.left);
+                       robotEstPosOdo->setJaws(orte.jaws_cmd.req_pos.left);
+                       break;
                case QEVENT(QEV_REFERENCE_POSITION):
                        emit actualPositionReceivedSignal();
                        break;
@@ -591,25 +605,25 @@ bool RobomonAtlantis::event(QEvent *event)
                        estPosPhi->setText(QString("%1(%2)")
                                        .arg(DEGREES(orte.est_pos_indep_odo.phi), 0, 'f', 0)
                                        .arg(orte.est_pos_indep_odo.phi, 0, 'f', 1));
-                       robotEstPosIndepOdo->moveRobot(orte.est_pos_indep_odo.x, 
+                       robotEstPosIndepOdo->moveRobot(orte.est_pos_indep_odo.x,
                                orte.est_pos_indep_odo.y, orte.est_pos_indep_odo.phi);
-                       trailPosIndepOdo->addPoint(QPointF(orte.est_pos_indep_odo.x, 
+                       trailPosIndepOdo->addPoint(QPointF(orte.est_pos_indep_odo.x,
                                              orte.est_pos_indep_odo.y));
                        break;
                case QEVENT(QEV_ESTIMATED_POSITION_ODO):
-                       robotEstPosOdo->moveRobot(orte.est_pos_odo.x, 
+                       robotEstPosOdo->moveRobot(orte.est_pos_odo.x,
                                        orte.est_pos_odo.y, orte.est_pos_odo.phi);
-                       trailOdoPos->addPoint(QPointF(orte.est_pos_odo.x, 
+                       trailOdoPos->addPoint(QPointF(orte.est_pos_odo.x,
                                              orte.est_pos_odo.y));
                        break;
                case QEVENT(QEV_ESTIMATED_POSITION_BEST):
-                       robotEstPosBest->moveRobot(orte.est_pos_best.x, 
+                       robotEstPosBest->moveRobot(orte.est_pos_best.x,
                                        orte.est_pos_best.y, orte.est_pos_best.phi);
-                       trailEstPosBest->addPoint(QPointF(orte.est_pos_best.x, 
+                       trailEstPosBest->addPoint(QPointF(orte.est_pos_best.x,
                                              orte.est_pos_best.y));
-                       hokuyoScan->setPosition(orte.est_pos_best.x, 
+                       hokuyoScan->setPosition(orte.est_pos_best.x,
                                                orte.est_pos_best.y,
-                                               orte.est_pos_best.phi); 
+                                               orte.est_pos_best.phi);
                        break;
                case QEVENT(QEV_POWER_VOLTAGE):
                        emit powerVoltageReceivedSignal();
@@ -646,37 +660,37 @@ bool RobomonAtlantis::event(QEvent *event)
 
 void RobomonAtlantis::keyPressEvent(QKeyEvent *event)
 {
-       double peak, gain;
+//     double peak, gain;
 
        if (event->isAutoRepeat()) {
                switch (event->key()) {
-                       case Qt::Key_Down:
-                               peak = leftMotorSlider->minimum()/2;
-                               if (leftMotorValue < peak ||
-                                       rightMotorValue < peak)
-                                       gain = 1.01;
-                               else
-                                       gain = 1.3;
-                               leftMotorValue *= gain;
-                               rightMotorValue *= gain;
-                               leftMotorSlider->setValue((int)leftMotorValue);
-                               rightMotorSlider->setValue((int)rightMotorValue);
-                               break;
-
-                       case Qt::Key_Up:
-                       case Qt::Key_Left:
-                       case Qt::Key_Right:
-                               peak = leftMotorSlider->maximum()/2;
-                               if (leftMotorValue > peak ||
-                                       rightMotorValue > peak)
-                                       gain = 1.01;
-                               else
-                                       gain = 1.3;
-                               leftMotorValue *= gain;
-                               rightMotorValue *= gain;
-                               leftMotorSlider->setValue((int)leftMotorValue);
-                               rightMotorSlider->setValue((int)rightMotorValue);
-                               break;
+//                     case Qt::Key_Down:
+//                             peak = leftMotorSlider->minimum()/2;
+//                             if (leftMotorValue < peak ||
+//                                     rightMotorValue < peak)
+//                                     gain = 1.01;
+//                             else
+//                                     gain = 1.3;
+//                             leftMotorValue *= gain;
+//                             rightMotorValue *= gain;
+//                             leftMotorSlider->setValue((int)leftMotorValue);
+//                             rightMotorSlider->setValue((int)rightMotorValue);
+//                             break;
+
+//                     case Qt::Key_Up:
+//                     case Qt::Key_Left:
+//                     case Qt::Key_Right:
+//                             peak = leftMotorSlider->maximum()/2;
+//                             if (leftMotorValue > peak ||
+//                                     rightMotorValue > peak)
+//                                     gain = 1.01;
+//                             else
+//                                     gain = 1.3;
+//                             leftMotorValue *= gain;
+//                             rightMotorValue *= gain;
+//                             leftMotorSlider->setValue((int)leftMotorValue);
+//                             rightMotorSlider->setValue((int)rightMotorValue);
+//                             break;
 
                        default:
                                event->ignore();
@@ -686,36 +700,36 @@ void RobomonAtlantis::keyPressEvent(QKeyEvent *event)
        }
 
        switch (event->key()) {
-               case Qt::Key_Up:
-                       leftMotorValue = 1;
-                       rightMotorValue = 1;
-                       bothMotorsCheckBox->setChecked(true);
-                       leftMotorSlider->setValue((int)leftMotorValue);
-                       setLeftMotor((int)leftMotorValue);
-                       break;
-               case Qt::Key_Down:
-                       leftMotorValue = -1;
-                       rightMotorValue = -1;
-                       bothMotorsCheckBox->setChecked(true);
-                       leftMotorSlider->setValue((int)leftMotorValue);
-                       setLeftMotor((int)leftMotorValue);
-                       break;
-               case Qt::Key_Left:
-                       leftMotorValue = -1;
-                       rightMotorValue = 1;
-                       leftMotorSlider->setValue((int)leftMotorValue);
-                       rightMotorSlider->setValue((int)rightMotorValue);
-                       setLeftMotor((int)leftMotorValue);
-                       setRightMotor((int)leftMotorValue);
-                       break;
-               case Qt::Key_Right:
-                       leftMotorValue = 1;
-                       rightMotorValue = -1;
-                       leftMotorSlider->setValue((int)leftMotorValue);
-                       rightMotorSlider->setValue((int)rightMotorValue);
-                       setLeftMotor((int)leftMotorValue);
-                       setRightMotor((int)rightMotorValue);
-                       break;
+//             case Qt::Key_Up:
+//                     leftMotorValue = 1;
+//                     rightMotorValue = 1;
+//                     bothMotorsCheckBox->setChecked(true);
+//                     leftMotorSlider->setValue((int)leftMotorValue);
+//                     setLeftMotor((int)leftMotorValue);
+//                     break;
+//             case Qt::Key_Down:
+//                     leftMotorValue = -1;
+//                     rightMotorValue = -1;
+//                     bothMotorsCheckBox->setChecked(true);
+//                     leftMotorSlider->setValue((int)leftMotorValue);
+//                     setLeftMotor((int)leftMotorValue);
+//                     break;
+//             case Qt::Key_Left:
+//                     leftMotorValue = -1;
+//                     rightMotorValue = 1;
+//                     leftMotorSlider->setValue((int)leftMotorValue);
+//                     rightMotorSlider->setValue((int)rightMotorValue);
+//                     setLeftMotor((int)leftMotorValue);
+//                     setRightMotor((int)leftMotorValue);
+//                     break;
+//             case Qt::Key_Right:
+//                     leftMotorValue = 1;
+//                     rightMotorValue = -1;
+//                     leftMotorSlider->setValue((int)leftMotorValue);
+//                     rightMotorSlider->setValue((int)rightMotorValue);
+//                     setLeftMotor((int)leftMotorValue);
+//                     setRightMotor((int)rightMotorValue);
+//                     break;
                default:
                        event->ignore();
                        break;
@@ -731,16 +745,16 @@ void RobomonAtlantis::keyReleaseEvent(QKeyEvent *event)
        }
 
        switch (event->key()) {
-               case Qt::Key_Up:
-               case Qt::Key_Down:
-               case Qt::Key_Left:
-               case Qt::Key_Right:
-                       leftMotorValue = 0;
-                       rightMotorValue = 0;
-                       bothMotorsCheckBox->setChecked(false);
-                       leftMotorSlider->setValue((int)leftMotorValue);
-                       rightMotorSlider->setValue((int)rightMotorValue);
-                       break;
+//             case Qt::Key_Up:
+//             case Qt::Key_Down:
+//             case Qt::Key_Left:
+//             case Qt::Key_Right:
+//                     leftMotorValue = 0;
+//                     rightMotorValue = 0;
+//                     bothMotorsCheckBox->setChecked(false);
+//                     leftMotorSlider->setValue((int)leftMotorValue);
+//                     rightMotorSlider->setValue((int)rightMotorValue);
+//                     break;
                default:
                        event->ignore();
                        break;
@@ -760,8 +774,7 @@ void RobomonAtlantis::createOrte()
 {
        int rv;
 
-       orte.strength = 11;
-       
+       memset(&orte, 0, sizeof(orte));
        rv = robottype_roboorte_init(&orte);
        if (rv) {
                printf("RobomonAtlantis: Unable to initialize ORTE\n");
@@ -772,27 +785,30 @@ void RobomonAtlantis::createOrte()
 
        robottype_publisher_pwr_ctrl_create(&orte, dummy_publisher_callback, NULL);
        robottype_publisher_robot_cmd_create(&orte, NULL, &orte);
+       robottype_publisher_robot_switches_create(&orte, dummy_publisher_callback, &orte);
 
        /* subscribers */
-       robottype_subscriber_pwr_voltage_create(&orte, 
+       robottype_subscriber_pwr_voltage_create(&orte,
                                receivePowerVoltageCallBack, this);
-       robottype_subscriber_motion_status_create(&orte, 
+       robottype_subscriber_motion_status_create(&orte,
                                receiveMotionStatusCallBack, this);
-       robottype_subscriber_ref_pos_create(&orte, 
+       robottype_subscriber_ref_pos_create(&orte,
                                receiveActualPositionCallBack, this);
-       robottype_subscriber_est_pos_odo_create(&orte, 
+       robottype_subscriber_est_pos_odo_create(&orte,
                        generic_rcv_cb, new OrteCallbackInfo(this, QEV_ESTIMATED_POSITION_ODO));
-       robottype_subscriber_est_pos_indep_odo_create(&orte, 
+       robottype_subscriber_est_pos_indep_odo_create(&orte,
                        generic_rcv_cb, new OrteCallbackInfo(this, QEV_ESTIMATED_POSITION_INDEP_ODO));
-       robottype_subscriber_est_pos_best_create(&orte, 
+       robottype_subscriber_est_pos_best_create(&orte,
                        generic_rcv_cb, new OrteCallbackInfo(this, QEV_ESTIMATED_POSITION_BEST));
-       robottype_subscriber_hokuyo_scan_create(&orte, 
+       robottype_subscriber_hokuyo_scan_create(&orte,
                        generic_rcv_cb, new OrteCallbackInfo(this, QEV_HOKUYO_SCAN));
-       robottype_subscriber_fsm_main_create(&orte, 
+       robottype_subscriber_jaws_cmd_create(&orte,
+                      generic_rcv_cb, new OrteCallbackInfo(this, QEV_JAWS_CMD));
+       robottype_subscriber_fsm_main_create(&orte,
                                             rcv_fsm_main_cb, this);
-       robottype_subscriber_fsm_motion_create(&orte, 
+       robottype_subscriber_fsm_motion_create(&orte,
                                             rcv_fsm_motion_cb, this);
-       robottype_subscriber_fsm_act_create(&orte, 
+       robottype_subscriber_fsm_act_create(&orte,
                                             rcv_fsm_act_cb, this);
 
        /* motors */
@@ -810,11 +826,11 @@ void RobomonAtlantis::createOrte()
        act_init(&orte);
 
        /* set actions to do when we receive data from orte */
-       connect(this, SIGNAL(motionStatusReceivedSignal()), 
+       connect(this, SIGNAL(motionStatusReceivedSignal()),
                        this, SLOT(motionStatusReceived()));
-       connect(this, SIGNAL(actualPositionReceivedSignal()), 
+       connect(this, SIGNAL(actualPositionReceivedSignal()),
                        this, SLOT(actualPositionReceived()));
-       connect(this, SIGNAL(powerVoltageReceivedSignal()), 
+       connect(this, SIGNAL(powerVoltageReceivedSignal()),
                        this, SLOT(powerVoltageReceived()));
 }
 
@@ -830,7 +846,7 @@ void RobomonAtlantis::actualPositionReceived()
        actPosPhi->setText(QString("%1(%2)")
                        .arg(DEGREES(orte.ref_pos.phi), 0, 'f', 0)
                        .arg(orte.ref_pos.phi, 0, 'f', 1));
-       robotRefPos->moveRobot(orte.ref_pos.x, 
+       robotRefPos->moveRobot(orte.ref_pos.x,
                orte.ref_pos.y, orte.ref_pos.phi);
        trailRefPos->addPoint(QPointF(orte.ref_pos.x, orte.ref_pos.y));
 }
@@ -860,7 +876,7 @@ void RobomonAtlantis::openSharedMemory()
                return;
 
        sharedSegmentSize = sizeof(unsigned int) * MAP_WIDTH * MAP_HEIGHT;
-       
+
        /* Get segment identificator in a read only mode  */
        segmentId = shmget(SHM_MAP_KEY, sharedSegmentSize, S_IRUSR);
        if(segmentId == -1) {
@@ -868,10 +884,10 @@ void RobomonAtlantis::openSharedMemory()
                                "Unable to open shared memory segment!");
                return;
        }
-       
+
        /* Init Shmap */
        ShmapInit(0);
-       
+
        /* Attach the shared memory segment */
        //map =  (_Map*)shmat (segmentId, (void*) 0, 0);
 
@@ -886,7 +902,7 @@ double RobomonAtlantis::distanceToWallHokuyo(int beamnum)
        struct map *map = ShmapIsMapInit();
 
        if (!map) return min_distance;
-       
+
        // Simulate obstacles
        for(j=0;j<MAP_HEIGHT;j++) {
                for (i=0;i<MAP_WIDTH;i++) {
@@ -894,7 +910,7 @@ double RobomonAtlantis::distanceToWallHokuyo(int beamnum)
                        if( cell->flags & MAP_FLAG_SIMULATED_WALL) {
                                // WALL
                                ShmapCell2Point(i, j, &wall.x, &wall.y);
-                               
+
                                distance = distanceToObstacleHokuyo(beamnum, wall, MAP_CELL_SIZE_M);
                                if (distance<min_distance) min_distance = distance;
                        }
@@ -904,7 +920,70 @@ double RobomonAtlantis::distanceToWallHokuyo(int beamnum)
        return min_distance;
 }
 
-/** 
+double RobomonAtlantis::distanceToCircularObstacleHokuyo(int beamnum, Point center, double diameter)
+{
+       struct robot_pos_type e = orte.est_pos_best;
+       double sensor_a;
+       struct sharp_pos s;
+
+       s.x = HOKUYO_CENTER_OFFSET_M;
+       s.y = 0.0;
+       s.ang = HOKUYO_INDEX_TO_RAD(beamnum);
+
+       Point sensor(e.x + s.x*cos(e.phi) - s.y*sin(e.phi),
+                    e.y + s.x*sin(e.phi) + s.y*cos(e.phi));
+       sensor_a = e.phi + s.ang;
+
+       const double sensorRange = 4.0; /*[meters]*/
+
+       double distance = sensorRange;
+       double angle;
+
+       angle = sensor.angleTo(center) - sensor_a;
+       angle = fmod(angle, 2.0*M_PI);
+       if (angle > +M_PI) angle -= 2.0*M_PI;
+       if (angle < -M_PI) angle += 2.0*M_PI;
+       angle = fabs(angle);
+
+       double k = tan(sensor_a);
+       double r = diameter / 2.0;
+
+       double A = 1 + k*k;
+       double B = 2 * (sensor.y*k - center.x - k*k*sensor.x - center.y*k);
+       double C = center.x*center.x + center.y*center.y +
+               k*k*sensor.x*sensor.x - 2*sensor.y*k*sensor.x +
+               sensor.y*sensor.y + 2*k*sensor.x*center.y -
+               2*sensor.y*center.y - r*r;
+
+       double D = B*B - 4*A*C;
+       
+       if (D > 0) {
+               Point ob1, ob2;
+
+               ob1.x = (-B + sqrt(D)) / (2*A);
+               ob2.x = (-B - sqrt(D)) / (2*A);
+               ob1.y = k * (ob1.x - sensor.x) + sensor.y;
+               ob2.y = k * (ob2.x - sensor.x) + sensor.y;
+
+               double distance1 = sensor.distanceTo(ob1);
+               double distance2 = sensor.distanceTo(ob2);
+               distance = (distance1 < distance2) ? distance1 : distance2;
+       } else if (D == 0) {
+               Point ob;
+               ob.x = -B / (2*A);
+               ob.y = k * (ob.x - sensor.x) + sensor.y;
+               distance = sensor.distanceTo(ob);
+       }
+       distance = distance + (drand48()-0.5)*3.0e-2;
+       if (D < 0 || angle > atan(r / distance))
+               distance = sensorRange;
+       if (distance > sensorRange)
+               distance = sensorRange;
+
+       return distance;
+}
+
+/**
  * Calculation for Hokuyo simulation. Calculates distance that would
  * be returned by Hokuyo sensors, if there is only one obstacle (as
  * specified by parameters).
@@ -912,11 +991,11 @@ double RobomonAtlantis::distanceToWallHokuyo(int beamnum)
  * @param beamnum Hokuyo's bean number [0..HOKUYO_CLUSTER_CNT]
  * @param obstacle Position of the obstacle (x, y in meters).
  * @param obstacleSize Size (diameter) of the obstacle in meters.
- * 
+ *
  * @return Distance measured by sensors in meters.
- */    
+ */
 double RobomonAtlantis::distanceToObstacleHokuyo(int beamnum, Point obstacle, double obstacleSize)
-{  
+{
        struct robot_pos_type e = orte.est_pos_best;
        double sensor_a;
        struct sharp_pos s;
@@ -928,11 +1007,11 @@ double RobomonAtlantis::distanceToObstacleHokuyo(int beamnum, Point obstacle, do
        Point sensor(e.x + s.x*cos(e.phi) - s.y*sin(e.phi),
                     e.y + s.x*sin(e.phi) + s.y*cos(e.phi));
        sensor_a = e.phi + s.ang;
-       
+
        const double sensorRange = 4.0; /*[meters]*/
-       
+
        double distance, angle;
-           
+
        angle = sensor.angleTo(obstacle) - sensor_a;
        angle = fmod(angle, 2.0*M_PI);
        if (angle > +M_PI) angle -= 2.0*M_PI;
@@ -944,7 +1023,7 @@ double RobomonAtlantis::distanceToObstacleHokuyo(int beamnum, Point obstacle, do
                if (angle < M_PI/2.0) {
                    distance = distance/cos(angle);
                }
-               if (distance > sensorRange) 
+               if (distance > sensorRange)
                        distance = sensorRange;
        } else {
                distance = sensorRange;
@@ -955,10 +1034,16 @@ double RobomonAtlantis::distanceToObstacleHokuyo(int beamnum, Point obstacle, do
 
 void RobomonAtlantis::sendStart(int plug)
 {
-       orte.robot_cmd.start = plug ? 0 : 1;
+       orte.robot_cmd.start_condition = plug ? 0 : 1;
        ORTEPublicationSend(orte.publication_robot_cmd);
 }
 
+void RobomonAtlantis::setTeamColor(int plug)
+{
+       orte.robot_switches.team_color = plug ? 1 : 0;
+       ORTEPublicationSend(orte.publication_robot_switches);
+}
+
 void RobomonAtlantis::resetTrails()
 {
        trailRefPos->reset();
@@ -974,3 +1059,8 @@ void RobomonAtlantis::showTrails(bool show)
        trailPosIndepOdo->setVisible(show && robotEstPosIndepOdo->isVisible());
        trailOdoPos->setVisible(show && robotEstPosOdo->isVisible());
 }
+
+void RobomonAtlantis::showShapeDetect(bool show)
+{
+    hokuyoScan->showShapeDetect = show;
+}