delete unused ADCSIM

- set BOARD_NUMBER_BRICKS to 0 for boards without analog power bricks
PX4 · Apr 30, 2018 · 8404889 · 8404889
1 parent ea3acb7
commit 8404889
Show file tree

Hide file tree

Showing 42 changed files with 43 additions and 350 deletions.
diff --git a/platforms/posix/include/system_config.h b/platforms/posix/include/system_config.h
@@ -39,12 +39,8 @@
 
 #pragma once
 
-#define ADC_BATTERY_VOLTAGE_CHANNEL     10
-#define ADC_BATTERY_CURRENT_CHANNEL     ((uint8_t)(-1))
-#define ADC_AIRSPEED_VOLTAGE_CHANNEL    11
-#define ADCSIM0_DEVICE_PATH	"/dev/adc0"
-
 #define SIM_FORMATED_UUID "000000010000000200000003"
+
 #define PX4_CPU_UUID_BYTE_LENGTH 12
 #define PX4_CPU_UUID_WORD32_LENGTH 3
 #define PX4_CPU_MFGUID_BYTE_LENGTH              PX4_CPU_UUID_BYTE_LENGTH

diff --git a/posix-configs/SITL/README.md b/posix-configs/SITL/README.md
@@ -74,7 +74,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 commander start
 sensors start
 ekf_att_pos_estimator start

diff --git a/posix-configs/SITL/init/ekf2/hippocampus b/posix-configs/SITL/init/ekf2/hippocampus
@@ -19,7 +19,6 @@ mixer load /dev/pwm_output0 ROMFS/px4fmu_test/mixers/uuv_quad_x.mix
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 
 sleep 1

diff --git a/posix-configs/SITL/init/ekf2/iris b/posix-configs/SITL/init/ekf2/iris
@@ -51,7 +51,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/ekf2/iris_1 b/posix-configs/SITL/init/ekf2/iris_1
@@ -53,7 +53,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/ekf2/iris_2 b/posix-configs/SITL/init/ekf2/iris_2
@@ -53,7 +53,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/ekf2/iris_irlock b/posix-configs/SITL/init/ekf2/iris_irlock
@@ -52,7 +52,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/ekf2/iris_opt_flow b/posix-configs/SITL/init/ekf2/iris_opt_flow
@@ -54,7 +54,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/ekf2/iris_rplidar b/posix-configs/SITL/init/ekf2/iris_rplidar
@@ -51,7 +51,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/ekf2/multiple_iris b/posix-configs/SITL/init/ekf2/multiple_iris
@@ -51,7 +51,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/ekf2/plane b/posix-configs/SITL/init/ekf2/plane
@@ -73,7 +73,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 measairspeedsim start
 pwm_out_sim start

diff --git a/posix-configs/SITL/init/ekf2/rover b/posix-configs/SITL/init/ekf2/rover
@@ -54,7 +54,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 measairspeedsim start
 pwm_out_sim start

diff --git a/posix-configs/SITL/init/ekf2/solo b/posix-configs/SITL/init/ekf2/solo
@@ -48,7 +48,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/ekf2/standard_vtol b/posix-configs/SITL/init/ekf2/standard_vtol
@@ -66,7 +66,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 measairspeedsim start
 pwm_out_sim start start

diff --git a/posix-configs/SITL/init/ekf2/tailsitter b/posix-configs/SITL/init/ekf2/tailsitter
@@ -49,7 +49,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 measairspeedsim start
 pwm_out_sim start

diff --git a/posix-configs/SITL/init/ekf2/tiltrotor b/posix-configs/SITL/init/ekf2/tiltrotor
@@ -83,7 +83,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 measairspeedsim start
 pwm_out_sim start

diff --git a/posix-configs/SITL/init/ekf2/typhoon_h480 b/posix-configs/SITL/init/ekf2/typhoon_h480
@@ -54,7 +54,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/inav/iris b/posix-configs/SITL/init/inav/iris
@@ -49,7 +49,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/inav/iris_opt_flow b/posix-configs/SITL/init/inav/iris_opt_flow
@@ -51,7 +51,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/lpe/hippocampus b/posix-configs/SITL/init/lpe/hippocampus
@@ -19,7 +19,6 @@ mixer load /dev/pwm_output0 ROMFS/px4fmu_test/mixers/uuv_quad_x.mix
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 
 sleep 1
 

diff --git a/posix-configs/SITL/init/lpe/iris b/posix-configs/SITL/init/lpe/iris
@@ -51,7 +51,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/lpe/iris_1 b/posix-configs/SITL/init/lpe/iris_1
@@ -53,7 +53,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/lpe/iris_2 b/posix-configs/SITL/init/lpe/iris_2
@@ -53,7 +53,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/lpe/iris_irlock b/posix-configs/SITL/init/lpe/iris_irlock
@@ -59,7 +59,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/lpe/iris_opt_flow b/posix-configs/SITL/init/lpe/iris_opt_flow
@@ -69,7 +69,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/lpe/iris_rplidar b/posix-configs/SITL/init/lpe/iris_rplidar
@@ -50,7 +50,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sleep 1

diff --git a/posix-configs/SITL/init/lpe/plane b/posix-configs/SITL/init/lpe/plane
@@ -56,7 +56,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 measairspeedsim start
 pwm_out_sim start

diff --git a/posix-configs/SITL/init/lpe/rover b/posix-configs/SITL/init/lpe/rover
@@ -50,7 +50,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 measairspeedsim start
 pwm_out_sim start

diff --git a/posix-configs/SITL/init/lpe/solo b/posix-configs/SITL/init/lpe/solo
@@ -51,7 +51,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/lpe/standard_vtol b/posix-configs/SITL/init/lpe/standard_vtol
@@ -60,7 +60,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 measairspeedsim start
 pwm_out_sim start

diff --git a/posix-configs/SITL/init/lpe/typhoon_h480 b/posix-configs/SITL/init/lpe/typhoon_h480
@@ -48,7 +48,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 pwm_out_sim start
 sensors start

diff --git a/posix-configs/SITL/init/rcS_gazebo_delta_wing b/posix-configs/SITL/init/rcS_gazebo_delta_wing
@@ -32,7 +32,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 measairspeedsim start
 pwm_out_sim start

diff --git a/posix-configs/SITL/init/test/cmd_template.in b/posix-configs/SITL/init/test/cmd_template.in
@@ -10,7 +10,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 measairspeedsim start
 pwm_out_sim start

diff --git a/posix-configs/SITL/init/test/tests_template.in b/posix-configs/SITL/init/test/tests_template.in
@@ -10,7 +10,6 @@ tone_alarm start
 gyrosim start
 accelsim start
 barosim start
-adcsim start
 gpssim start
 measairspeedsim start
 pwm_out_sim start

diff --git a/src/drivers/boards/bebop/board_config.h b/src/drivers/boards/bebop/board_config.h
@@ -43,11 +43,12 @@
 #define BOARD_OVERRIDE_MFGUID BOARD_OVERRIDE_UUID
 
 #define BOARD_NAME "BEBOP"
-#define BOARD_BATTERY1_V_DIV   (10.177939394f)
-#define BOARD_BATTERY1_A_PER_V (15.391030303f)
+
 #define BOARD_HAS_NO_RESET
 #define BOARD_HAS_NO_BOOTLOADER
 
+#define BOARD_NUMBER_BRICKS     0
+
 /*
  * I2C busses
  */

diff --git a/src/drivers/boards/common/board_common.h b/src/drivers/boards/common/board_common.h
@@ -170,7 +170,9 @@
 #  endif
 #endif
 
-#if BOARD_NUMBER_BRICKS == 1
+#if BOARD_NUMBER_BRICKS == 0
+/* allow SITL to disable all bricks */
+#elif BOARD_NUMBER_BRICKS == 1
 #  define BOARD_BATT_V_LIST       {ADC_BATTERY_VOLTAGE_CHANNEL}
 #  define BOARD_BATT_I_LIST       {ADC_BATTERY_CURRENT_CHANNEL}
 #  define BOARD_BRICK_VALID_LIST  {BOARD_ADC_BRICK_VALID}

diff --git a/src/drivers/boards/eagle/board_config.h b/src/drivers/boards/eagle/board_config.h
@@ -43,11 +43,12 @@
 #define BOARD_OVERRIDE_MFGUID BOARD_OVERRIDE_UUID
 
 #define BOARD_NAME "EAGLE"
-#define BOARD_BATTERY1_V_DIV   (10.177939394f)
-#define BOARD_BATTERY1_A_PER_V (15.391030303f)
+
 #define BOARD_HAS_NO_RESET
 #define BOARD_HAS_NO_BOOTLOADER
 
+#define BOARD_NUMBER_BRICKS     0
+
 #define CONFIG_ARCH_BOARD_SITL 1
 
 /*

diff --git a/src/drivers/boards/rpi/board_config.h b/src/drivers/boards/rpi/board_config.h
@@ -43,8 +43,13 @@
 #define BOARD_OVERRIDE_MFGUID BOARD_OVERRIDE_UUID
 
 #define BOARD_NAME "RPI"
+
+#define ADC_BATTERY_VOLTAGE_CHANNEL 2
+#define ADC_BATTERY_CURRENT_CHANNEL 3
+
 #define BOARD_BATTERY1_V_DIV   (10.177939394f)
 #define BOARD_BATTERY1_A_PER_V (15.391030303f)
+
 #define BOARD_HAS_NO_RESET
 #define BOARD_HAS_NO_BOOTLOADER
 

diff --git a/src/drivers/boards/sitl/board_config.h b/src/drivers/boards/sitl/board_config.h
@@ -54,5 +54,7 @@
 #define PX4_I2C_BUS_ONBOARD		2
 #define PX4_NUMBER_I2C_BUSES 1
 
+#define BOARD_NUMBER_BRICKS     0
+
 #include <system_config.h>
 #include "../common/board_common.h"