| /branches/V0.68d Code Redesign killagreg/main.c |
|---|
| 115,12 → 115,11 |
| TIMER0_Init(); |
| TIMER2_Init(); |
| USART0_Init(); |
| ubx_init(); |
| if (BoardRelease == 11) USART1_Init(); |
| RC_Init(); |
| ADC_Init(); |
| i2c_init(); |
| MM3_init(); |
| I2C_Init(); |
| MM3_Init(); |
| //SPI_MasterInit(); |
| // enable interrupts global |
| 150,7 → 149,7 |
| if(PPM_in[ParamSet.ChannelAssignment[CH_THRUST]] > 100 && PPM_in[ParamSet.ChannelAssignment[CH_YAW]] > 100) |
| { |
| printf("\n\rCalibrating Compass"); |
| MM3_calibrate(); |
| MM3_Calibrate(); |
| } |
| 206,7 → 205,7 |
| if(!I2CTimeout) |
| { |
| I2CTimeout = 5; |
| i2c_reset(); |
| I2C_Reset(); |
| if((BeepModulation == 0xFFFF) && MotorsOn) |
| { |
| BeepTime = 10000; // 1 second |