Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 852 → Rev 853

/trunk/CamCtrl.c
208,7 → 208,8
// initiate transmission
tmp = (s16) (FromFC_ServoRollControl - 128) * 4;
if(EE_Parameter.ServoCompInvert & SERVO_ROLL_INV) ToGimbalCtrl.Roll = -tmp; else ToGimbalCtrl.Roll = tmp;
ToGimbalCtrl.Yaw = (s32) SerialChannel.Ch[2] * 20;
// ToGimbalCtrl.Yaw = (s32) SerialChannel.Ch[0] * 3;
ToGimbalCtrl.Yaw = (s32) (PPM_In[EE_Parameter.GimbalYawChannel]) * 2;
ToGimbalCtrl.NRY_Speed = 100;
ToGimbalCtrl.Filter = 5;
ToGimbalCtrl.Nick = NickGimbal;
239,8 → 240,9
 
I2CBus_Transmission(I2C0, GIMBAL_SLAVE_ADDRESS, &ToGimbalCtrl, sizeof(ToGimbalCtrl)+1, &GimbalCtrl_UpdateData, RxBytes);
timing = GIMBAL_DATARATE;
ToGimbalCtrl.BitCmd = 0; // reset the Flags
ToGimbalCtrl.BitCmd = GIMBAL_CMD_SPEED; // reset the Flags
old_nick = NickGimbal;
 
}
else timing = 11; // try again in 11ms
}
/trunk/CamCtrl.h
24,6 → 24,10
#define GIMBAL_DATA_OK 0x01
#define GIMBAL_I2C_OK 0x80
 
#define GIMBAL_CMD_BEEP 0x01
#define GIMBAL_CMD_YW_REL_FRAME 0x02
#define GIMBAL_CMD_SPEED 0x04
#define GIMBAL_CMD_YW_ZERO 0x08
 
// ToCamCtrl.CamCommand
#define CAM_CMD_SWITCH_ON 0x80
40,7 → 44,6
#define TYPE_MULTI 3
 
//ToGimbalCtrl.BitCmd
#define BITCMD_BEEP 0x01
 
typedef struct
{
131,5 → 134,6
extern void LaserCtrl_GetData(u8 timeout);
extern void GimbalCtrl_UpdateData(u8* pRxBuffer, u8 RxBufferSize);
extern void GimbalCtrl_GetData(u8 timeout);
extern void CalcNickServoValue(void);
#endif // __CAMCTRL_H