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

先去除一些zr app的参数

zr-sdk-4.3.1
nagezeng 3 years ago
parent
09c1202146
commit
c93c8a6e7a
2 changed files with 26 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      libraries/AC_ZR_APP/AC_ZR_App.cpp
  2. 24
      libraries/AC_ZR_APP/AC_ZR_App.h

27
libraries/AC_ZR_APP/AC_ZR_App.cpp
Unescape View File

@ -27,12 +27,12 @@ const AP_Param::GroupInfo AC_ZR_App::var_info[] = { @@ -27,12 +27,12 @@ const AP_Param::GroupInfo AC_ZR_App::var_info[] = {
// @User: zrzk
AP_GROUPINFO("_TYPE", 0, AC_ZR_App, _type, 1),
AP_GROUPINFO("_SYS_TYPE", 1, AC_ZR_App, sysid_type, 0 ),
AP_GROUPINFO("_SYS_ID", 2, AC_ZR_App, sysid_board_id, 98765432U),
AP_GROUPINFO("_SYS_DL1", 3, AC_ZR_App, sysid_dl1, 0x8175),
AP_GROUPINFO("_SYS_DL2", 4, AC_ZR_App, sysid_dl2, 0x6fda),
AP_GROUPINFO("_SYS_DL3", 5, AC_ZR_App, sysid_dl3, 0xf38f),
AP_GROUPINFO("_SYS_DL4", 6, AC_ZR_App, sysid_dl4, 0xbf48),
// AP_GROUPINFO("_SYS_TYPE", 1, AC_ZR_App, sysid_type, 0 ),
// AP_GROUPINFO("_SYS_ID", 2, AC_ZR_App, sysid_board_id, 98765432U),
// AP_GROUPINFO("_SYS_DL1", 3, AC_ZR_App, sysid_dl1, 0x8175),
// AP_GROUPINFO("_SYS_DL2", 4, AC_ZR_App, sysid_dl2, 0x6fda),
// AP_GROUPINFO("_SYS_DL3", 5, AC_ZR_App, sysid_dl3, 0xf38f),
// AP_GROUPINFO("_SYS_DL4", 6, AC_ZR_App, sysid_dl4, 0xbf48),
// @Param: _SL_*
// @DisplayName: ZR_SL_*
@ -40,12 +40,12 @@ const AP_Param::GroupInfo AC_ZR_App::var_info[] = { @@ -40,12 +40,12 @@ const AP_Param::GroupInfo AC_ZR_App::var_info[] = {
// @Values: 值单位cm和cm/s
// @RebootRequired: True
// @User: zrzk
AP_GROUPINFO("_SL_ALT_HI", 7, AC_ZR_App, land_slow_alt_high, 3000),
AP_GROUPINFO("_SL_ALT_MI", 8, AC_ZR_App, land_slow_alt_mid, 1500),
AP_GROUPINFO("_SL_ALT_LO", 9, AC_ZR_App, land_slow_alt_low, 150),
AP_GROUPINFO("_SL_SPD_HI", 10, AC_ZR_App, land_slow_speed_dn_high, 150),
AP_GROUPINFO("_SL_SPD_MI", 11, AC_ZR_App, land_slow_speed_dn_mid, 50),
AP_GROUPINFO("_SL_SPD_LO", 12, AC_ZR_App, land_slow_speed_dn_low, 30),
// AP_GROUPINFO("_SL_ALT_HI", 7, AC_ZR_App, land_slow_alt_high, 3000),
// AP_GROUPINFO("_SL_ALT_MI", 8, AC_ZR_App, land_slow_alt_mid, 1500),
// AP_GROUPINFO("_SL_ALT_LO", 9, AC_ZR_App, land_slow_alt_low, 150),
// AP_GROUPINFO("_SL_SPD_HI", 10, AC_ZR_App, land_slow_speed_dn_high, 150),
// AP_GROUPINFO("_SL_SPD_MI", 11, AC_ZR_App, land_slow_speed_dn_mid, 50),
// AP_GROUPINFO("_SL_SPD_LO", 12, AC_ZR_App, land_slow_speed_dn_low, 30),
AP_GROUPEND
};
@ -61,7 +61,7 @@ AC_ZR_App::AC_ZR_App() @@ -61,7 +61,7 @@ AC_ZR_App::AC_ZR_App()
}
_singleton = this;
}
#if 0
/**
* @brief 从参数中解析注册到期时间
*
@ -251,3 +251,4 @@ uint8_t AC_ZR_App::get_battery_capacity(uint8_t type,float volt) @@ -251,3 +251,4 @@ uint8_t AC_ZR_App::get_battery_capacity(uint8_t type,float volt)
}
return bat_cnt;
}
#endif

24
libraries/AC_ZR_APP/AC_ZR_App.h
Unescape View File

@ -50,19 +50,19 @@ public: @@ -50,19 +50,19 @@ public:
protected:
AP_Int8 _type;
AP_Int8 sysid_type; // modify by @Brown
AP_Int32 sysid_board_id;
AP_Int32 sysid_dl1;
AP_Int32 sysid_dl2;
AP_Int32 sysid_dl3;
AP_Int32 sysid_dl4;
// AP_Int8 sysid_type; // modify by @Brown
// AP_Int32 sysid_board_id;
// AP_Int32 sysid_dl1;
// AP_Int32 sysid_dl2;
// AP_Int32 sysid_dl3;
// AP_Int32 sysid_dl4;
AP_Int16 land_slow_alt_high;
AP_Int16 land_slow_alt_mid;
AP_Int16 land_slow_alt_low;
AP_Int16 land_slow_speed_dn_high;
AP_Int16 land_slow_speed_dn_mid;
AP_Int16 land_slow_speed_dn_low;
// AP_Int16 land_slow_alt_high;
// AP_Int16 land_slow_alt_mid;
// AP_Int16 land_slow_alt_low;
// AP_Int16 land_slow_speed_dn_high;
// AP_Int16 land_slow_speed_dn_mid;
// AP_Int16 land_slow_speed_dn_low;
private:
uint8_t BinarySearch2f(float a[], float value, int low, int high);

Write Preview
Loading…
Cancel
Save