yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

restore format check

Browse Source
This commit is contained in:
Daniel Agar
2015-10-06 15:26:19 -04:00
parent 74a61a3610
commit 2529f07d44
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -87,7 +87,7 @@ env:
- PX4_AWS_BUCKET=px4-travis - PX4_AWS_BUCKET=px4-travis
script: script:
#- make check_format - make check_format
- arm-none-eabi-gcc --version - arm-none-eabi-gcc --version
- echo 'Building POSIX Firmware..' && echo -en 'travis_fold:start:script.1\\r' - echo 'Building POSIX Firmware..' && echo -en 'travis_fold:start:script.1\\r'
- make posix_sitl_simple -j4 - make posix_sitl_simple -j4

3
Makefile
View File

@@ -153,6 +153,9 @@ sitl_ros:
# Other targets # Other targets
# -------------------------------------------------------------------- # --------------------------------------------------------------------
check_format:
@./Tools/check_code_style.sh
clean: clean:
@rm -rf build_*/ @rm -rf build_*/

2
src/lib/launchdetection/CatapultLaunchMethod.cpp
View File

@@ -79,7 +79,7 @@ void CatapultLaunchMethod::update(float accel_x)
if (motorDelay.get() > 0.0f) { if (motorDelay.get() > 0.0f) {
state = LAUNCHDETECTION_RES_DETECTED_ENABLECONTROL; state = LAUNCHDETECTION_RES_DETECTED_ENABLECONTROL;
warnx("Launch detected: enablecontrol, waiting %8.4fs until full throttle", warnx("Launch detected: enablecontrol, waiting %8.4fs until full throttle",
double(motorDelay.get())); double(motorDelay.get()));
} else { } else {
/* No motor delay set: go directly to enablemotors state */ /* No motor delay set: go directly to enablemotors state */

2
src/modules/systemlib/param/param.c
View File

@@ -88,7 +88,7 @@ extern struct param_info_s *param_info_base;
extern struct param_info_s *param_info_limit; extern struct param_info_s *param_info_limit;
#else #else
// FIXME - start and end are reversed // FIXME - start and end are reversed
static const struct param_info_s *param_info_base = (const struct param_info_s *)&px4_parameters; static const struct param_info_s *param_info_base = (const struct param_info_s *) &px4_parameters;
#endif #endif
#define param_info_count px4_parameters.param_count #define param_info_count px4_parameters.param_count

8
src/systemcmds/param/param.c
View File

@@ -445,8 +445,8 @@ do_set(const char *name, const char *val, bool fail_on_not_found)
if (i != newval) { if (i != newval) {
printf("%c %s: ", printf("%c %s: ",
param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'), param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'),
param_name(param)); param_name(param));
printf("curr: %ld", (long)i); printf("curr: %ld", (long)i);
param_set(param, &newval); param_set(param, &newval);
printf(" -> new: %ld\n", (long)newval); printf(" -> new: %ld\n", (long)newval);
@@ -467,8 +467,8 @@ do_set(const char *name, const char *val, bool fail_on_not_found)
if (f != newval) { if (f != newval) {
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
printf("%c %s: ", printf("%c %s: ",
param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'), param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'),
param_name(param)); param_name(param));
printf("curr: %4.4f", (double)f); printf("curr: %4.4f", (double)f);
param_set(param, &newval); param_set(param, &newval);
printf(" -> new: %4.4f\n", (double)newval); printf(" -> new: %4.4f\n", (double)newval);