Rev 583 | Rev 659 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 583 | Rev 631 | ||
|---|---|---|---|
| Line 241... | Line 241... | ||
| 241 | uint16_t Data3D_Interval = 0; // in 1ms |
241 | uint16_t Data3D_Interval = 0; // in 1ms |
| 242 | +int16_t requestedVibData; |
242 | +int16_t requestedVibData; |
| Line 243... | Line 243... | ||
| 243 | 243 | ||
| 244 | #ifdef USE_MK3MAG |
244 | #ifdef USE_MK3MAG |
| 245 | int16_t Compass_Timer; |
245 | int16_t Compass_Timer; |
| 246 | @@ -501,6 +505,26 @@ |
246 | @@ -501,6 +505,28 @@ |
| 247 | PcAccess = 255; |
247 | PcAccess = 255; |
| Line 248... | Line 248... | ||
| 248 | break; |
248 | break; |
| 249 | 249 | ||
| Line 262... | Line 262... | ||
| 262 | +// int i; |
262 | +// int i; |
| 263 | +// for (i=0;i<VIBTEST_NB_SAMPLES;i++) |
263 | +// for (i=0;i<VIBTEST_NB_SAMPLES;i++) |
| 264 | +// VibTestData[i]=i; |
264 | +// VibTestData[i]=i; |
| 265 | +// } |
265 | +// } |
| 266 | + } |
266 | + } |
| - | 267 | + if (MotorTest_Active) |
|
| - | 268 | + MotorTest_Active = 255; // Extend motor test Timeout |
|
| 267 | + } |
269 | + } |
| 268 | + break; |
270 | + break; |
| 269 | + |
271 | + |
| 270 | case 'n':// "Get Mixer Table |
272 | case 'n':// "Get Mixer Table |
| 271 | while(!txd_complete); // wait for previous frame to be sent |
273 | while(!txd_complete); // wait for previous frame to be sent |
| 272 | SendOutData('N', FC_ADDRESS, 1, (uint8_t *) &Mixer, sizeof(Mixer)); |
274 | SendOutData('N', FC_ADDRESS, 1, (uint8_t *) &Mixer, sizeof(Mixer)); |
| 273 | @@ -637,6 +661,7 @@ |
275 | @@ -637,6 +663,7 @@ |
| 274 | loop_until_bit_is_set(UCSR0A, UDRE0); |
276 | loop_until_bit_is_set(UCSR0A, UDRE0); |
| 275 | // send character |
277 | // send character |
| 276 | UDR0 = c; |
278 | UDR0 = c; |
| 277 | + loop_until_bit_is_set(UCSR0A, UDRE0); |
279 | + loop_until_bit_is_set(UCSR0A, UDRE0); |
| 278 | return (0); |
280 | return (0); |
| 279 | } |
281 | } |
| Line 280... | Line 282... | ||
| 280 | 282 | ||
| 281 | @@ -646,6 +671,11 @@ |
283 | @@ -646,6 +673,11 @@ |
| 282 | { |
284 | { |
| Line 283... | Line 285... | ||
| 283 | if(!txd_complete) return; |
285 | if(!txd_complete) return; |
| 284 | 286 | ||