Skip to content
Snippets Groups Projects
Commit 2529f07d authored by Daniel Agar's avatar Daniel Agar
Browse files

restore format check

parent 74a61a36
No related branches found
No related tags found
No related merge requests found
......@@ -87,7 +87,7 @@ env:
- PX4_AWS_BUCKET=px4-travis
script:
#- make check_format
- make check_format
- arm-none-eabi-gcc --version
- echo 'Building POSIX Firmware..' && echo -en 'travis_fold:start:script.1\\r'
- make posix_sitl_simple -j4
......
......@@ -153,6 +153,9 @@ sitl_ros:
# Other targets
# --------------------------------------------------------------------
check_format:
@./Tools/check_code_style.sh
clean:
@rm -rf build_*/
......
......@@ -79,7 +79,7 @@ void CatapultLaunchMethod::update(float accel_x)
if (motorDelay.get() > 0.0f) {
state = LAUNCHDETECTION_RES_DETECTED_ENABLECONTROL;
warnx("Launch detected: enablecontrol, waiting %8.4fs until full throttle",
double(motorDelay.get()));
double(motorDelay.get()));
} else {
/* No motor delay set: go directly to enablemotors state */
......
......@@ -88,7 +88,7 @@ extern struct param_info_s *param_info_base;
extern struct param_info_s *param_info_limit;
#else
// 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
#define param_info_count px4_parameters.param_count
......
......@@ -445,8 +445,8 @@ do_set(const char *name, const char *val, bool fail_on_not_found)
if (i != newval) {
printf("%c %s: ",
param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'),
param_name(param));
param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'),
param_name(param));
printf("curr: %ld", (long)i);
param_set(param, &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) {
#pragma GCC diagnostic pop
printf("%c %s: ",
param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'),
param_name(param));
param_value_unsaved(param) ? '*' : (param_value_is_default(param) ? ' ' : '+'),
param_name(param));
printf("curr: %4.4f", (double)f);
param_set(param, &newval);
printf(" -> new: %4.4f\n", (double)newval);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment