| /trunk/MobileMenu.c |
|---|
| 126,8 → 126,8 |
| // Display with 20 characters in 4 lines |
| void MobileMenuUpdate(u8 item, u8 Keys, s16 Value) |
| { |
| static u32 tmp,tmp2,tmp3; |
| s32 i1,i2; |
| //static u32 tmp,tmp2,tmp3; |
| // s32 i1,i2; |
| u8 sign; |
| Mobile_Clear(); |
| FromMenuGimbalYaw = 0; // will be set in the menu below |
| 333,6 → 333,7 |
| else |
| { |
| Mobile_printfxy(0,4,"Control: Nick"); |
| if(FC.RC_Quality < 50) Mobile_printfxy(0,4,"RC Failsafe pos.!!"); |
| FromMenuServoNickControl = Value; |
| FromMenuGimbalYaw = 0; |
| } |
| 349,7 → 350,7 |
| break; |
| case 99: |
| { |
| static u16 offset = 20, tmp; |
| // static u16 offset = 20, tmp; |
| // Mobile_printfxy(0,0,"Testpage %i %c",item,33); |
| for(sign = 0; sign < 21*5; sign++) Mobile.DisplayBuff[sign] = sign + ' '; |
| /trunk/main.c |
|---|
| 541,7 → 541,11 |
| } |
| if(CanbusTimeOut >= 2) CanbusTimeOut--; |
| if(LaserCtrlTimeout) LaserCtrlTimeout--; |
| if(LaserCtrlTimeout) |
| { |
| LaserCtrlTimeout--; |
| if((LaserCtrlTimeout == 27000) || (LaserCtrlTimeout == 11000) || (LaserCtrlTimeout == 21000)) I2CBus_StateReset(I2C0); |
| } |
| else |
| { |
| FromLaserCtrl.Distance = 0; |
| 548,7 → 552,11 |
| FromLaserCtrl.LaserStatus = 0; |
| }; |
| if(GimbalCtrlTimeout) GimbalCtrlTimeout--; |
| if(GimbalCtrlTimeout) |
| { |
| GimbalCtrlTimeout--; |
| if((GimbalCtrlTimeout == 28000) || (GimbalCtrlTimeout == 10000) || (GimbalCtrlTimeout == 20000)) I2CBus_StateReset(I2C0); |
| } |
| else |
| { |
| FromGimbalCtrl.Nick = -1; |
| 561,6 → 569,7 |
| { |
| if(--CamCtrlTimeout == 1) CamCtrlCharacter = '?'; |
| else if(CamCtrlTimeout == 10000) CamCtrlTimeout = 0; // this is used during NC startup-Time phase |
| if((CamCtrlTimeout == 7000) || (CamCtrlTimeout == 1000)) I2CBus_StateReset(I2C0); |
| } |
| else |
| { |
| /trunk/main.h |
|---|
| 14,7 → 14,7 |
| #define VERSION_MAJOR 2 |
| #define VERSION_MINOR 20 |
| #define VERSION_PATCH 0 |
| #define VERSION_PATCH 1 |
| // 0 = A |
| // 1 = B |
| // 2 = C |
| /trunk/menu.c |
|---|
| 648,7 → 648,7 |
| { |
| LCD_printfxy(0,2,"Not connected"); |
| if(CamCtrlTimeout < 10) LCD_printfxy(14,3,"(conn)"); // connect manually |
| if(Keys & KEY4) CamCtrlTimeout = 65000; |
| if(Keys & KEY4) CamCtrlTimeout = 25000; |
| } |
| else |
| { |
| 711,7 → 711,7 |
| { |
| LCD_printfxy(0,2,"Not connected"); |
| if(LaserCtrlTimeout < 10) LCD_printfxy(14,3,"(conn)"); // connect manually |
| if(Keys & KEY4) LaserCtrlTimeout = 65000; |
| if(Keys & KEY4) LaserCtrlTimeout = 25000; |
| } |
| else |
| { |
| 727,7 → 727,7 |
| { |
| LCD_printfxy(0,2,"Not connected"); |
| if(GimbalCtrlTimeout < 10) LCD_printfxy(14,3,"(conn)"); // connect manually |
| if(Keys & KEY4) GimbalCtrlTimeout = 65000; |
| if(Keys & KEY4) GimbalCtrlTimeout = 30000; |
| } |
| else |
| { |