Revision 4d54a507 devices/DiWheelDrive/userthread.cpp

View differences:

devices/DiWheelDrive/userthread.cpp
1 1
#include "userthread.hpp"
2
#include "amiro/Constants.h"
3 2
#include "amiro_map.hpp"
4 3
#include "global.hpp"
5 4
#include "linefollow.hpp"
......
284 283
  running = false;
285 284
  LineFollowStrategy lStrategy = LineFollowStrategy::EDGE_RIGHT;
286 285
  LineFollow lf(&global);
287
  AmiroMap map(&global);
286
  AmiroMap map(&global, lStrategy);
288 287
  /*
289 288
   * LOOP
290 289
   */
......
808 807
                 "ID: %d, l: %d, r: %d \n", map.getNodeList()[i].id,
809 808
                 map.getNodeList()[i].left, map.getNodeList()[i].right);
810 809
      }
811
      newState = UT_IDLE;
810
      // Start test suit for trackUpdate
811
      map.reset();
812
      global.tcase = 0;
813
      newState = UT_TEST_MAP_STATE;
812 814
      break;
815
      // --------------------------------------------------
813 816
    case ut_states::UT_TEST_MAP_STATE:{
814 817
      // Test suit for amiro map
815 818

  
......
819 822

  
820 823
      // --------------------------------------------------
821 824

  
822
      global.tcase = 0;
825
      global.tcase++;
823 826
      // Set basic valid map configuration
824 827
      setAttributes(global.testmap, 0, 1, 2, 1);
825 828
      setAttributes(global.testmap, 1, 2, 2, 0);

Also available in: Unified diff