zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

4.0.11 航线部分相机拍照版本

mission-4.1.18
bin 4 years ago
parent
059c1b87a3
commit
2c44aabf50
2 changed files with 34 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      ArduCopter/Parameters.cpp
  2. 56
      libraries/AP_Camera/AP_Camera.cpp

12
ArduCopter/Parameters.cpp
Unescape View File

@ -1678,24 +1678,24 @@ const char* Copter::get_sysid_board_id(void)
switch (type) switch (type)
{ {
case 0: case 0:
snprintf(buf, sizeof(buf), "Version: zr-v4.0.10 ,ID: RS100%04d%05d",(int)nameValue1,(int)nameValue2); snprintf(buf, sizeof(buf), "Version: zr-v4.0.11 ,ID: RS100%04d%05d",(int)nameValue1,(int)nameValue2);
break; break;
case 1: case 1:
snprintf(buf, sizeof(buf), "Version: zr-v4.0.10 ,ID: M660%04d%05d",(int)nameValue1,(int)nameValue2); snprintf(buf, sizeof(buf), "Version: zr-v4.0.11 ,ID: M660%04d%05d",(int)nameValue1,(int)nameValue2);
break; break;
case 2: case 2:
snprintf(buf, sizeof(buf), "Version: zr-v4.0.10 ,ID: M610%04d%05d",(int)nameValue1,(int)nameValue2); snprintf(buf, sizeof(buf), "Version: zr-v4.0.11 ,ID: M610%04d%05d",(int)nameValue1,(int)nameValue2);
break; break;
case 3: case 3:
// snprintf(buf, sizeof(buf), "Version: zr-v4.0.10 ,Board ID: ZRZK.20QT2.%d",(int)nameValue2); // snprintf(buf, sizeof(buf), "Version: zr-v4.0.10 ,Board ID: ZRZK.20QT2.%d",(int)nameValue2);
snprintf(buf, sizeof(buf), "Version: zr-v4.0.10 ,Board ID: ZRZK.%5s.%03d",name,(int)g.sysid_board_id); snprintf(buf, sizeof(buf), "Version: zr-v4.0.11 ,Board ID: ZRZK.%5s.%03d",name,(int)g.sysid_board_id);
break; break;
case 4: case 4:
snprintf(buf, sizeof(buf), "Version: zr-v4.0.10 ,Board ID: ZRZK.19QT2.%d",(int)nameValue2); snprintf(buf, sizeof(buf), "Version: zr-v4.0.11 ,Board ID: ZRZK.19QT2.%d",(int)nameValue2);
break; break;
case 5: case 5:
snprintf(buf, sizeof(buf), "Version: zr-v4.0.10 ,Board ID: %04d%04d",(int)nameValue1,(int)nameValue2); snprintf(buf, sizeof(buf), "Version: zr-v4.0.11 ,Board ID: %04d%04d",(int)nameValue1,(int)nameValue2);
break; break;
default: default:

56
libraries/AP_Camera/AP_Camera.cpp
Unescape View File

@ -595,34 +595,34 @@ void AP_Camera::send_camera_zr_status(mavlink_channel_t chan)
uint8_t feedback_error_fixed = 0; uint8_t feedback_error_fixed = 0;
uint8_t feedback_format = 0; uint8_t feedback_format = 0;
// struct AP_Camera::Cam_ZR_Info status = {}; // struct AP_Camera::Cam_ZR_Info status = {};
static uint8_t last_delt = 0; // static uint8_t last_delt = 0;
static uint8_t delt_cnt = 0; // static uint8_t delt_cnt = 0;
uint16_t num = camera_state.num[0]; // uint16_t num = camera_state.num[0];
uint16_t delt_pic_num = 0; // uint16_t delt_pic_num = 0;
if (camera_state.id < 0x10 || (camera_state.id >= 0x50 &&camera_state.id <= 0x5F)) // if (camera_state.id < 0x10 || (camera_state.id >= 0x50 &&camera_state.id <= 0x5F))
{ // {
for (size_t i = 1; i < 5; i++) // for (size_t i = 1; i < 5; i++)
{ // {
delt_pic_num += abs(num - camera_state.num[i]); // 判断各个相机照片数是否相等 // delt_pic_num += abs(num - camera_state.num[i]); // 判断各个相机照片数是否相等
} // }
if(delt_pic_num == 0){ // if(delt_pic_num == 0){
delt_cnt = 0; // delt_cnt = 0;
last_delt = 0; // last_delt = 0;
} // }
if(last_delt != delt_pic_num){ // if(last_delt != delt_pic_num){
delt_cnt+=1; // delt_cnt+=1;
if(delt_cnt > 5){ // Mavlink一次可能会发两三个chan，取5确保是两次计算差值满足条件 // if(delt_cnt > 5){ // Mavlink一次可能会发两三个chan，取5确保是两次计算差值满足条件
// gcs().send_text(MAV_SEVERITY_INFO, "照片数差异(%d):%d,%d,%d,%d,%d",delt_pic_num,camera_state.num[0],camera_state.num[1],camera_state.num[2],camera_state.num[3],camera_state.num[4]); // // gcs().send_text(MAV_SEVERITY_INFO, "照片数差异(%d):%d,%d,%d,%d,%d",delt_pic_num,camera_state.num[0],camera_state.num[1],camera_state.num[2],camera_state.num[3],camera_state.num[4]);
if(delt_pic_num > 5){ // if(delt_pic_num > 5){
gcs().send_text(MAV_SEVERITY_CRITICAL, "%d:照片数差异大,总差值：%d",camera_state.num[0],delt_pic_num); // gcs().send_text(MAV_SEVERITY_CRITICAL, "%d:照片数差异大,总差值：%d",camera_state.num[0],delt_pic_num);
feedback_gimbal = 20; // feedback_gimbal = 20;
}else // }else
{ // {
gcs().send_text(MAV_SEVERITY_INFO, "照片数差异(%d):%d",delt_pic_num,camera_state.num[0]); // gcs().send_text(MAV_SEVERITY_INFO, "照片数差异(%d):%d",delt_pic_num,camera_state.num[0]);
} // }
} // }
} // }
} // }
mavlink_camera_zr_status_t msg; mavlink_camera_zr_status_t msg;
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
msg.temperature = camera_state.temperature; msg.temperature = camera_state.temperature;

Write Preview
Loading…
Cancel
Save