Browse Source

calibration parameter category consistency

sbg
Daniel Agar 7 years ago committed by Lorenz Meier
parent
commit
c415477caf
  1. 9
      src/modules/sensors/sensor_params.c
  2. 2
      src/modules/sensors/sensor_params_acc0.c
  3. 4
      src/modules/sensors/sensor_params_acc1.c
  4. 4
      src/modules/sensors/sensor_params_acc2.c
  5. 1
      src/modules/sensors/sensor_params_gyro.c
  6. 10
      src/modules/sensors/sensor_params_gyro0.c
  7. 10
      src/modules/sensors/sensor_params_gyro1.c
  8. 10
      src/modules/sensors/sensor_params_gyro2.c
  9. 1
      src/modules/sensors/sensor_params_mag.c
  10. 11
      src/modules/sensors/sensor_params_mag0.c
  11. 11
      src/modules/sensors/sensor_params_mag1.c
  12. 11
      src/modules/sensors/sensor_params_mag2.c
  13. 11
      src/modules/sensors/sensor_params_mag3.c

9
src/modules/sensors/sensor_params.c

@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
/**
* Primary baro ID
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_BARO_PRIME, 0);
@ -54,7 +55,8 @@ PARAM_DEFINE_INT32(CAL_BARO_PRIME, 0); @@ -54,7 +55,8 @@ PARAM_DEFINE_INT32(CAL_BARO_PRIME, 0);
* @value 0 Model with Pitot
* @value 1 Model without Pitot (1.5 mm tubes)
* @value 2 Tube Pressure Drop
* @group Sensor Calibration
*
* @group Sensors
*/
PARAM_DEFINE_INT32(CAL_AIR_CMODEL, 0);
@ -67,7 +69,7 @@ PARAM_DEFINE_INT32(CAL_AIR_CMODEL, 0); @@ -67,7 +69,7 @@ PARAM_DEFINE_INT32(CAL_AIR_CMODEL, 0);
* @max 2.00
* @unit meter
*
* @group Sensor Calibration
* @group Sensors
*/
PARAM_DEFINE_FLOAT(CAL_AIR_TUBELEN, 0.2f);
@ -78,7 +80,7 @@ PARAM_DEFINE_FLOAT(CAL_AIR_TUBELEN, 0.2f); @@ -78,7 +80,7 @@ PARAM_DEFINE_FLOAT(CAL_AIR_TUBELEN, 0.2f);
* @max 100
* @unit millimeter
*
* @group Sensor Calibration
* @group Sensors
*/
PARAM_DEFINE_FLOAT(CAL_AIR_TUBED_MM, 1.5f);
@ -87,6 +89,7 @@ PARAM_DEFINE_FLOAT(CAL_AIR_TUBED_MM, 1.5f); @@ -87,6 +89,7 @@ PARAM_DEFINE_FLOAT(CAL_AIR_TUBED_MM, 1.5f);
*
* The offset (zero-reading) in Pascal
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(SENS_DPRES_OFF, 0.0f);

2
src/modules/sensors/sensor_params_acc0.c

@ -43,7 +43,7 @@ PARAM_DEFINE_INT32(CAL_ACC0_ID, 0); @@ -43,7 +43,7 @@ PARAM_DEFINE_INT32(CAL_ACC0_ID, 0);
* Accelerometer 0 enabled
*
* @boolean
* @category developer
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_ACC0_EN, 1);

4
src/modules/sensors/sensor_params_acc1.c

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012-2017 PX4 Development Team. All rights reserved.
* Copyright (c) 2012-2018 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -43,7 +43,7 @@ PARAM_DEFINE_INT32(CAL_ACC1_ID, 0); @@ -43,7 +43,7 @@ PARAM_DEFINE_INT32(CAL_ACC1_ID, 0);
* Accelerometer 1 enabled
*
* @boolean
* @category developer
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_ACC1_EN, 1);

4
src/modules/sensors/sensor_params_acc2.c

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012-2017 PX4 Development Team. All rights reserved.
* Copyright (c) 2012-2018 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -43,7 +43,7 @@ PARAM_DEFINE_INT32(CAL_ACC2_ID, 0); @@ -43,7 +43,7 @@ PARAM_DEFINE_INT32(CAL_ACC2_ID, 0);
* Accelerometer 2 enabled
*
* @boolean
* @category developer
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_ACC2_EN, 1);

1
src/modules/sensors/sensor_params_gyro.c

@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
/**
* Primary gyro ID
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_GYRO_PRIME, 0);

10
src/modules/sensors/sensor_params_gyro0.c

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012-2017 PX4 Development Team. All rights reserved.
* Copyright (c) 2012-2018 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
/**
* ID of the Gyro that the calibration is for.
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_GYRO0_ID, 0);
@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_GYRO0_ID, 0); @@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_GYRO0_ID, 0);
* Gyro 0 enabled
*
* @boolean
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_GYRO0_EN, 1);
@ -49,6 +51,7 @@ PARAM_DEFINE_INT32(CAL_GYRO0_EN, 1); @@ -49,6 +51,7 @@ PARAM_DEFINE_INT32(CAL_GYRO0_EN, 1);
/**
* Gyro X-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO0_XOFF, 0.0f);
@ -56,6 +59,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO0_XOFF, 0.0f); @@ -56,6 +59,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO0_XOFF, 0.0f);
/**
* Gyro Y-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO0_YOFF, 0.0f);
@ -63,6 +67,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO0_YOFF, 0.0f); @@ -63,6 +67,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO0_YOFF, 0.0f);
/**
* Gyro Z-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO0_ZOFF, 0.0f);
@ -70,6 +75,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO0_ZOFF, 0.0f); @@ -70,6 +75,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO0_ZOFF, 0.0f);
/**
* Gyro X-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO0_XSCALE, 1.0f);
@ -77,6 +83,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO0_XSCALE, 1.0f); @@ -77,6 +83,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO0_XSCALE, 1.0f);
/**
* Gyro Y-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO0_YSCALE, 1.0f);
@ -84,6 +91,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO0_YSCALE, 1.0f); @@ -84,6 +91,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO0_YSCALE, 1.0f);
/**
* Gyro Z-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO0_ZSCALE, 1.0f);

10
src/modules/sensors/sensor_params_gyro1.c

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012-2017 PX4 Development Team. All rights reserved.
* Copyright (c) 2012-2018 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
/**
* ID of the Gyro that the calibration is for.
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_GYRO1_ID, 0);
@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_GYRO1_ID, 0); @@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_GYRO1_ID, 0);
* Gyro 1 enabled
*
* @boolean
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_GYRO1_EN, 1);
@ -49,6 +51,7 @@ PARAM_DEFINE_INT32(CAL_GYRO1_EN, 1); @@ -49,6 +51,7 @@ PARAM_DEFINE_INT32(CAL_GYRO1_EN, 1);
/**
* Gyro X-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO1_XOFF, 0.0f);
@ -56,6 +59,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO1_XOFF, 0.0f); @@ -56,6 +59,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO1_XOFF, 0.0f);
/**
* Gyro Y-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO1_YOFF, 0.0f);
@ -63,6 +67,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO1_YOFF, 0.0f); @@ -63,6 +67,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO1_YOFF, 0.0f);
/**
* Gyro Z-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO1_ZOFF, 0.0f);
@ -70,6 +75,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO1_ZOFF, 0.0f); @@ -70,6 +75,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO1_ZOFF, 0.0f);
/**
* Gyro X-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO1_XSCALE, 1.0f);
@ -77,6 +83,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO1_XSCALE, 1.0f); @@ -77,6 +83,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO1_XSCALE, 1.0f);
/**
* Gyro Y-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO1_YSCALE, 1.0f);
@ -84,6 +91,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO1_YSCALE, 1.0f); @@ -84,6 +91,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO1_YSCALE, 1.0f);
/**
* Gyro Z-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO1_ZSCALE, 1.0f);

10
src/modules/sensors/sensor_params_gyro2.c

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012-2017 PX4 Development Team. All rights reserved.
* Copyright (c) 2012-2018 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
/**
* ID of the Gyro that the calibration is for.
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_GYRO2_ID, 0);
@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_GYRO2_ID, 0); @@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_GYRO2_ID, 0);
* Gyro 2 enabled
*
* @boolean
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_GYRO2_EN, 1);
@ -49,6 +51,7 @@ PARAM_DEFINE_INT32(CAL_GYRO2_EN, 1); @@ -49,6 +51,7 @@ PARAM_DEFINE_INT32(CAL_GYRO2_EN, 1);
/**
* Gyro X-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO2_XOFF, 0.0f);
@ -56,6 +59,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO2_XOFF, 0.0f); @@ -56,6 +59,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO2_XOFF, 0.0f);
/**
* Gyro Y-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO2_YOFF, 0.0f);
@ -63,6 +67,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO2_YOFF, 0.0f); @@ -63,6 +67,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO2_YOFF, 0.0f);
/**
* Gyro Z-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO2_ZOFF, 0.0f);
@ -70,6 +75,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO2_ZOFF, 0.0f); @@ -70,6 +75,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO2_ZOFF, 0.0f);
/**
* Gyro X-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO2_XSCALE, 1.0f);
@ -77,6 +83,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO2_XSCALE, 1.0f); @@ -77,6 +83,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO2_XSCALE, 1.0f);
/**
* Gyro Y-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO2_YSCALE, 1.0f);
@ -84,6 +91,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO2_YSCALE, 1.0f); @@ -84,6 +91,7 @@ PARAM_DEFINE_FLOAT(CAL_GYRO2_YSCALE, 1.0f);
/**
* Gyro Z-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_GYRO2_ZSCALE, 1.0f);

1
src/modules/sensors/sensor_params_mag.c

@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
/**
* Primary mag ID
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG_PRIME, 0);

11
src/modules/sensors/sensor_params_mag0.c

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012-2017 PX4 Development Team. All rights reserved.
* Copyright (c) 2012-2018 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
/**
* ID of Magnetometer the calibration is for.
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG0_ID, 0);
@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_MAG0_ID, 0); @@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_MAG0_ID, 0);
* Mag 0 enabled
*
* @boolean
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG0_EN, 1);
@ -84,6 +86,7 @@ PARAM_DEFINE_INT32(CAL_MAG0_EN, 1); @@ -84,6 +86,7 @@ PARAM_DEFINE_INT32(CAL_MAG0_EN, 1);
* @min -1
* @max 30
* @reboot_required true
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG0_ROT, -1);
@ -91,6 +94,7 @@ PARAM_DEFINE_INT32(CAL_MAG0_ROT, -1); @@ -91,6 +94,7 @@ PARAM_DEFINE_INT32(CAL_MAG0_ROT, -1);
/**
* Magnetometer X-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG0_XOFF, 0.0f);
@ -98,6 +102,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG0_XOFF, 0.0f); @@ -98,6 +102,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG0_XOFF, 0.0f);
/**
* Magnetometer Y-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG0_YOFF, 0.0f);
@ -105,6 +110,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG0_YOFF, 0.0f); @@ -105,6 +110,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG0_YOFF, 0.0f);
/**
* Magnetometer Z-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG0_ZOFF, 0.0f);
@ -112,6 +118,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG0_ZOFF, 0.0f); @@ -112,6 +118,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG0_ZOFF, 0.0f);
/**
* Magnetometer X-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG0_XSCALE, 1.0f);
@ -119,6 +126,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG0_XSCALE, 1.0f); @@ -119,6 +126,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG0_XSCALE, 1.0f);
/**
* Magnetometer Y-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG0_YSCALE, 1.0f);
@ -126,6 +134,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG0_YSCALE, 1.0f); @@ -126,6 +134,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG0_YSCALE, 1.0f);
/**
* Magnetometer Z-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG0_ZSCALE, 1.0f);

11
src/modules/sensors/sensor_params_mag1.c

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012-2017 PX4 Development Team. All rights reserved.
* Copyright (c) 2012-2018 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
/**
* ID of Magnetometer the calibration is for.
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG1_ID, 0);
@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_MAG1_ID, 0); @@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_MAG1_ID, 0);
* Mag 1 enabled
*
* @boolean
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG1_EN, 1);
@ -84,6 +86,7 @@ PARAM_DEFINE_INT32(CAL_MAG1_EN, 1); @@ -84,6 +86,7 @@ PARAM_DEFINE_INT32(CAL_MAG1_EN, 1);
* @min -1
* @max 30
* @reboot_required true
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG1_ROT, -1);
@ -91,6 +94,7 @@ PARAM_DEFINE_INT32(CAL_MAG1_ROT, -1); @@ -91,6 +94,7 @@ PARAM_DEFINE_INT32(CAL_MAG1_ROT, -1);
/**
* Magnetometer X-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG1_XOFF, 0.0f);
@ -98,6 +102,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG1_XOFF, 0.0f); @@ -98,6 +102,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG1_XOFF, 0.0f);
/**
* Magnetometer Y-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG1_YOFF, 0.0f);
@ -105,6 +110,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG1_YOFF, 0.0f); @@ -105,6 +110,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG1_YOFF, 0.0f);
/**
* Magnetometer Z-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG1_ZOFF, 0.0f);
@ -112,6 +118,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG1_ZOFF, 0.0f); @@ -112,6 +118,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG1_ZOFF, 0.0f);
/**
* Magnetometer X-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG1_XSCALE, 1.0f);
@ -119,6 +126,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG1_XSCALE, 1.0f); @@ -119,6 +126,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG1_XSCALE, 1.0f);
/**
* Magnetometer Y-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG1_YSCALE, 1.0f);
@ -126,6 +134,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG1_YSCALE, 1.0f); @@ -126,6 +134,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG1_YSCALE, 1.0f);
/**
* Magnetometer Z-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG1_ZSCALE, 1.0f);

11
src/modules/sensors/sensor_params_mag2.c

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012-2017 PX4 Development Team. All rights reserved.
* Copyright (c) 2012-2018 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
/**
* ID of Magnetometer the calibration is for.
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG2_ID, 0);
@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_MAG2_ID, 0); @@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_MAG2_ID, 0);
* Mag 2 enabled
*
* @boolean
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG2_EN, 1);
@ -84,6 +86,7 @@ PARAM_DEFINE_INT32(CAL_MAG2_EN, 1); @@ -84,6 +86,7 @@ PARAM_DEFINE_INT32(CAL_MAG2_EN, 1);
* @min -1
* @max 30
* @reboot_required true
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG2_ROT, -1);
@ -91,6 +94,7 @@ PARAM_DEFINE_INT32(CAL_MAG2_ROT, -1); @@ -91,6 +94,7 @@ PARAM_DEFINE_INT32(CAL_MAG2_ROT, -1);
/**
* Magnetometer X-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG2_XOFF, 0.0f);
@ -98,6 +102,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG2_XOFF, 0.0f); @@ -98,6 +102,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG2_XOFF, 0.0f);
/**
* Magnetometer Y-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG2_YOFF, 0.0f);
@ -105,6 +110,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG2_YOFF, 0.0f); @@ -105,6 +110,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG2_YOFF, 0.0f);
/**
* Magnetometer Z-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG2_ZOFF, 0.0f);
@ -112,6 +118,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG2_ZOFF, 0.0f); @@ -112,6 +118,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG2_ZOFF, 0.0f);
/**
* Magnetometer X-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG2_XSCALE, 1.0f);
@ -119,6 +126,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG2_XSCALE, 1.0f); @@ -119,6 +126,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG2_XSCALE, 1.0f);
/**
* Magnetometer Y-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG2_YSCALE, 1.0f);
@ -126,6 +134,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG2_YSCALE, 1.0f); @@ -126,6 +134,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG2_YSCALE, 1.0f);
/**
* Magnetometer Z-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG2_ZSCALE, 1.0f);

11
src/modules/sensors/sensor_params_mag3.c

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012-2017 PX4 Development Team. All rights reserved.
* Copyright (c) 2012-2018 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
/**
* ID of Magnetometer the calibration is for.
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG3_ID, 0);
@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_MAG3_ID, 0); @@ -42,6 +43,7 @@ PARAM_DEFINE_INT32(CAL_MAG3_ID, 0);
* Mag 3 enabled
*
* @boolean
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG3_EN, 1);
@ -84,6 +86,7 @@ PARAM_DEFINE_INT32(CAL_MAG3_EN, 1); @@ -84,6 +86,7 @@ PARAM_DEFINE_INT32(CAL_MAG3_EN, 1);
* @min -1
* @max 30
* @reboot_required true
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_INT32(CAL_MAG3_ROT, -1);
@ -91,6 +94,7 @@ PARAM_DEFINE_INT32(CAL_MAG3_ROT, -1); @@ -91,6 +94,7 @@ PARAM_DEFINE_INT32(CAL_MAG3_ROT, -1);
/**
* Magnetometer X-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG3_XOFF, 0.0f);
@ -98,6 +102,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG3_XOFF, 0.0f); @@ -98,6 +102,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG3_XOFF, 0.0f);
/**
* Magnetometer Y-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG3_YOFF, 0.0f);
@ -105,6 +110,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG3_YOFF, 0.0f); @@ -105,6 +110,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG3_YOFF, 0.0f);
/**
* Magnetometer Z-axis offset
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG3_ZOFF, 0.0f);
@ -112,6 +118,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG3_ZOFF, 0.0f); @@ -112,6 +118,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG3_ZOFF, 0.0f);
/**
* Magnetometer X-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG3_XSCALE, 1.0f);
@ -119,6 +126,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG3_XSCALE, 1.0f); @@ -119,6 +126,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG3_XSCALE, 1.0f);
/**
* Magnetometer Y-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG3_YSCALE, 1.0f);
@ -126,6 +134,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG3_YSCALE, 1.0f); @@ -126,6 +134,7 @@ PARAM_DEFINE_FLOAT(CAL_MAG3_YSCALE, 1.0f);
/**
* Magnetometer Z-axis scaling factor
*
* @category system
* @group Sensor Calibration
*/
PARAM_DEFINE_FLOAT(CAL_MAG3_ZSCALE, 1.0f);

Loading…
Cancel
Save