Browse Source

Fix trailing whitespace, EOF newline, indentation

sbg
Matthias Grob 5 years ago committed by Julian Oes
parent
commit
904ab16558
  1. 1
      .vscode/cmake-variants.yaml
  2. 1
      boards/holybro/durandal-v1/nuttx-config/Kconfig
  3. 2
      boards/px4/fmu-v4/nuttx-config/Kconfig
  4. 1
      platforms/nuttx/src/px4/stm/stm32h7/CMakeLists.txt
  5. 1
      platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/adc.h
  6. 2
      platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/io_timer.h
  7. 1
      platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/micro_hal.h
  8. 1
      platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/px4io_serial.h
  9. 1
      platforms/nuttx/src/px4/stm/stm32h7/px4io_serial/px4io_serial.cpp
  10. 1
      platforms/posix/src/px4/common/adc.cpp
  11. 1
      src/drivers/uavcan/uavcan_drivers/kinetis/driver/CMakeLists.txt
  12. 1
      src/drivers/uavcan/uavcan_drivers/stm32/driver/CMakeLists.txt
  13. 1
      src/modules/mc_rate_control/MulticopterRateControl.hpp
  14. 1
      src/modules/mc_rate_control/mc_rate_control_params.c
  15. 1
      src/modules/sensors/sensor_params_gyro0.c
  16. 1
      src/modules/sensors/sensor_params_gyro1.c
  17. 1
      src/modules/sensors/sensor_params_gyro2.c
  18. 15
      src/systemcmds/tests/test_matrix.cpp

1
.vscode/cmake-variants.yaml vendored

@ -71,4 +71,3 @@ CONFIG: @@ -71,4 +71,3 @@ CONFIG:
buildType: MinSizeRel
settings:
CONFIG: holybro_durandal-v1_default

1
boards/holybro/durandal-v1/nuttx-config/Kconfig

@ -15,4 +15,3 @@ config BOARD_USE_PROBES @@ -15,4 +15,3 @@ config BOARD_USE_PROBES
---help---
Select to use GPIO FMU-CH1-5, CAP1-6 to provide timing signals from selected drivers.

2
boards/px4/fmu-v4/nuttx-config/Kconfig

@ -15,5 +15,3 @@ config BOARD_USE_PROBES @@ -15,5 +15,3 @@ config BOARD_USE_PROBES
---help---
Select to use GPIO FMU-CH1-6 to provide timing signals from selected drivers.

1
platforms/nuttx/src/px4/stm/stm32h7/CMakeLists.txt

@ -43,4 +43,3 @@ add_subdirectory(../stm32_common/tone_alarm tone_alarm) @@ -43,4 +43,3 @@ add_subdirectory(../stm32_common/tone_alarm tone_alarm)
add_subdirectory(../stm32_common/version version)
add_subdirectory(px4io_serial)

1
platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/adc.h

@ -56,4 +56,3 @@ @@ -56,4 +56,3 @@
#endif
#include <px4_platform/adc.h>

2
platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/io_timer.h

@ -32,6 +32,4 @@ @@ -32,6 +32,4 @@
****************************************************************************/
#pragma once
#include "../../../stm32_common/include/px4_arch/io_timer.h"

1
platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/micro_hal.h

@ -54,4 +54,3 @@ int stm32h7_flash_writeprotect(size_t block, bool enabled); @@ -54,4 +54,3 @@ int stm32h7_flash_writeprotect(size_t block, bool enabled);
#define stm32_flash_lock() stm32h7_flash_lock(PX4_FLASH_BASE)
__END_DECLS

1
platforms/nuttx/src/px4/stm/stm32h7/include/px4_arch/px4io_serial.h

@ -35,4 +35,3 @@ @@ -35,4 +35,3 @@
#define PX4IO_SERIAL_BUF_ALIGN ARMV7M_DCACHE_LINESIZE
#include "../../../stm32_common/include/px4_arch/px4io_serial.h"

1
platforms/nuttx/src/px4/stm/stm32h7/px4io_serial/px4io_serial.cpp

@ -545,4 +545,3 @@ ArchPX4IOSerial::_abort_dma() @@ -545,4 +545,3 @@ ArchPX4IOSerial::_abort_dma()
rICR = rISR & rISR_ERR_FLAGS_MASK; /* clear the flags */
}

1
platforms/posix/src/px4/common/adc.cpp

@ -37,4 +37,3 @@ uint32_t px4_arch_adc_dn_fullcount(void) @@ -37,4 +37,3 @@ uint32_t px4_arch_adc_dn_fullcount(void)
{
return 1 << 12; // 12 bit ADC
}

1
src/drivers/uavcan/uavcan_drivers/kinetis/driver/CMakeLists.txt

@ -14,4 +14,3 @@ install(DIRECTORY include/uavcan_kinetis DESTINATION include) @@ -14,4 +14,3 @@ install(DIRECTORY include/uavcan_kinetis DESTINATION include)
install(TARGETS uavcan_kinetis_driver DESTINATION lib)
# vim: set et ft=cmake fenc=utf-8 ff=unix sts=4 sw=4 ts=4 :)

1
src/drivers/uavcan/uavcan_drivers/stm32/driver/CMakeLists.txt

@ -14,4 +14,3 @@ install(DIRECTORY include/uavcan_stm32 DESTINATION include) @@ -14,4 +14,3 @@ install(DIRECTORY include/uavcan_stm32 DESTINATION include)
install(TARGETS uavcan_stm32_driver DESTINATION lib)
# vim: set et ft=cmake fenc=utf-8 ff=unix sts=4 sw=4 ts=4 :)

1
src/modules/mc_rate_control/MulticopterRateControl.hpp

@ -182,4 +182,3 @@ private: @@ -182,4 +182,3 @@ private:
matrix::Vector3f _acro_rate_max; /**< max attitude rates in acro mode */
};

1
src/modules/mc_rate_control/mc_rate_control_params.c

@ -412,4 +412,3 @@ PARAM_DEFINE_INT32(MC_BAT_SCALE_EN, 0); @@ -412,4 +412,3 @@ PARAM_DEFINE_INT32(MC_BAT_SCALE_EN, 0);
* @group Multicopter Rate Control
*/
PARAM_DEFINE_FLOAT(MC_DTERM_CUTOFF, 0.f);

1
src/modules/sensors/sensor_params_gyro0.c

@ -71,4 +71,3 @@ PARAM_DEFINE_FLOAT(CAL_GYRO0_YOFF, 0.0f); @@ -71,4 +71,3 @@ PARAM_DEFINE_FLOAT(CAL_GYRO0_YOFF, 0.0f);
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO0_ZOFF, 0.0f);

1
src/modules/sensors/sensor_params_gyro1.c

@ -71,4 +71,3 @@ PARAM_DEFINE_FLOAT(CAL_GYRO1_YOFF, 0.0f); @@ -71,4 +71,3 @@ PARAM_DEFINE_FLOAT(CAL_GYRO1_YOFF, 0.0f);
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO1_ZOFF, 0.0f);

1
src/modules/sensors/sensor_params_gyro2.c

@ -71,4 +71,3 @@ PARAM_DEFINE_FLOAT(CAL_GYRO2_YOFF, 0.0f); @@ -71,4 +71,3 @@ PARAM_DEFINE_FLOAT(CAL_GYRO2_YOFF, 0.0f);
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO2_ZOFF, 0.0f);

15
src/systemcmds/tests/test_matrix.cpp

@ -769,14 +769,11 @@ bool MatrixTest::pseudoInverseTests() @@ -769,14 +769,11 @@ bool MatrixTest::pseudoInverseTests()
8.f, 9.f, 10.f, 11.f
};
// *INDENT-OFF*
float data0_check[12] = {
-0.3375f, -0.1f, 0.1375f,
float data0_check[12] = {-0.3375f, -0.1f, 0.1375f,
-0.13333333f, -0.03333333f, 0.06666667f,
0.07083333f, 0.03333333f, -0.00416667f,
0.275f, 0.1f, -0.075f
};
// *INDENT-ON*
Matrix<float, 3, 4> A0(data0);
Matrix<float, 4, 3> A0_I = geninv(A0);
@ -792,13 +789,10 @@ bool MatrixTest::pseudoInverseTests() @@ -792,13 +789,10 @@ bool MatrixTest::pseudoInverseTests()
3.f, 7.f, 11.f
};
// *INDENT-OFF*
float data1_check[12] = {
-0.3375f, -0.13333333f, 0.07083333f, 0.275f,
float data1_check[12] = {-0.3375f, -0.13333333f, 0.07083333f, 0.275f,
-0.1f, -0.03333333f, 0.03333333f, 0.1f,
0.1375f, 0.06666667f, -0.00416667f, -0.075f
};
// *INDENT-ON*
Matrix<float, 4, 3> A1(data1);
Matrix<float, 3, 4> A1_I = geninv(A1);
@ -812,13 +806,10 @@ bool MatrixTest::pseudoInverseTests() @@ -812,13 +806,10 @@ bool MatrixTest::pseudoInverseTests()
4, 5, 6,
7, 8, 10
};
// *INDENT-OFF*
float data2_check[9] = {
-0.4f, -0.8f, 0.6f,
float data2_check[9] = {-0.4f, -0.8f, 0.6f,
-0.4f, 4.2f, -2.4f,
0.6f, -2.8f, 1.6f
};
// *INDENT-ON*
SquareMatrix<float, 3> A2(data2);
SquareMatrix<float, 3> A2_I = inv(A2);

Loading…
Cancel
Save