Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 728 → Rev 729

/trunk/menu.c
640,30 → 640,36
if(!(FromCamCtrl.CamStatus & CAM_STATE_I2C_OK))
{
LCD_printfxy(0,2,"Not connected");
if(CamCtrlTimeout < 10) LCD_printfxy(13,3,"(conn)"); // connect manually
if(CamCtrlTimeout < 10) LCD_printfxy(14,3,"(conn)"); // connect manually
if(Keys & KEY4) CamCtrlTimeout = 65000;
}
else
{
LCD_printfxy(8,0,"V%i.%02i",1 + FromCamCtrl.Version / 100, FromCamCtrl.Version % 100);
 
switch(FromCamCtrl.Type)
{
case TYPE_LANC: LCD_printfxy(8,0,"LANC"); break;
case TYPE_IR: LCD_printfxy(8,0,"IR"); break;
case TYPE_MULTI: LCD_printfxy(8,0,"MULTI"); break;
case TYPE_LANC: LCD_printfxy(13,0,"L"); break;
case TYPE_IR: LCD_printfxy(13,0,"I"); break;
case TYPE_MULTI: LCD_printfxy(13,0,"M"); break;
}
LCD_printfxy(0,0,"CamCtrl");
LCD_printfxy(0,1,"State:");
if(FromCamCtrl.CamStatus & CAM_STATE_RDY) LCD_printfxy(6,1,"RDY ") else LCD_printfxy(6,1,"--- ");
if(FromCamCtrl.CamStatus & CAM_STATE_REC_ACTIVE) LCD_printfxy(10,1,"REC ") else LCD_printfxy(10,1," ");
if(FromCamCtrl.CamStatus & CAM_STATE_PHOTO_MODE) LCD_printfxy(14,1,"PHOTO") else LCD_printfxy(14,1," ");
LCD_printfxy(0,1,"Stat:");
if(FromCamCtrl.CamStatus & CAM_STATE_RDY) LCD_printfxy(5,1,"RDY")
if(FromCamCtrl.CamStatus & CAM_STATE_REC_ACTIVE) LCD_printfxy(10,1,"REC");
if(FromCamCtrl.CamStatus & CAM_STATE_PHOTO_MODE) LCD_printfxy(14,1,"PHOTO");
if(FromCamCtrl.CamStatus & CAM_STATE_ZOOM) LCD_printfxy(5,1,"ZOOM ");
if(!(FromCamCtrl.CamStatus & CAM_STATE_RDY)) LCD_printfxy(5,1," ---");
 
LCD_printfxy(17,1,"(%c)",CamCtrlCharacter);
 
if(FromCamCtrl.CamStatus & CAM_STATE_CAM_DISCONN) LCD_printfxy(0,2,"Disconn.")
else
{
if(FromCamCtrl.CamStatus & CAM_STATE_OFF) LCD_printfxy(0,2,"OFF ") else LCD_printfxy(0,2,"ON ");
if(FromCamCtrl.CamStatus & CAM_STATE_OFF) LCD_printfxy(1,2,"Cam:OFF") else LCD_printfxy(1,2,"Cam:ON");
}
LCD_printfxy(10,2,"Pics:%3d ",FromCamCtrl.PhotoCount);
//LCD_printfxy(5,2,"x%2x ",FromCamCtrl.CamStatus);
LCD_printfxy(11,2,"Pics:%3d ",FromCamCtrl.PhotoCount);
//LCD_printfxy(5,2,"x%2x ",FromCamCtrl.CamStatus);
if(FromCamCtrl.PPM1Okay) LCD_printfxy(0,3,"Zoom:%3i",FromCamCtrl.PPM1Data);
if(!FromCamCtrl.PPM2Okay) // there is PPM Input connected to the CamCtrl
{
670,9 → 676,10
LCD_printfxy(14,3,"(TRIG)");
if(EE_Parameter.CamCtrlModeChannel == 0)
{
LCD_printfxy(9,3,"(REC)"); // Control only possible if no switch is assigned
if(FromCamCtrl.CamStatus & CAM_STATE_REC_ACTIVE) LCD_printfxy(9,3,"(off)")
else LCD_printfxy(9,3,"(REC)"); // Control only possible if no switch is assigned
}
else LCD_printfxy(0,3,"CH:%3i",127+PPM_In[EE_Parameter.CamCtrlModeChannel]);
else LCD_printfxy(2,3,"CH:%3i",127+PPM_In[EE_Parameter.CamCtrlModeChannel]);
 
if(Keys & KEY3)
{