VSAG/amadeus_26_fb
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fps count

Browse Source
This commit is contained in:
wanpiqiu123
2019-07-22 09:33:07 +08:00
parent e8a0a218a8
commit bec5fb5683
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
armor/src/armor_finder/send_target/send_target.cpp
View File

@@ -7,10 +7,11 @@
static bool sendTarget(Serial &serial, double x, double y, double z, uint16_t shoot_delay) { static bool sendTarget(Serial &serial, double x, double y, double z, uint16_t shoot_delay) {
static short x_tmp, y_tmp, z_tmp; static short x_tmp, y_tmp, z_tmp;
static time_t last_time = time(nullptr);
static int fps;
uint8_t buff[10]; uint8_t buff[10];
#ifdef WITH_COUNT_FPS
static time_t last_time = time(nullptr);
static int fps;
time_t t = time(nullptr); time_t t = time(nullptr);
if (last_time != t) { if (last_time != t) {
last_time = t; last_time = t;
@@ -18,6 +19,7 @@ static bool sendTarget(Serial &serial, double x, double y, double z, uint16_t sh
fps = 0; fps = 0;
} }
fps += 1; fps += 1;
#endif
x_tmp = static_cast<short>(x * (32768 - 1) / 100); x_tmp = static_cast<short>(x * (32768 - 1) / 100);
y_tmp = static_cast<short>(y * (32768 - 1) / 100); y_tmp = static_cast<short>(y * (32768 - 1) / 100);

15
energy/src/energy/send/send.cpp
View File

@@ -13,8 +13,21 @@ using namespace std;
// 此函数用于发送数据给主控板 // 此函数用于发送数据给主控板
// --------------------------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------------------------
void Energy::sendTarget(Serial& serial, float x, float y, float z){ void Energy::sendTarget(Serial& serial, float x, float y, float z){
static short x_tmp, y_tmp, z_tmp; short x_tmp, y_tmp, z_tmp;
uint8_t buff[10]; uint8_t buff[10];
#ifdef WITH_COUNT_FPS
static auto last_time = time(nullptr);
static int fps = 0;
time_t t = time(nullptr);
if (last_time != t) {
last_time = t;
cout << "fps:" << fps << ", (" << x << "," << y << "," << z << ")" << endl;
fps = 0;
}
fps += 1;
#endif
x_tmp = static_cast<short>(x * (32768 - 1) / 100); x_tmp = static_cast<short>(x * (32768 - 1) / 100);
y_tmp = static_cast<short>(y * (32768 - 1) / 100); y_tmp = static_cast<short>(y * (32768 - 1) / 100);
z_tmp = static_cast<short>(z * (32768 - 1) / 100); z_tmp = static_cast<short>(z * (32768 - 1) / 100);

1
others/include/config/setconfig.h
View File

@@ -46,5 +46,6 @@
//#define GIMBAL_FLIP_MODE (-1) //#define GIMBAL_FLIP_MODE (-1)
//#define CHASSIS_FLIP_MODE (-1) //#define CHASSIS_FLIP_MODE (-1)
//#define WITH_TIME_BASED_CAMERA_GAIN //#define WITH_TIME_BASED_CAMERA_GAIN
#define WITH_COUNT_FPS
#endif /* SETCONFIG_H */ #endif /* SETCONFIG_H */