Rev 143 | Rev 148 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 143 | Rev 144 | ||
---|---|---|---|
Line 285... | Line 285... | ||
285 | if (c == 0x00) |
285 | if (c == 0x00) |
286 | { |
286 | { |
287 | if(DebugUART == UART0) |
287 | if(DebugUART == UART0) |
288 | { |
288 | { |
289 | UART0_Connect_to_MKGPS(); |
289 | UART0_Connect_to_MKGPS(); |
- | 290 | TIMER2_Init(); // enbable servo outputs |
|
290 | } |
291 | } |
291 | TIMER2_Init(); // enbable servo outputs |
- | |
292 | DebugUART = UART1; |
292 | DebugUART = UART1; |
293 | } |
293 | } |
294 | abortState = 0; |
294 | abortState = 0; |
295 | break; |
295 | break; |
296 | } // end switch abort state |
296 | } // end switch abort state |
Line 356... | Line 356... | ||
356 | case 'u': // redirect debug uart |
356 | case 'u': // redirect debug uart |
357 | switch(SerialMsg.pData[0]) |
357 | switch(SerialMsg.pData[0]) |
358 | { |
358 | { |
359 | case UART_FLIGHTCTRL: |
359 | case UART_FLIGHTCTRL: |
360 | UART2_Init(); // initialize UART2 to FC pins |
360 | UART2_Init(); // initialize UART2 to FC pins |
361 | TIMER2_Deinit(); // stop servo output |
361 | //TIMER2_Deinit(); // stop servo output |
362 | DebugUART = UART2; |
362 | DebugUART = UART2; |
363 | break; |
363 | break; |
364 | case UART_MK3MAG: |
364 | case UART_MK3MAG: |
365 | if(FC.MKFlags & MKFLAG_MOTOR_RUN) break; // not if the motors are running |
365 | if(FC.MKFlags & MKFLAG_MOTOR_RUN) break; // not if the motors are running |
366 | UART0_Connect_to_MK3MAG(); // mux UART0 to MK3MAG pins |
366 | UART0_Connect_to_MK3MAG(); // mux UART0 to MK3MAG pins |
367 | TIMER2_Deinit(); // stop servo output |
367 | //TIMER2_Deinit(); // stop servo output |
368 | GPSData.Status = INVALID; |
368 | GPSData.Status = INVALID; |
369 | DebugUART = UART0; |
369 | DebugUART = UART0; |
370 | break; |
370 | break; |
371 | case UART_MKGPS: |
371 | case UART_MKGPS: |
372 | if(FC.MKFlags & MKFLAG_MOTOR_RUN) break; // not if the motors are running |
372 | if(FC.MKFlags & MKFLAG_MOTOR_RUN) break; // not if the motors are running |