Revision 9c46b728 devices/DiWheelDrive/DiWheelDrive.cpp

View differences:

devices/DiWheelDrive/DiWheelDrive.cpp
3 3
#include "qei.h"
4 4
#include "DiWheelDrive.h"
5 5

  
6

  
6 7
#include <global.hpp>
7 8

  
8 9
using namespace chibios_rt;
......
98 99
      }
99 100
      break;
100 101
    case CAN::SET_LINE_FOLLOW_SPEED:
101
	  if (frame->DLC == 8) {
102
		  uint8_t speedForward    = frame->data8[0];
103
		  uint8_t speedSoftLeft0  = frame->data8[1];
104
		  uint8_t speedSoftLeft1  = frame->data8[2];
105
		  uint8_t speedHardLeft0  = frame->data8[3];
106
		  uint8_t speedHardLeft1  = frame->data8[4];
107
		  global.rpmForward[0] = speedForward;
108
		  global.rpmForward[1] = speedForward;
109
		  global.rpmSoftLeft[0] = speedSoftLeft0;
110
		  global.rpmSoftLeft[1] = speedSoftLeft1;
111
		  global.rpmHardLeft[0] = speedHardLeft0;
112
		  global.rpmHardLeft[1] = speedHardLeft1;
113
		  global.rpmSoftRight[0] = global.rpmSoftLeft[1];
114
		  global.rpmSoftRight[1] = global.rpmSoftLeft[0];
115
		  global.rpmHardRight[0] = global.rpmHardLeft[1];
116
		  global.rpmHardRight[1] = global.rpmHardLeft[0];
117
		  return RDY_OK;
118
	  }
102
      if (frame->DLC == 8) {
103
        uint8_t speedForward    = frame->data8[0];
104
        uint8_t speedSoftLeft0  = frame->data8[1];
105
        uint8_t speedSoftLeft1  = frame->data8[2];
106
        uint8_t speedHardLeft0  = frame->data8[3];
107
        uint8_t speedHardLeft1  = frame->data8[4];
108
        global.rpmForward[0] = speedForward;
109
        global.rpmForward[1] = speedForward;
110
        global.rpmSoftLeft[0] = speedSoftLeft0;
111
        global.rpmSoftLeft[1] = speedSoftLeft1;
112
        global.rpmHardLeft[0] = speedHardLeft0;
113
        global.rpmHardLeft[1] = speedHardLeft1;
114
        global.rpmSoftRight[0] = global.rpmSoftLeft[1];
115
        global.rpmSoftRight[1] = global.rpmSoftLeft[0];
116
        global.rpmHardRight[0] = global.rpmHardLeft[1];
117
        global.rpmHardRight[1] = global.rpmHardLeft[0];
118
        return RDY_OK;
119
      }
120
      break;
121
    case CAN::SET_LINE_FOLLOW_STRATEGY:
122
      if (frame->DLC == 1) {
123
        global.lfStrategy = frame->data8[0];
124
        return RDY_OK;
125
      }
126
      break;
119 127
    case CAN::SET_KINEMATIC_CONST_ID:
120 128
      if (frame->DLC == 8) {
121 129
/*        // Set (but do not store) Ed

Also available in: Unified diff