Revision d1b06e44

View differences:

devices/DiWheelDrive/global.hpp
164 164
  DiWheelDrive robot;
165 165

  
166 166
  UserThread userThread;
167
  int rpmForward[2] = {20,20};
167
  int rpmForward[2] = {30,30};
168 168
  int rpmSoftLeft[2] = {10,20};
169 169
  int rpmHardLeft[2] = {5,20};
170 170
  int rpmSoftRight[2] = {rpmSoftLeft[1],rpmSoftLeft[0]};
......
174 174
  // Line Following thresholds set due to calibration
175 175
  // MaxDelta: 18676, FL: 4289, FR: 22965
176 176
  // Thresh FL: 5241, FR: 25528
177
  int threshProxyL = 5241;
178
  int threshProxyR = 25528;
177
  // Good for amiro 25
178
  struct line_pid {
179
    int K_p = 0.0f;
180
    float K_i = 0.0f;
181
    float K_d = 0.0f;
182
    int threshProxyL = 5241;
183
    int threshProxyR = 25528;
184
    int BThresh = 5;
185
    int WThresh = 25528;
186
  };
187

  
188
  line_pid linePID;
189

  
190
  
179 191
  int threshWhite = 40000;
180 192

  
181 193
  // PID for line following:
182
  float K_p = 0.0f;
183
  float K_i = 0.0f;
184
  float K_d = 0.0f;
194
  
185 195

  
186 196
  // Integral part
187 197
  int accumHist = 0;

Also available in: Unified diff