Revision 64cba697 devices/DiWheelDrive/userthread.cpp

View differences:

devices/DiWheelDrive/userthread.cpp
877 877
      // No case should be true because neither was a node visited nor
878 878
      // was a fixpoint detected.
879 879
      // global.odometry
880
      global.testres[global.tcase] = (ret == 0x1)
881
        && (map.get_state()->strategy == 0x01)
880
      global.testres[global.tcase] = (ret == 0x2)
881
        && (map.get_state()->strategy == 0x02)
882 882
        && (map.get_state()->dist == 0)
883 883
        && (map.get_state()->current == 2);
884 884

  
......
896 896
      // No case should be true because neither was a node visited nor
897 897
      // was a fixpoint detected.
898 898
      global.testres[global.tcase] = (ret == 0x00)
899
        && (map.get_state()->strategy == 0x01);
899
        && (map.get_state()->strategy == 0x02);
900 900
        // && (map.get_state()->dist == 0);
901 901

  
902 902
      global.odometry.setPosition(1.2, 0.0, 0.0);
......
910 910
      // No case should be true because neither was a node visited nor
911 911
      // was a fixpoint detected.
912 912
      global.testres[global.tcase] =
913
          (ret == 0x04) && (map.get_state()->strategy == 0x01)
914
        && (map.get_state()->dist == 0);
913
          (ret == 0x04) && (map.get_state()->strategy == 0x02);
915 914

  
916 915
      global.odometry.setPosition(.5, 0.0, 0.0);
917 916
      chprintf((BaseSequentialStream *)&global.sercanmux1,
......
928 927
      // No case should be true because neither was a node visited nor
929 928
      // was a fixpoint detected.
930 929
      global.testres[global.tcase] =
931
        (ret == 9) &&
932
        (map.get_state()->strategy == 1) &&
933
        (map.get_state()->dist == 0) &&
930
        (ret == 2) &&
931
        (map.get_state()->strategy == 2) &&
932
        // (map.get_state()->dist == 0) &&
934 933
        (map.get_state()->eLength == 50);
935 934

  
936 935
      global.odometry.setPosition(.75, 0.0, 0.0);
......
948 947
      // No case should be true because neither was a node visited nor
949 948
      // was a fixpoint detected.
950 949
      global.testres[global.tcase] =
951
          (ret == 12) && (map.get_state()->strategy == 1) &&
952
          (map.get_state()->dist == 50) && (map.get_state()->eLength == 50);
950
          (ret == 4) && (map.get_state()->strategy == 2) &&
951
          // (map.get_state()->dist == 50)
952
         (map.get_state()->eLength == 50);
953 953

  
954 954
      int failed = 0;
955 955
      int passed = 0;

Also available in: Unified diff