From 3fa825bf880e0e8827acf6968ae8fe6f4bd17259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Thu, 25 Feb 2021 11:27:13 +0100 Subject: [PATCH] boards: remove intel/aerofc-v1 it's discontinued --- .github/workflows/compile_nuttx.yml | 1 - Makefile | 1 - .../init.d/airframes/10015_tbs_discovery | 1 - .../init.d/airframes/10016_3dr_iris | 1 - .../init.d/airframes/10017_steadidrone_qu4d | 1 - .../init.d/airframes/10018_tbs_endurance | 1 - .../init.d/airframes/1002_standard_vtol.hil | 1 - .../init.d/airframes/11001_hexa_cox | 1 - .../init.d/airframes/12001_octo_cox | 1 - .../init.d/airframes/12002_steadidrone_mavrik | 1 - .../airframes/13000_generic_vtol_standard | 1 - .../init.d/airframes/13001_caipirinha_vtol | 1 - .../init.d/airframes/13002_firefly6 | 1 - .../init.d/airframes/13003_quad_tailsitter | 1 - .../init.d/airframes/13004_quad+_tailsitter | 1 - .../init.d/airframes/13005_vtol_AAERT_quad | 1 - .../airframes/13006_vtol_standard_delta | 1 - .../init.d/airframes/13007_vtol_AAVVT_quad | 1 - .../init.d/airframes/13008_QuadRanger | 1 - .../init.d/airframes/13009_vtol_spt_ranger | 1 - .../init.d/airframes/13010_claire | 1 - .../init.d/airframes/13012_convergence | 1 - .../init.d/airframes/13013_deltaquad | 1 - .../init.d/airframes/13014_vtol_babyshark | 1 - .../airframes/13015_generic_vtol_standard | 1 - .../init.d/airframes/13050_generic_vtol_octo | 1 - .../airframes/13200_generic_vtol_tailsitter | 1 - .../init.d/airframes/14001_tri_y_yaw+ | 1 - .../init.d/airframes/14002_tri_y_yaw- | 1 - .../init.d/airframes/15001_coax_heli | 1 - .../init.d/airframes/16001_helicopter | 1 - .../init.d/airframes/17002_TF-AutoG2 | 1 - .../init.d/airframes/17003_TF-G2 | 1 - .../init.d/airframes/18001_TF-B1 | 1 - .../init.d/airframes/2100_standard_plane | 1 - .../px4fmu_common/init.d/airframes/2105_maja | 1 - .../init.d/airframes/2106_albatross | 1 - .../init.d/airframes/2200_mini_talon | 1 - .../init.d/airframes/24001_dodeca_cox | 1 - .../init.d/airframes/2507_cloudship | 1 - .../init.d/airframes/3000_generic_wing | 1 - .../init.d/airframes/3030_io_camflyer | 1 - .../init.d/airframes/3031_phantom | 1 - .../init.d/airframes/3032_skywalker_x5 | 1 - .../init.d/airframes/3033_wingwing | 1 - .../init.d/airframes/4020_hk_micro_pcb | 1 - .../init.d/airframes/4030_3dr_solo | 1 - .../init.d/airframes/4031_3dr_quad | 1 - .../init.d/airframes/4040_reaper | 1 - .../init.d/airframes/4041_beta75x | 1 - .../init.d/airframes/4050_generic_250 | 1 - .../init.d/airframes/4051_s250aq | 1 - .../init.d/airframes/4052_holybro_qav250 | 1 - .../init.d/airframes/4053_holybro_kopis2 | 1 - .../init.d/airframes/4060_dji_matrice_100 | 1 - ROMFS/px4fmu_common/init.d/airframes/4071_ifo | 1 - .../px4fmu_common/init.d/airframes/4072_draco | 1 - .../px4fmu_common/init.d/airframes/4073_ifo-s | 1 - .../init.d/airframes/4080_zmr250 | 1 - .../init.d/airframes/4090_nanomind | 1 - .../init.d/airframes/4100_tiltquadrotor | 1 - .../px4fmu_common/init.d/airframes/4250_teal | 1 - .../init.d/airframes/4500_clover4 | 1 - .../init.d/airframes/4900_crazyflie | 1 - .../init.d/airframes/4901_crazyflie21 | 1 - .../airframes/50000_generic_ground_vehicle | 1 - .../airframes/50003_aion_robotics_r1_rover | 1 - .../airframes/50004_nxpcup_car_dfrobot_gpx | 1 - .../init.d/airframes/5001_quad_+ | 1 - .../init.d/airframes/60000_uuv_generic | 1 - .../init.d/airframes/60001_uuv_hippocampus | 1 - .../init.d/airframes/60002_uuv_bluerov2_heavy | 1 - .../init.d/airframes/6001_hexa_x | 1 - .../init.d/airframes/6002_draco_r | 1 - .../init.d/airframes/7001_hexa_+ | 1 - .../init.d/airframes/8001_octo_x | 1 - .../init.d/airframes/9001_octo_+ | 1 - ROMFS/px4fmu_common/init.d/rc.sensors | 2 +- boards/intel/aerofc-v1/CMakeLists.txt | 34 -- .../intel/aerofc-v1/aerofc_adc/AEROFC_ADC.cpp | 133 ------ .../intel/aerofc-v1/aerofc_adc/AEROFC_ADC.hpp | 73 ---- .../intel/aerofc-v1/aerofc_adc/CMakeLists.txt | 43 -- .../aerofc-v1/aerofc_adc/aerofc_adc_main.cpp | 98 ----- boards/intel/aerofc-v1/cmake/upload.cmake | 39 -- boards/intel/aerofc-v1/default.cmake | 104 ----- boards/intel/aerofc-v1/firmware.prototype | 13 - boards/intel/aerofc-v1/init/rc.board_defaults | 12 - boards/intel/aerofc-v1/init/rc.board_sensors | 23 -- boards/intel/aerofc-v1/nuttx-config/Kconfig | 22 - .../aerofc-v1/nuttx-config/include/board.h | 385 ------------------ .../nuttx-config/include/board_dma_map.h | 91 ----- .../aerofc-v1/nuttx-config/nsh/defconfig | 197 --------- .../aerofc-v1/nuttx-config/scripts/script.ld | 139 ------- boards/intel/aerofc-v1/scripts/aero_upload.sh | 74 ---- boards/intel/aerofc-v1/src/CMakeLists.txt | 49 --- boards/intel/aerofc-v1/src/board_config.h | 168 -------- boards/intel/aerofc-v1/src/i2c.cpp | 40 -- boards/intel/aerofc-v1/src/init.c | 227 ----------- boards/intel/aerofc-v1/src/led.c | 119 ------ boards/intel/aerofc-v1/src/mtd.cpp | 81 ---- boards/intel/aerofc-v1/src/spi.cpp | 45 -- boards/intel/aerofc-v1/src/timer_config.cpp | 49 --- src/drivers/drv_sensor.h | 1 - 103 files changed, 1 insertion(+), 2337 deletions(-) delete mode 100644 boards/intel/aerofc-v1/CMakeLists.txt delete mode 100644 boards/intel/aerofc-v1/aerofc_adc/AEROFC_ADC.cpp delete mode 100644 boards/intel/aerofc-v1/aerofc_adc/AEROFC_ADC.hpp delete mode 100644 boards/intel/aerofc-v1/aerofc_adc/CMakeLists.txt delete mode 100644 boards/intel/aerofc-v1/aerofc_adc/aerofc_adc_main.cpp delete mode 100644 boards/intel/aerofc-v1/cmake/upload.cmake delete mode 100644 boards/intel/aerofc-v1/default.cmake delete mode 100644 boards/intel/aerofc-v1/firmware.prototype delete mode 100644 boards/intel/aerofc-v1/init/rc.board_defaults delete mode 100644 boards/intel/aerofc-v1/init/rc.board_sensors delete mode 100644 boards/intel/aerofc-v1/nuttx-config/Kconfig delete mode 100644 boards/intel/aerofc-v1/nuttx-config/include/board.h delete mode 100644 boards/intel/aerofc-v1/nuttx-config/include/board_dma_map.h delete mode 100644 boards/intel/aerofc-v1/nuttx-config/nsh/defconfig delete mode 100644 boards/intel/aerofc-v1/nuttx-config/scripts/script.ld delete mode 100755 boards/intel/aerofc-v1/scripts/aero_upload.sh delete mode 100644 boards/intel/aerofc-v1/src/CMakeLists.txt delete mode 100644 boards/intel/aerofc-v1/src/board_config.h delete mode 100644 boards/intel/aerofc-v1/src/i2c.cpp delete mode 100644 boards/intel/aerofc-v1/src/init.c delete mode 100644 boards/intel/aerofc-v1/src/led.c delete mode 100644 boards/intel/aerofc-v1/src/mtd.cpp delete mode 100644 boards/intel/aerofc-v1/src/spi.cpp delete mode 100644 boards/intel/aerofc-v1/src/timer_config.cpp diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml index 15b9e3abdd..ff0dbd1fe1 100644 --- a/.github/workflows/compile_nuttx.yml +++ b/.github/workflows/compile_nuttx.yml @@ -34,7 +34,6 @@ jobs: holybro_durandal-v1_default, holybro_kakutef7_default, holybro_pix32v5_default, - intel_aerofc-v1_default, modalai_fc-v1_default, mro_ctrl-zero-f7_default, mro_ctrl-zero-f7-oem_default, diff --git a/Makefile b/Makefile index 31ea4aa4ad..31cbe12c81 100644 --- a/Makefile +++ b/Makefile @@ -268,7 +268,6 @@ px4fmu_firmware: \ misc_qgc_extra_firmware: \ check_nxp_fmuk66-v3_default \ check_nxp_fmurt1062-v1_default \ - check_intel_aerofc-v1_default \ check_mro_x21_default \ check_bitcraze_crazyflie_default \ check_bitcraze_crazyflie21_default \ diff --git a/ROMFS/px4fmu_common/init.d/airframes/10015_tbs_discovery b/ROMFS/px4fmu_common/init.d/airframes/10015_tbs_discovery index 73ba807362..a33707b682 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/10015_tbs_discovery +++ b/ROMFS/px4fmu_common/init.d/airframes/10015_tbs_discovery @@ -20,7 +20,6 @@ # @maintainer Lorenz Meier # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris b/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris index 3ea6fa74d9..ea593e825b 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris +++ b/ROMFS/px4fmu_common/init.d/airframes/10016_3dr_iris @@ -18,7 +18,6 @@ # @maintainer Lorenz Meier # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/10017_steadidrone_qu4d b/ROMFS/px4fmu_common/init.d/airframes/10017_steadidrone_qu4d index 26378a7321..1d7e3e268c 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/10017_steadidrone_qu4d +++ b/ROMFS/px4fmu_common/init.d/airframes/10017_steadidrone_qu4d @@ -20,7 +20,6 @@ # @maintainer Lorenz Meier # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/10018_tbs_endurance b/ROMFS/px4fmu_common/init.d/airframes/10018_tbs_endurance index f586eb8600..05b39e571e 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/10018_tbs_endurance +++ b/ROMFS/px4fmu_common/init.d/airframes/10018_tbs_endurance @@ -20,7 +20,6 @@ # @maintainer Simon Wilks # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil b/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil index 3eef8aa909..4874f0afd8 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil +++ b/ROMFS/px4fmu_common/init.d/airframes/1002_standard_vtol.hil @@ -8,7 +8,6 @@ # @maintainer Roman Bapst # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/11001_hexa_cox b/ROMFS/px4fmu_common/init.d/airframes/11001_hexa_cox index 438c384be5..b36f11ef34 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/11001_hexa_cox +++ b/ROMFS/px4fmu_common/init.d/airframes/11001_hexa_cox @@ -18,7 +18,6 @@ # # @maintainer Lorenz Meier # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/12001_octo_cox b/ROMFS/px4fmu_common/init.d/airframes/12001_octo_cox index 8992cc4d58..5fc70fdfd3 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/12001_octo_cox +++ b/ROMFS/px4fmu_common/init.d/airframes/12001_octo_cox @@ -16,7 +16,6 @@ # # @maintainer Lorenz Meier # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/12002_steadidrone_mavrik b/ROMFS/px4fmu_common/init.d/airframes/12002_steadidrone_mavrik index 1fc7adc9bd..e91e70e8d6 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/12002_steadidrone_mavrik +++ b/ROMFS/px4fmu_common/init.d/airframes/12002_steadidrone_mavrik @@ -17,7 +17,6 @@ # @maintainer Simon Wilks # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard b/ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard index f86e82d6d5..6029d176ff 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard +++ b/ROMFS/px4fmu_common/init.d/airframes/13000_generic_vtol_standard @@ -18,7 +18,6 @@ # @output AUX5 Throttle # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol b/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol index 14c5371ec9..30b8c7111f 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol +++ b/ROMFS/px4fmu_common/init.d/airframes/13001_caipirinha_vtol @@ -13,7 +13,6 @@ # @maintainer Roman Bapst # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 b/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 index d382ee5f03..8660126b12 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 +++ b/ROMFS/px4fmu_common/init.d/airframes/13002_firefly6 @@ -18,7 +18,6 @@ # @output AUX4 Gear # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter b/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter index 0b8630b70e..ea700ce084 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter +++ b/ROMFS/px4fmu_common/init.d/airframes/13003_quad_tailsitter @@ -8,7 +8,6 @@ # @maintainer Roman Bapst # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter b/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter index 7b2adfc439..fdf9a3daf8 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter +++ b/ROMFS/px4fmu_common/init.d/airframes/13004_quad+_tailsitter @@ -17,7 +17,6 @@ # @maintainer Roman Bapst # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad b/ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad index 99c3cfcf09..03151f1426 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad +++ b/ROMFS/px4fmu_common/init.d/airframes/13005_vtol_AAERT_quad @@ -18,7 +18,6 @@ # @output AUX5 Throttle # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta b/ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta index 26989b44db..b50ab35cbe 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta +++ b/ROMFS/px4fmu_common/init.d/airframes/13006_vtol_standard_delta @@ -16,7 +16,6 @@ # @output AUX3 Motor # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad b/ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad index 98e0f6e7a9..62ad1e71a3 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad +++ b/ROMFS/px4fmu_common/init.d/airframes/13007_vtol_AAVVT_quad @@ -8,7 +8,6 @@ # @maintainer Sander Smeets # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger b/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger index 560fca0126..a04b06f68a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger +++ b/ROMFS/px4fmu_common/init.d/airframes/13008_QuadRanger @@ -8,7 +8,6 @@ # @maintainer Sander Smeets # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger b/ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger index e90c3d5af0..47f0c98f41 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger +++ b/ROMFS/px4fmu_common/init.d/airframes/13009_vtol_spt_ranger @@ -8,7 +8,6 @@ # @maintainer Andreas Antener # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13010_claire b/ROMFS/px4fmu_common/init.d/airframes/13010_claire index 0af795d0a1..c9ef139257 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13010_claire +++ b/ROMFS/px4fmu_common/init.d/airframes/13010_claire @@ -8,7 +8,6 @@ # @maintainer Samay Siga # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13012_convergence b/ROMFS/px4fmu_common/init.d/airframes/13012_convergence index f05c37c9ac..8c833c0c28 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13012_convergence +++ b/ROMFS/px4fmu_common/init.d/airframes/13012_convergence @@ -17,7 +17,6 @@ # @output MAIN8 Elevon left # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad b/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad index 6128f71c38..01a91748d9 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad +++ b/ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad @@ -17,7 +17,6 @@ # @output MAIN8 Pusher reverse channel # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark b/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark index 0ce948f52d..9272ef7359 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark +++ b/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark @@ -17,7 +17,6 @@ # @output MAIN8 motor 4 # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13015_generic_vtol_standard b/ROMFS/px4fmu_common/init.d/airframes/13015_generic_vtol_standard index 63fe83aee6..981675ae24 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13015_generic_vtol_standard +++ b/ROMFS/px4fmu_common/init.d/airframes/13015_generic_vtol_standard @@ -18,7 +18,6 @@ # @output MAIN9 Pusher motor # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo b/ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo index ab2308d820..6daf766136 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo +++ b/ROMFS/px4fmu_common/init.d/airframes/13050_generic_vtol_octo @@ -20,7 +20,6 @@ # @output AUX5 Throttle # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/13200_generic_vtol_tailsitter b/ROMFS/px4fmu_common/init.d/airframes/13200_generic_vtol_tailsitter index aa9c0fec6b..23ea7fb2c9 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/13200_generic_vtol_tailsitter +++ b/ROMFS/px4fmu_common/init.d/airframes/13200_generic_vtol_tailsitter @@ -13,7 +13,6 @@ # @maintainer Roman Bapst # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/14001_tri_y_yaw+ b/ROMFS/px4fmu_common/init.d/airframes/14001_tri_y_yaw+ index 6a772e4a06..eb02d83734 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/14001_tri_y_yaw+ +++ b/ROMFS/px4fmu_common/init.d/airframes/14001_tri_y_yaw+ @@ -12,7 +12,6 @@ # # @maintainer Trent Lukaczyk # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/14002_tri_y_yaw- b/ROMFS/px4fmu_common/init.d/airframes/14002_tri_y_yaw- index 262aea2ab9..ad36ed08c0 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/14002_tri_y_yaw- +++ b/ROMFS/px4fmu_common/init.d/airframes/14002_tri_y_yaw- @@ -12,7 +12,6 @@ # # @maintainer Trent Lukaczyk # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/15001_coax_heli b/ROMFS/px4fmu_common/init.d/airframes/15001_coax_heli index a4e556c142..3113c8cc41 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/15001_coax_heli +++ b/ROMFS/px4fmu_common/init.d/airframes/15001_coax_heli @@ -13,7 +13,6 @@ # @maintainer Emmanuel Roussel # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/16001_helicopter b/ROMFS/px4fmu_common/init.d/airframes/16001_helicopter index c1207b2435..0367a747a8 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/16001_helicopter +++ b/ROMFS/px4fmu_common/init.d/airframes/16001_helicopter @@ -14,7 +14,6 @@ # @output MAIN5 tail-rotor servo # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/17002_TF-AutoG2 b/ROMFS/px4fmu_common/init.d/airframes/17002_TF-AutoG2 index d9549b664e..048f4bb1be 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/17002_TF-AutoG2 +++ b/ROMFS/px4fmu_common/init.d/airframes/17002_TF-AutoG2 @@ -20,7 +20,6 @@ # @maintainer ThunderFly s.r.o., Roman Dvorak # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/17003_TF-G2 b/ROMFS/px4fmu_common/init.d/airframes/17003_TF-G2 index 2056f7b74a..975001bc1a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/17003_TF-G2 +++ b/ROMFS/px4fmu_common/init.d/airframes/17003_TF-G2 @@ -15,7 +15,6 @@ # @maintainer ThunderFly s.r.o., Roman Dvorak # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/18001_TF-B1 b/ROMFS/px4fmu_common/init.d/airframes/18001_TF-B1 index de417958c7..e2ad00c809 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/18001_TF-B1 +++ b/ROMFS/px4fmu_common/init.d/airframes/18001_TF-B1 @@ -10,7 +10,6 @@ # @maintainer ThunderFly s.r.o. # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/2100_standard_plane b/ROMFS/px4fmu_common/init.d/airframes/2100_standard_plane index 1a2ad26d52..8274472503 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/2100_standard_plane +++ b/ROMFS/px4fmu_common/init.d/airframes/2100_standard_plane @@ -18,7 +18,6 @@ # # @maintainer Lorenz Meier # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/2105_maja b/ROMFS/px4fmu_common/init.d/airframes/2105_maja index 43a666c5ff..eda8c12d64 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/2105_maja +++ b/ROMFS/px4fmu_common/init.d/airframes/2105_maja @@ -20,7 +20,6 @@ # @maintainer Andreas Antener # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/2106_albatross b/ROMFS/px4fmu_common/init.d/airframes/2106_albatross index cf25f2fe5d..7639f0b2d2 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/2106_albatross +++ b/ROMFS/px4fmu_common/init.d/airframes/2106_albatross @@ -20,7 +20,6 @@ # # @maintainer Andreas Antener # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/2200_mini_talon b/ROMFS/px4fmu_common/init.d/airframes/2200_mini_talon index 6bdf132ccb..1f4825048f 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/2200_mini_talon +++ b/ROMFS/px4fmu_common/init.d/airframes/2200_mini_talon @@ -21,7 +21,6 @@ # @maintainer Friedrich Beckmann # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/24001_dodeca_cox b/ROMFS/px4fmu_common/init.d/airframes/24001_dodeca_cox index f4a5b53d36..37f1a8bc95 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/24001_dodeca_cox +++ b/ROMFS/px4fmu_common/init.d/airframes/24001_dodeca_cox @@ -22,7 +22,6 @@ # @maintainer Ian McNanie # @maintainer William Peale # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/2507_cloudship b/ROMFS/px4fmu_common/init.d/airframes/2507_cloudship index 9326c9c0db..a040702c07 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/2507_cloudship +++ b/ROMFS/px4fmu_common/init.d/airframes/2507_cloudship @@ -10,7 +10,6 @@ # @output MAIN4 tail thruster # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/3000_generic_wing b/ROMFS/px4fmu_common/init.d/airframes/3000_generic_wing index 00c75fef9a..4b5ee877d6 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3000_generic_wing +++ b/ROMFS/px4fmu_common/init.d/airframes/3000_generic_wing @@ -15,7 +15,6 @@ # # @maintainer # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/3030_io_camflyer b/ROMFS/px4fmu_common/init.d/airframes/3030_io_camflyer index 571783c9b6..d902b960eb 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3030_io_camflyer +++ b/ROMFS/px4fmu_common/init.d/airframes/3030_io_camflyer @@ -16,7 +16,6 @@ # @maintainer Simon Wilks # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/3031_phantom b/ROMFS/px4fmu_common/init.d/airframes/3031_phantom index 87b4504d99..0b2a594768 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3031_phantom +++ b/ROMFS/px4fmu_common/init.d/airframes/3031_phantom @@ -18,7 +18,6 @@ # @maintainer Simon Wilks # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/3032_skywalker_x5 b/ROMFS/px4fmu_common/init.d/airframes/3032_skywalker_x5 index 577710bded..8ea3dc7d3a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3032_skywalker_x5 +++ b/ROMFS/px4fmu_common/init.d/airframes/3032_skywalker_x5 @@ -16,7 +16,6 @@ # @maintainer Julian Oes # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/3033_wingwing b/ROMFS/px4fmu_common/init.d/airframes/3033_wingwing index 2e4a7f58ef..ddb33dbfd5 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/3033_wingwing +++ b/ROMFS/px4fmu_common/init.d/airframes/3033_wingwing @@ -18,7 +18,6 @@ # @maintainer Lorenz Meier # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4020_hk_micro_pcb b/ROMFS/px4fmu_common/init.d/airframes/4020_hk_micro_pcb index 69f834c6a6..a708e32d4d 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4020_hk_micro_pcb +++ b/ROMFS/px4fmu_common/init.d/airframes/4020_hk_micro_pcb @@ -13,7 +13,6 @@ # @board px4_fmu-v4pro exclude # @board px4_fmu-v5 exclude # @board px4_fmu-v5x exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo b/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo index 55af8d5485..96f78e8e1a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo +++ b/ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo @@ -13,7 +13,6 @@ # @board px4_fmu-v4pro exclude # @board px4_fmu-v5 exclude # @board px4_fmu-v5x exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4031_3dr_quad b/ROMFS/px4fmu_common/init.d/airframes/4031_3dr_quad index e7e76f024d..405627f40a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4031_3dr_quad +++ b/ROMFS/px4fmu_common/init.d/airframes/4031_3dr_quad @@ -8,7 +8,6 @@ # @maintainer Lorenz Meier # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4040_reaper b/ROMFS/px4fmu_common/init.d/airframes/4040_reaper index 058c338a55..bf6bd46aa6 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4040_reaper +++ b/ROMFS/px4fmu_common/init.d/airframes/4040_reaper @@ -15,7 +15,6 @@ # @maintainer Blankered # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4041_beta75x b/ROMFS/px4fmu_common/init.d/airframes/4041_beta75x index a971b9f468..beb21c2937 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4041_beta75x +++ b/ROMFS/px4fmu_common/init.d/airframes/4041_beta75x @@ -18,7 +18,6 @@ # @board px4_fmu-v4pro exclude # @board px4_fmu-v5 exclude # @board px4_fmu-v5x exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4050_generic_250 b/ROMFS/px4fmu_common/init.d/airframes/4050_generic_250 index 05a729616e..0837d6f783 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4050_generic_250 +++ b/ROMFS/px4fmu_common/init.d/airframes/4050_generic_250 @@ -7,7 +7,6 @@ # # @maintainer Lorenz Meier # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4051_s250aq b/ROMFS/px4fmu_common/init.d/airframes/4051_s250aq index 5361c80358..40230bb59b 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4051_s250aq +++ b/ROMFS/px4fmu_common/init.d/airframes/4051_s250aq @@ -17,7 +17,6 @@ # @maintainer Lorenz Meier # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4052_holybro_qav250 b/ROMFS/px4fmu_common/init.d/airframes/4052_holybro_qav250 index 92cecf6e35..df5fa21481 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4052_holybro_qav250 +++ b/ROMFS/px4fmu_common/init.d/airframes/4052_holybro_qav250 @@ -10,7 +10,6 @@ # @maintainer Beat Kueng # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4053_holybro_kopis2 b/ROMFS/px4fmu_common/init.d/airframes/4053_holybro_kopis2 index 5ab7497021..8a59452e79 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4053_holybro_kopis2 +++ b/ROMFS/px4fmu_common/init.d/airframes/4053_holybro_kopis2 @@ -8,7 +8,6 @@ # @maintainer Beat Kueng # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4060_dji_matrice_100 b/ROMFS/px4fmu_common/init.d/airframes/4060_dji_matrice_100 index 9e426e3010..7ea158a44a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4060_dji_matrice_100 +++ b/ROMFS/px4fmu_common/init.d/airframes/4060_dji_matrice_100 @@ -8,7 +8,6 @@ # @maintainer James Goppert # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4071_ifo b/ROMFS/px4fmu_common/init.d/airframes/4071_ifo index ae7c1ea5ca..c62c951f0a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4071_ifo +++ b/ROMFS/px4fmu_common/init.d/airframes/4071_ifo @@ -17,7 +17,6 @@ # @board px4_fmu-v4pro exclude # @board px4_fmu-v5 exclude # @board px4_fmu-v5x exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4072_draco b/ROMFS/px4fmu_common/init.d/airframes/4072_draco index 975d0c545c..18afd3735f 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4072_draco +++ b/ROMFS/px4fmu_common/init.d/airframes/4072_draco @@ -17,7 +17,6 @@ # @board px4_fmu-v4pro exclude # @board px4_fmu-v5 exclude # @board px4_fmu-v5x exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4073_ifo-s b/ROMFS/px4fmu_common/init.d/airframes/4073_ifo-s index 56f9d390c1..411ffa5eb4 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4073_ifo-s +++ b/ROMFS/px4fmu_common/init.d/airframes/4073_ifo-s @@ -15,7 +15,6 @@ # @board px4_fmu-v4pro exclude # @board px4_fmu-v5 exclude # @board px4_fmu-v5x exclude -# @board intel_aerofc-v1 exclude # # @maintainer Hyon Lim # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4080_zmr250 b/ROMFS/px4fmu_common/init.d/airframes/4080_zmr250 index 70f970b294..9576fd24be 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4080_zmr250 +++ b/ROMFS/px4fmu_common/init.d/airframes/4080_zmr250 @@ -8,7 +8,6 @@ # @maintainer Anton Matosov # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4090_nanomind b/ROMFS/px4fmu_common/init.d/airframes/4090_nanomind index 4448cf6cab..a51335b8fa 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4090_nanomind +++ b/ROMFS/px4fmu_common/init.d/airframes/4090_nanomind @@ -12,7 +12,6 @@ # @board px4_fmu-v4pro exclude # @board px4_fmu-v5 exclude # @board px4_fmu-v5x exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4100_tiltquadrotor b/ROMFS/px4fmu_common/init.d/airframes/4100_tiltquadrotor index be39aab46f..3fd3f11d74 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4100_tiltquadrotor +++ b/ROMFS/px4fmu_common/init.d/airframes/4100_tiltquadrotor @@ -19,7 +19,6 @@ # @maintainer Ricardo Marques # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4250_teal b/ROMFS/px4fmu_common/init.d/airframes/4250_teal index efe879ff2e..117d4037aa 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4250_teal +++ b/ROMFS/px4fmu_common/init.d/airframes/4250_teal @@ -17,7 +17,6 @@ # @board px4_fmu-v4pro exclude # @board px4_fmu-v5 exclude # @board px4_fmu-v5x exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4500_clover4 b/ROMFS/px4fmu_common/init.d/airframes/4500_clover4 index 1e9d6273e8..91a5ef23f0 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4500_clover4 +++ b/ROMFS/px4fmu_common/init.d/airframes/4500_clover4 @@ -8,7 +8,6 @@ # @maintainer Oleg Kalachev # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/4900_crazyflie b/ROMFS/px4fmu_common/init.d/airframes/4900_crazyflie index b912c8ded3..da3c4bfac0 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4900_crazyflie +++ b/ROMFS/px4fmu_common/init.d/airframes/4900_crazyflie @@ -13,7 +13,6 @@ # @board px4_fmu-v4pro exclude # @board px4_fmu-v5 exclude # @board px4_fmu-v5x exclude -# @board intel_aerofc-v1 exclude # . ${R}etc/init.d/rc.mc_defaults diff --git a/ROMFS/px4fmu_common/init.d/airframes/4901_crazyflie21 b/ROMFS/px4fmu_common/init.d/airframes/4901_crazyflie21 index fa1b748195..5ba7a83891 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4901_crazyflie21 +++ b/ROMFS/px4fmu_common/init.d/airframes/4901_crazyflie21 @@ -13,7 +13,6 @@ # @board px4_fmu-v4pro exclude # @board px4_fmu-v5 exclude # @board px4_fmu-v5x exclude -# @board intel_aerofc-v1 exclude # . ${R}etc/init.d/rc.mc_defaults diff --git a/ROMFS/px4fmu_common/init.d/airframes/50000_generic_ground_vehicle b/ROMFS/px4fmu_common/init.d/airframes/50000_generic_ground_vehicle index 2e40df0ff3..41242a98c5 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/50000_generic_ground_vehicle +++ b/ROMFS/px4fmu_common/init.d/airframes/50000_generic_ground_vehicle @@ -10,7 +10,6 @@ # # @maintainer # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/50003_aion_robotics_r1_rover b/ROMFS/px4fmu_common/init.d/airframes/50003_aion_robotics_r1_rover index c36e815517..09b6e6f5ff 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/50003_aion_robotics_r1_rover +++ b/ROMFS/px4fmu_common/init.d/airframes/50003_aion_robotics_r1_rover @@ -15,7 +15,6 @@ # @maintainer Timothy Scott # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/50004_nxpcup_car_dfrobot_gpx b/ROMFS/px4fmu_common/init.d/airframes/50004_nxpcup_car_dfrobot_gpx index 73fdffb03c..fd6f195605 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/50004_nxpcup_car_dfrobot_gpx +++ b/ROMFS/px4fmu_common/init.d/airframes/50004_nxpcup_car_dfrobot_gpx @@ -15,7 +15,6 @@ # @maintainer Katrin Moritz # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/5001_quad_+ b/ROMFS/px4fmu_common/init.d/airframes/5001_quad_+ index b282d5fdd2..5e5df33a4c 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/5001_quad_+ +++ b/ROMFS/px4fmu_common/init.d/airframes/5001_quad_+ @@ -19,7 +19,6 @@ # # @maintainer Lorenz Meier # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/60000_uuv_generic b/ROMFS/px4fmu_common/init.d/airframes/60000_uuv_generic index 33ec6cb100..705d185a6a 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/60000_uuv_generic +++ b/ROMFS/px4fmu_common/init.d/airframes/60000_uuv_generic @@ -8,7 +8,6 @@ # @maintainer # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/60001_uuv_hippocampus b/ROMFS/px4fmu_common/init.d/airframes/60001_uuv_hippocampus index 13ec47f8f4..360d700fd6 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/60001_uuv_hippocampus +++ b/ROMFS/px4fmu_common/init.d/airframes/60001_uuv_hippocampus @@ -8,7 +8,6 @@ # @maintainer Daniel Duecker # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/60002_uuv_bluerov2_heavy b/ROMFS/px4fmu_common/init.d/airframes/60002_uuv_bluerov2_heavy index 5b2509de47..69384284be 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/60002_uuv_bluerov2_heavy +++ b/ROMFS/px4fmu_common/init.d/airframes/60002_uuv_bluerov2_heavy @@ -17,7 +17,6 @@ # @maintainer Thies Lennart Alff # # @board px4_fmu-v2 exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/6001_hexa_x b/ROMFS/px4fmu_common/init.d/airframes/6001_hexa_x index 7c1e9b7b96..893bb991c9 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/6001_hexa_x +++ b/ROMFS/px4fmu_common/init.d/airframes/6001_hexa_x @@ -18,7 +18,6 @@ # # @maintainer Lorenz Meier # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/6002_draco_r b/ROMFS/px4fmu_common/init.d/airframes/6002_draco_r index f36c9fcef1..8a87bdfab1 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/6002_draco_r +++ b/ROMFS/px4fmu_common/init.d/airframes/6002_draco_r @@ -22,7 +22,6 @@ # @board px4_fmu-v4pro exclude # @board px4_fmu-v5 exclude # @board px4_fmu-v5x exclude -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/7001_hexa_+ b/ROMFS/px4fmu_common/init.d/airframes/7001_hexa_+ index c8ab1e2d13..8f9e6f7cf9 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/7001_hexa_+ +++ b/ROMFS/px4fmu_common/init.d/airframes/7001_hexa_+ @@ -18,7 +18,6 @@ # # @maintainer Lorenz Meier # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/8001_octo_x b/ROMFS/px4fmu_common/init.d/airframes/8001_octo_x index 17bf17dda6..e69776f314 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/8001_octo_x +++ b/ROMFS/px4fmu_common/init.d/airframes/8001_octo_x @@ -20,7 +20,6 @@ # # @maintainer Lorenz Meier # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/airframes/9001_octo_+ b/ROMFS/px4fmu_common/init.d/airframes/9001_octo_+ index bd9b48a74e..b61a1f95b0 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/9001_octo_+ +++ b/ROMFS/px4fmu_common/init.d/airframes/9001_octo_+ @@ -20,7 +20,6 @@ # # @maintainer Lorenz Meier # -# @board intel_aerofc-v1 exclude # @board bitcraze_crazyflie exclude # diff --git a/ROMFS/px4fmu_common/init.d/rc.sensors b/ROMFS/px4fmu_common/init.d/rc.sensors index 75f739e80a..5353e8d8cc 100644 --- a/ROMFS/px4fmu_common/init.d/rc.sensors +++ b/ROMFS/px4fmu_common/init.d/rc.sensors @@ -5,7 +5,7 @@ # NOTE: Script variables are declared/initialized/unset in the rcS script. # -if ! ver hwcmp AEROFC_V1 OMNIBUS_F4SD +if ! ver hwcmp OMNIBUS_F4SD then if ! ver hwcmp BITCRAZE_CRAZYFLIE then diff --git a/boards/intel/aerofc-v1/CMakeLists.txt b/boards/intel/aerofc-v1/CMakeLists.txt deleted file mode 100644 index d5a0096ec6..0000000000 --- a/boards/intel/aerofc-v1/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################ -# -# Copyright (c) 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 -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name PX4 nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ - -add_subdirectory(aerofc_adc) diff --git a/boards/intel/aerofc-v1/aerofc_adc/AEROFC_ADC.cpp b/boards/intel/aerofc-v1/aerofc_adc/AEROFC_ADC.cpp deleted file mode 100644 index 7c184d2fa2..0000000000 --- a/boards/intel/aerofc-v1/aerofc_adc/AEROFC_ADC.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2016 Intel Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#include "AEROFC_ADC.hpp" - -using namespace time_literals; - -AEROFC_ADC::AEROFC_ADC(I2CSPIBusOption bus_option, int bus_number, int bus_frequency) : - I2C(DRV_ADC_DEVTYPE_AEROFC, MODULE_NAME, bus_number, SLAVE_ADDR, bus_frequency), - I2CSPIDriver(MODULE_NAME, px4::device_bus_to_wq(get_device_id()), bus_option, bus_number), - _sample_perf(perf_alloc(PC_ELAPSED, MODULE_NAME": sample")) -{ -} - -AEROFC_ADC::~AEROFC_ADC() -{ - perf_free(_sample_perf); -} - -int AEROFC_ADC::init() -{ - int ret = I2C::init(); - - if (ret != PX4_OK) { - return ret; - } - - ScheduleOnInterval(100_ms); // 10 Hz - - return PX4_OK; -} - -int AEROFC_ADC::probe() -{ - uint8_t buffer[2]; - int ret; - - _retries = 3; - - /* Enable ADC */ - buffer[0] = ADC_ENABLE_REG; - buffer[1] = 0x01; - ret = transfer(buffer, 2, NULL, 0); - - if (ret != PX4_OK) { - goto error; - } - - usleep(10000); - - /* Read ADC value */ - buffer[0] = ADC_CHANNEL_REG; - ret = transfer(buffer, 1, buffer, 2); - - if (ret != PX4_OK) { - goto error; - } - - return PX4_OK; - -error: - return -EIO; -} - -void AEROFC_ADC::RunImpl() -{ - /* - * https://github.com/intel-aero/intel-aero-fpga/blob/master/aero_sample/adc/adc.html - * https://github.com/intel-aero/meta-intel-aero/wiki/95-(References)-FPGA - * https://github.com/intel-aero/intel-aero-fpga/blob/master/aero_rtf_kit/RTL/adc.v - */ - perf_begin(_sample_perf); - - uint8_t buffer[10] {}; - buffer[0] = ADC_CHANNEL_REG; - int ret = transfer(buffer, 1, buffer, sizeof(buffer)); - - if (ret != PX4_OK) { - PX4_ERR("Error reading sample"); - return; - } - - adc_report_s adc_report{}; - adc_report.device_id = get_device_id(); - adc_report.timestamp = hrt_absolute_time(); - adc_report.v_ref = 3.0f; - adc_report.resolution = 1 << 12; - - unsigned i; - - for (i = 0; i < MAX_CHANNEL; ++i) { - adc_report.channel_id[i] = i; - adc_report.raw_data[i] = (buffer[i * 2] | (buffer[i * 2 + 1] << 8)); - } - - for (; i < PX4_MAX_ADC_CHANNELS; ++i) { // set unused channel id to -1 - adc_report.channel_id[i] = -1; - } - - _to_adc_report.publish(adc_report); - - perf_end(_sample_perf); -} diff --git a/boards/intel/aerofc-v1/aerofc_adc/AEROFC_ADC.hpp b/boards/intel/aerofc-v1/aerofc_adc/AEROFC_ADC.hpp deleted file mode 100644 index 8638495d52..0000000000 --- a/boards/intel/aerofc-v1/aerofc_adc/AEROFC_ADC.hpp +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2016 Intel Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#pragma once - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define SLAVE_ADDR 0x50 -#define ADC_ENABLE_REG 0x00 -#define ADC_CHANNEL_REG 0x03 -#define MAX_CHANNEL 5 - -class AEROFC_ADC : public device::I2C, public I2CSPIDriver -{ -public: - AEROFC_ADC(I2CSPIBusOption bus_option, int bus_number, int bus_frequency); - ~AEROFC_ADC() override; - - static I2CSPIDriverBase *instantiate(const BusCLIArguments &cli, const BusInstanceIterator &iterator, - int runtime_instance); - static void print_usage(); - - int init() override; - - void RunImpl(); -private: - int probe() override;; - - uORB::Publication _to_adc_report{ORB_ID(adc_report)}; - - perf_counter_t _sample_perf; -}; diff --git a/boards/intel/aerofc-v1/aerofc_adc/CMakeLists.txt b/boards/intel/aerofc-v1/aerofc_adc/CMakeLists.txt deleted file mode 100644 index 1c31ee9e35..0000000000 --- a/boards/intel/aerofc-v1/aerofc_adc/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################ -# -# Copyright (C) 2016 Intel Corporation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name PX4 nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ -px4_add_module( - MODULE aerofc_adc - MAIN aerofc_adc - SRCS - aerofc_adc_main.cpp - AEROFC_ADC.cpp - AEROFC_ADC.hpp - DEPENDS - drivers__device - px4_work_queue - ) diff --git a/boards/intel/aerofc-v1/aerofc_adc/aerofc_adc_main.cpp b/boards/intel/aerofc-v1/aerofc_adc/aerofc_adc_main.cpp deleted file mode 100644 index 19003327b0..0000000000 --- a/boards/intel/aerofc-v1/aerofc_adc/aerofc_adc_main.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2016 Intel Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#include -#include -#include - -#include "AEROFC_ADC.hpp" - -I2CSPIDriverBase * -AEROFC_ADC::instantiate(const BusCLIArguments &cli, const BusInstanceIterator &iterator, int runtime_instance) -{ - AEROFC_ADC *interface = new AEROFC_ADC(iterator.configuredBusOption(), iterator.bus(), cli.bus_frequency); - - if (interface == nullptr) { - PX4_ERR("alloc failed"); - return nullptr; - } - - if (interface->init() != OK) { - delete interface; - PX4_DEBUG("no device on bus %i (devid 0x%x)", iterator.bus(), iterator.devid()); - return nullptr; - } - - return interface; -} - -void -AEROFC_ADC::print_usage() -{ - PRINT_MODULE_USAGE_NAME("aerofc_adc", "driver"); - PRINT_MODULE_USAGE_COMMAND("start"); - PRINT_MODULE_USAGE_PARAMS_I2C_SPI_DRIVER(true, false); - PRINT_MODULE_USAGE_DEFAULT_COMMANDS(); -} - -extern "C" int -aerofc_adc_main(int argc, char *argv[]) -{ - using ThisDriver = AEROFC_ADC; - BusCLIArguments cli{true, false}; - cli.default_i2c_frequency = 400000; - - const char *verb = cli.parseDefaultArguments(argc, argv); - - if (!verb) { - ThisDriver::print_usage(); - return -1; - } - - BusInstanceIterator iterator(MODULE_NAME, cli, DRV_ADC_DEVTYPE_AEROFC); - - if (!strcmp(verb, "start")) { - return ThisDriver::module_start(cli, iterator); - } - - if (!strcmp(verb, "stop")) { - return ThisDriver::module_stop(iterator); - } - - if (!strcmp(verb, "status")) { - return ThisDriver::module_status(iterator); - } - - ThisDriver::print_usage(); - return 1; -} diff --git a/boards/intel/aerofc-v1/cmake/upload.cmake b/boards/intel/aerofc-v1/cmake/upload.cmake deleted file mode 100644 index 1f8eeba6a9..0000000000 --- a/boards/intel/aerofc-v1/cmake/upload.cmake +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################ -# -# Copyright (c) 2020 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 -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name PX4 nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ - -add_custom_target(upload - COMMAND ${PX4_BOARD_DIR}/scripts/aero_upload.sh $ - DEPENDS px4 ${PX4_BOARD_DIR}/scripts/aero_upload.sh - COMMENT "uploading px4" - USES_TERMINAL -) diff --git a/boards/intel/aerofc-v1/default.cmake b/boards/intel/aerofc-v1/default.cmake deleted file mode 100644 index a43923e6b4..0000000000 --- a/boards/intel/aerofc-v1/default.cmake +++ /dev/null @@ -1,104 +0,0 @@ - -px4_add_board( - PLATFORM nuttx - VENDOR intel - MODEL aerofc-v1 - LABEL default - TOOLCHAIN arm-none-eabi - ARCHITECTURE cortex-m4 - CONSTRAINED_MEMORY - ROMFSROOT px4fmu_common - CONSTRAINED_FLASH - SERIAL_PORTS - GPS1:/dev/ttyS5 - TEL1:/dev/ttyS3 - TEL2:/dev/ttyS1 - DRIVERS - barometer/ms5611 - #camera_trigger - #differential_pressure # all available differential pressure drivers - distance_sensor - gps - imu/invensense/mpu9250 - #irlock - #magnetometer # all available magnetometer drivers - magnetometer/hmc5883 - magnetometer/isentek/ist8310 - #optical_flow/px4flow - #protocol_splitter - pwm_out_sim - pwm_out - rc_input - #telemetry # all available telemetry drivers - #uavcan - MODULES - #airspeed_selector - #attitude_estimator_q - battery_status - #camera_feedback - commander - dataman - ekf2 - events - flight_mode_manager - #fw_att_control - #fw_pos_control_l1 - land_detector - landing_target_estimator - load_mon - #local_position_estimator - logger - mavlink - mc_att_control - mc_hover_thrust_estimator - mc_pos_control - mc_rate_control - #micrortps_bridge - navigator - rc_update - #rover_pos_control - sensors - #sih - #temperature_compensation - vmount - #vtol_att_control - SYSTEMCMDS - bl_update - #dmesg - dumpfile - esc_calib - hardfault_log - i2cdetect - led_control - mft - mixer - motor_ramp - motor_test - mtd - nshterm - param - perf - pwm - reboot - reflect - sd_bench - system_time - #tests # tests and test runner - top - #topic_listener - tune_control - uorb - ver - work_queue - EXAMPLES - #fake_gps - #fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control - #hello - #hwtest # Hardware test - #matlab_csv_serial - #px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html - #px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html - #rover_steering_control # Rover example app - #uuv_example_app - #work_item - ) diff --git a/boards/intel/aerofc-v1/firmware.prototype b/boards/intel/aerofc-v1/firmware.prototype deleted file mode 100644 index a236a21af9..0000000000 --- a/boards/intel/aerofc-v1/firmware.prototype +++ /dev/null @@ -1,13 +0,0 @@ -{ - "board_id": 65, - "magic": "PX4FWv1", - "description": "Firmware for the Intel Aero FC board", - "image": "", - "build_time": 0, - "summary": "AEROFCv1", - "version": "0.1", - "image_size": 0, - "image_maxsize": 999424, - "git_identity": "", - "board_revision": 0 -} diff --git a/boards/intel/aerofc-v1/init/rc.board_defaults b/boards/intel/aerofc-v1/init/rc.board_defaults deleted file mode 100644 index ba3caec54f..0000000000 --- a/boards/intel/aerofc-v1/init/rc.board_defaults +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# intel aero specific board defaults -#------------------------------------------------------------------------------ - -# system_power unavailable -param set-default CBRK_SUPPLY_CHK 894281 - -param set-default SYS_AUTOSTART 4070 - -set DATAMAN_OPT -i -set LOGGER_ARGS "-m mavlink" diff --git a/boards/intel/aerofc-v1/init/rc.board_sensors b/boards/intel/aerofc-v1/init/rc.board_sensors deleted file mode 100644 index 653757b35d..0000000000 --- a/boards/intel/aerofc-v1/init/rc.board_sensors +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# intel aero specific board sensors init -#------------------------------------------------------------------------------ - -aerofc_adc -I start - -if ! ms5611 -T 5607 start -then - ms5611 start -fi - -mpu9250 -s -R 0 start - -ist8310 -I -R 14 start - -ll40ls start -X - -# Internal SPI (auto detect ms5611 or ms5607) -if ! ms5611 -T 5607 -s start -then - ms5611 -s start -fi diff --git a/boards/intel/aerofc-v1/nuttx-config/Kconfig b/boards/intel/aerofc-v1/nuttx-config/Kconfig deleted file mode 100644 index be9173f45c..0000000000 --- a/boards/intel/aerofc-v1/nuttx-config/Kconfig +++ /dev/null @@ -1,22 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see misc/tools/kconfig-language.txt. -# - -if ARCH_BOARD_AEROFC_V1 - -config BOARD_HAS_PROBES - bool "Board provides GPIO or other Hardware for signaling to timing analyze." - default y - ---help--- - This board provides GPIO FMU-CH1-6 as PROBE_1-6 to provide timing signals from selected drivers. - -config BOARD_USE_PROBES - bool "Enable the use the board provided GPIO FMU-CH1-6 as PROBE_1-6 to provide timing signals from selected drivers" - default n - depends on BOARD_HAS_PROBES - - ---help--- - Select to use GPIO FMU-CH1-6 to provide timing signals from selected drivers. - -endif diff --git a/boards/intel/aerofc-v1/nuttx-config/include/board.h b/boards/intel/aerofc-v1/nuttx-config/include/board.h deleted file mode 100644 index 967d62f7ac..0000000000 --- a/boards/intel/aerofc-v1/nuttx-config/include/board.h +++ /dev/null @@ -1,385 +0,0 @@ -/************************************************************************************ - * configs/aerofc-v1/include/board.h - * include/arch/board/board.h - * - * Copyright (C) 2012-2016 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * David Sidrane - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ************************************************************************************/ - -#pragma once - -/************************************************************************************ - * Included Files - ************************************************************************************/ -#include "board_dma_map.h" - -#include - -#ifndef __ASSEMBLY__ -# include -#endif - -#include "stm32_rcc.h" -#include "stm32.h" - -/************************************************************************************ - * Definitions - ************************************************************************************/ - -/* Clocking *************************************************************************/ -/* The TAP V1 uses a 16MHz crystal connected to the HSE. - * - * This is the canonical configuration: - * System Clock source : PLL (HSE) - * SYSCLK(Hz) : 168000000 Determined by PLL configuration - * HCLK(Hz) : 168000000 (STM32_RCC_CFGR_HPRE) - * AHB Prescaler : 1 (STM32_RCC_CFGR_HPRE) - * APB1 Prescaler : 4 (STM32_RCC_CFGR_PPRE1) - * APB2 Prescaler : 2 (STM32_RCC_CFGR_PPRE2) - * HSE Frequency(Hz) : 16000000 (STM32_BOARD_XTAL) - * PLLM : 8 (STM32_PLLCFG_PLLM) - * PLLN : 168 (STM32_PLLCFG_PLLN) - * PLLP : 2 (STM32_PLLCFG_PLLP) - * PLLQ : 7 (STM32_PLLCFG_PLLQ) - * Main regulator output voltage : Scale1 mode Needed for high speed SYSCLK - * Flash Latency(WS) : 5 - * Prefetch Buffer : OFF - * Instruction cache : ON - * Data cache : ON - * Require 48MHz for USB OTG FS, : Enabled - * SDIO and RNG clock - */ - -/* HSI - 16 MHz RC factory-trimmed - * LSI - 32 KHz RC - * HSE - On-board crystal frequency is 16MHz - * LSE - not installed - */ - -#define STM32_BOARD_XTAL 16000000ul - -#define STM32_HSI_FREQUENCY 16000000ul -#define STM32_LSI_FREQUENCY 32000 -#define STM32_HSE_FREQUENCY STM32_BOARD_XTAL - -/* Main PLL Configuration. - * - * PLL source is HSE - * PLL_VCO = (STM32_HSE_FREQUENCY / PLLM) * PLLN - * = (16,000,000 / 8) * 168 - * = 336,000,000 - * SYSCLK = PLL_VCO / PLLP - * = 336,000,000 / 2 = 168,000,000 - * USB OTG FS, SDIO and RNG Clock - * = PLL_VCO / PLLQ - * = 336,000,000 / 7 - * = 48,000,000 - */ - -#define STM32_PLLCFG_PLLM RCC_PLLCFG_PLLM(8) -#define STM32_PLLCFG_PLLN RCC_PLLCFG_PLLN(168) -#define STM32_PLLCFG_PLLP RCC_PLLCFG_PLLP_2 -#define STM32_PLLCFG_PLLQ RCC_PLLCFG_PLLQ(7) - -#define STM32_SYSCLK_FREQUENCY 168000000ul - -/* AHB clock (HCLK) is SYSCLK (168MHz) */ - -#define STM32_RCC_CFGR_HPRE RCC_CFGR_HPRE_SYSCLK /* HCLK = SYSCLK / 1 */ -#define STM32_HCLK_FREQUENCY STM32_SYSCLK_FREQUENCY -#define STM32_BOARD_HCLK STM32_HCLK_FREQUENCY /* same as above, to satisfy compiler */ - -/* APB1 clock (PCLK1) is HCLK/4 (42MHz) */ - -#define STM32_RCC_CFGR_PPRE1 RCC_CFGR_PPRE1_HCLKd4 /* PCLK1 = HCLK / 4 */ -#define STM32_PCLK1_FREQUENCY (STM32_HCLK_FREQUENCY/4) - -/* Timers driven from APB1 will be twice PCLK1 */ - -#define STM32_APB1_TIM2_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB1_TIM3_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB1_TIM4_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB1_TIM5_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB1_TIM6_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB1_TIM7_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB1_TIM12_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB1_TIM13_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB1_TIM14_CLKIN (2*STM32_PCLK1_FREQUENCY) - -/* APB2 clock (PCLK2) is HCLK/2 (84MHz) */ - -#define STM32_RCC_CFGR_PPRE2 RCC_CFGR_PPRE2_HCLKd2 /* PCLK2 = HCLK / 2 */ -#define STM32_PCLK2_FREQUENCY (STM32_HCLK_FREQUENCY/2) - -/* Timers driven from APB2 will be twice PCLK2 */ - -#define STM32_APB2_TIM1_CLKIN (2*STM32_PCLK2_FREQUENCY) -#define STM32_APB2_TIM8_CLKIN (2*STM32_PCLK2_FREQUENCY) -#define STM32_APB2_TIM9_CLKIN (2*STM32_PCLK2_FREQUENCY) -#define STM32_APB2_TIM10_CLKIN (2*STM32_PCLK2_FREQUENCY) -#define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK2_FREQUENCY) - -/* Timer Frequencies, if APBx is set to 1, frequency is same to APBx - * otherwise frequency is 2xAPBx. - * Note: TIM1,8-11 are on APB2, others on APB1 - */ - -#define BOARD_TIM1_FREQUENCY STM32_APB2_TIM1_CLKIN -#define BOARD_TIM2_FREQUENCY STM32_APB1_TIM2_CLKIN -#define BOARD_TIM3_FREQUENCY STM32_APB1_TIM3_CLKIN -#define BOARD_TIM4_FREQUENCY STM32_APB1_TIM4_CLKIN -#define BOARD_TIM5_FREQUENCY STM32_APB1_TIM5_CLKIN -#define BOARD_TIM6_FREQUENCY STM32_APB1_TIM6_CLKIN -#define BOARD_TIM7_FREQUENCY STM32_APB1_TIM7_CLKIN -#define BOARD_TIM8_FREQUENCY STM32_APB2_TIM8_CLKIN -#define BOARD_TIM9_FREQUENCY STM32_APB2_TIM9_CLKIN -#define BOARD_TIM10_FREQUENCY STM32_APB2_TIM10_CLKIN -#define BOARD_TIM11_FREQUENCY STM32_APB2_TIM11_CLKIN -#define BOARD_TIM12_FREQUENCY STM32_APB1_TIM12_CLKIN -#define BOARD_TIM13_FREQUENCY STM32_APB1_TIM13_CLKIN -#define BOARD_TIM14_FREQUENCY STM32_APB1_TIM14_CLKIN - -/* LED definitions ******************************************************************/ -/* If CONFIG_ARCH_LEDS is not defined, then the user can control the LEDs in any - * way. The following definitions are used to access individual LEDs. - */ - -/* LED index values for use with stm32_setled() */ -#define BOARD_LED1 0 -#define BOARD_LED2 1 -#define BOARD_NLEDS 2 - -#define BOARD_LED_BLUE BOARD_LED1 -#define BOARD_LED_RED BOARD_LED2 - -/* LED bits for use with stm32_setleds() */ - -#define BOARD_LED1_BIT (1 << BOARD_LED1) -#define BOARD_LED2_BIT (1 << BOARD_LED2) - -/* If CONFIG_ARCH_LEDs is defined, then NuttX will control the 2 LEDs on board - * the aerofc-v1. The following definitions describe how NuttX controls - * the LEDs: - */ - -#define LED_STARTED 0 /* BLUE */ -#define LED_HEAPALLOCATE 1 /* LED2 */ -#define LED_IRQSENABLED 2 /* BLUE */ -#define LED_STACKCREATED 3 /* BLUE + RED */ -#define LED_INIRQ 4 /* BLUE */ -#define LED_SIGNAL 5 /* RED */ -#define LED_ASSERTION 6 /* BLUE + RED */ -#define LED_PANIC 7 /* BLUE + RED */ - -/* Alternate function pin selections ************************************************/ - -/* - * USARTs and UARTs - * - * - * Peripheral Port Signal Name CONN - * USART1_TX PB6 GPS_USART1_TX JP1-15,16 - * USART1_RX PB7 GPS_USART1_RX JP1-13,14 - * USART2_TX PA2 GB_USART2_TX JP2-19,20 - * USART2_RX PA3 GB_USART2_RX JP2-21,22 - * USART3_TX PC10 RF2_USART3_TX J3-2 - * USART3_RX PC11 RF2_USART3_RX J3-1 - * USART6_TX PC6 RF_USART6_TX JP2-15,16 - * USART6_RX PC7 RF_USART6_RX JP2-17,18 -*/ - -// ESC -#define GPIO_USART1_TX GPIO_USART1_TX_2 -#define GPIO_USART1_RX GPIO_USART1_RX_2 - -// Companion -#define GPIO_USART2_TX GPIO_USART2_TX_1 -#define GPIO_USART2_RX GPIO_USART2_RX_1 -#define GPIO_USART2_CTS 0 // unused -#define GPIO_USART2_RTS 0 // unused - -// GPS -#define GPIO_UART7_TX GPIO_UART7_TX_1 -#define GPIO_UART7_RX GPIO_UART7_RX_1 -#define GPIO_UART7_CTS 0 // unused -#define GPIO_UART7_RTS 0 // unused - -// RC -#define GPIO_UART4_TX GPIO_UART4_TX_1 -#define GPIO_UART4_RX GPIO_UART4_RX_1 -#define GPIO_UART4_CTS 0 // unused -#define GPIO_UART4_RTS 0 // unused - -// Mavlink -// UART5 - -// Serial console -#define GPIO_USART6_TX GPIO_USART6_TX_1 -#define GPIO_USART6_RX GPIO_USART6_RX_1 - -/* - * I2C - * - * Peripheral Port Signal Name CONN - * I2C1_SDA PB9 I2C1_SDA J2-4,9,16,21 mpu6050, U4 MS6507 - * I2C1_SDL PB8 I2C1_SCL J2-3,10,15,22 mpu6050, U4 MS6507 - * I2C2_SDA PB11 Sonar Echo/I2C_SDA JP2-31,32 - * I2C2_SDL PB10 Sonar Trig/I2C_SCL JP2-29,30 - * I2C3_SDA PC9 COMPASS_I2C3_SDA JP1-27,28 - * I2C3_SDL PA8 COMPASS_I2C3_SCL JP1-25,26 - * - * The optional _GPIO configurations allow the I2C driver to manually - * reset the bus to clear stuck slaves. They match the pin configuration, - * but are normally-high GPIOs. - */ -#define GPIO_I2C1_SDA GPIO_I2C1_SDA_2 -#define GPIO_I2C1_SCL GPIO_I2C1_SCL_2 - -#define GPIO_I2C2_SDA GPIO_I2C2_SDA_1 -#define GPIO_I2C2_SCL GPIO_I2C2_SCL_1 - -#define GPIO_I2C3_SDA GPIO_I2C3_SDA_1 -#define GPIO_I2C3_SCL GPIO_I2C3_SCL_1 - -/* - * SPI - * - * Peripheral Port Signal Name CONN - * SPI2_NSS PB12 SD_SPI2_NSS SD-2 CS - * TBD - * - */ - -#define GPIO_SPI1_NSS (GPIO_SPI1_NSS_2 | GPIO_SPEED_50MHz) -#define GPIO_SPI1_SCK (GPIO_SPI1_SCK_1 | GPIO_SPEED_50MHz) -#define GPIO_SPI1_MISO (GPIO_SPI1_MISO_1 | GPIO_SPEED_50MHz) -#define GPIO_SPI1_MOSI (GPIO_SPI1_MOSI_1 | GPIO_SPEED_50MHz) - -/* The following Pin Mapping is just for completeness */ -/* - * JTAG - * - * We will only enable SW-DP, JTAG-DP will be disabled - * - * Function Port Signal Name CONN - * SWDIO PA13 DAT J10-3,J7 - * SWCLK PA14 CLK J10-4,J8 - * - */ - -/* - * BOOT - * - * Function Port Signal Name CONN - * BOOT0 NA BOOT0 GND via 10 K - * BOOT1 PB2 BOOT1 V3.3 - 10 K - * - * As jumpered the device can only boot from FLASH. - * - * It can be booted to: - * - * SRAM if BOOT0 is pulled High with 1K. - * System memory if: - * BOOT0 is pulled High with 1K and - * BOOT1 is pulled Low with 1K -*/ - -/* - * Timer PWM - * - * Peripheral Port Signal Name CONN - * TIM3_CH1 PA6 LED_R JP2-23,24 - * TIM3_CH2 PA7 LED_G JP2-25,26 - * TIM3_CH3 PB0 LED_B JP2-27,28 - * TIM3_CH4 PB1 nPWM_1 AUX1(Landing Gear) JP1-21,22 - */ - -/* - * GPIO - * - * Port Signal Name CONN - * PA4 POWER JP1-23, - Must be held High to run w/o USB - * PB4 TEMP_CONT J2-2,11,14,23 - Gyro Heater - * PC0 VOLTAGE JP2-13,14 - 1.84 @16.66 1.67 @15.12 Scale 0.1105 - * PC1 KEY_AD JP1-31,32 - Low when Power button is depressed - * PC2 SD_SW SD-9 SW - Card Present - * PC3 PCON_RADIO JP1-29,30 - * PC13 S2 U8-9 74HCT151 - * PC14 S1 U8-10 74HCT151 - * PC15 S0 U8-11 74HCT151 - */ - -/* - * USB - * - * Port Signal Name CONN - * PA9 OTG_FS_VBUS J1-1 - * PA10 OTG_FS_ID J1-4 - * PA11 OTG_FS_DM J1-2 - * PA12 OTG_FS_DP J1-3 - */ - -/* - * UNUSED PINS - In an idle world - these would have been tied to pads to - * facilitate debugging probs. - * Port - * PA15 - * PB3 - * PB5 - * PC8 -*/ - -/* Board provides GPIO or other Hardware for signaling to timing analyzer */ - -#if defined(CONFIG_BOARD_USE_PROBES) -# define PROBE_N(n) (1<<((n)-1)) -# define PROBE_1 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN15) -# define PROBE_2 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN3) -# define PROBE_3 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN5) -# define PROBE_4 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN8) - -# define PROBE_INIT(mask) \ - do { \ - if ((mask)& PROBE_N(1)) { stm32_configgpio(PROBE_1); } \ - if ((mask)& PROBE_N(2)) { stm32_configgpio(PROBE_2); } \ - if ((mask)& PROBE_N(3)) { stm32_configgpio(PROBE_3); } \ - if ((mask)& PROBE_N(4)) { stm32_configgpio(PROBE_4); } \ - } while(0) - -# define PROBE(n,s) do {stm32_gpiowrite(PROBE_##n,(s));}while(0) -# define PROBE_MARK(n) PROBE(n,false);PROBE(n,true) -#else -# define PROBE_INIT(mask) -# define PROBE(n,s) -# define PROBE_MARK(n) -#endif - diff --git a/boards/intel/aerofc-v1/nuttx-config/include/board_dma_map.h b/boards/intel/aerofc-v1/nuttx-config/include/board_dma_map.h deleted file mode 100644 index 1d1f0e09dd..0000000000 --- a/boards/intel/aerofc-v1/nuttx-config/include/board_dma_map.h +++ /dev/null @@ -1,91 +0,0 @@ -/**************************************************************************** - * - * Copyright (c) 2020 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 - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#pragma once - -/* -| DMA1 | Stream 0 | Stream 1 | Stream 2 | Stream 3 | Stream 4 | Stream 5 | Stream 6 | Stream 7 | -|------------|------------------|------------------|------------------|------------------|------------------|------------------|------------------|------------------| -| Channel 0 | SPI3_RX_1 | - | SPI3_RX_2 | SPI2_RX | SPI2_TX | SPI3_TX_1 | - | SPI3_TX_2 | -| Channel 1 | I2C1_RX | - | TIM7_UP_1 | - | TIM7_UP_2 | I2C1_RX_1 | I2C1_TX | I2C1_TX_1 | -| Channel 2 | TIM4_CH1 | - | I2C4_RX | TIM4_CH2 | - | I2C4_RX | TIM4_UP | TIM4_CH3 | -| Channel 3 | - | TIM2_UP_1 | I2C3_RX_1 | I2C2_EXT_RX | I2C3_TX | TIM2_CH1 | TIM2_CH2 | TIM2_UP_2 | -| | | TIM2_CH3 | | | | | TIM2_CH4_1 | TIM2_CH4_2 | -| Channel 4 | UART5_RX | USART3_RX | UART4_RX | USART3_TX_1 | UART4_TX | USART2_RX | USART2_TX | UART5_TX | -| Channel 5 | UART8_TX | UART7_TX | TIM3_CH4 | UART7_RX | TIM3_CH1 | TIM3_CH2 | UART8_RX | TIM3_CH3 | -| | | | TIM3_UP | | TIM3_TRIG | | | | -| Channel 6 | TIM5_CH3 | TIM5_CH4_1 | TIM5_CH1 | TIM5_CH4_2 | TIM5_CH2 | - | TIM5_UP_2 | - | -| | TIM5_UP_1 | TIM5_TRIG_1 | | TIM5_TRIG_2 | | | | | -| Channel 7 | - | TIM6_UP | I2C2_RX | I2C2_RX_1 | USART3_TX_2 | DAC1 | DAC2 | I2C2_TX | -| | | | | | | | | | -| Usage | | | | | | | | | - - -| DMA2 | Stream 0 | Stream 1 | Stream 2 | Stream 3 | Stream 4 | Stream 5 | Stream 6 | Stream 7 | -|------------|------------------|------------------|------------------|------------------|------------------|------------------|------------------|------------------| -| Channel 0 | ADC1_1 | SAI1_A | TIM8_CH1_1 | SAI1_A_1 | ADC1_2 | SAI1_B_1 | TIM1_CH1_1 | - | -| | | | TIM8_CH2_1 | | | | TIM1_CH2_1 | | -| | | | TIM8_CH3_1 | | | | TIM1_CH3_1 | | -| Channel 1 | - | DCMI_1 | ADC2_1 | ADC2_2 | SAI1_B | SPI6_TX | SPI6_RX | DCMI_2 | -| Channel 2 | ADC3_1 | ADC3_2 | - | SPI5_RX_1 | SPI5_TX_1 | CRYP_OUT | CRYP_IN | HASH_IN | -| Channel 3 | SPI1_RX_1 | - | SPI1_RX_2 | SPI1_TX_1 | - | SPI1_TX_2 | - | QUADSPI | -| Channel 4 | SPI4_RX_1 | SPI4_TX_1 | USART1_RX_1 | SDIO | - | USART1_RX_2 | SDIO | USART1_TX | -| Channel 5 | - | USART6_RX_1 | USART6_RX_2 | SPI4_RX_2 | SPI4_TX_2 | - | USART6_TX_1 | USART6_TX_2 | -| Channel 6 | TIM1_TRIG_1 | TIM1_CH1_2 | TIM1_CH2_2 | TIM1_CH1 | TIM1_CH4 | TIM1_UP | TIM1_CH3_2 | - | -| | | | | | TIM1_TRIG_2 | | | | -| | | | | | TIM1_COM | | | | -| Channel 7 | - | TIM8_UP | TIM8_CH1_2 | TIM8_CH2_2 | TIM8_CH3_2 | SPI5_RX_2 | SPI5_TX_2 | TIM8_CH4 | -| | | | | | | | | TIM8_TRIG | -| | | | | | | | | TIM8_COM | -| | | | | | | | | | -| Usage | SPI1_RX_1 | USART6_RX_1 | USART1_RX_1 | SPI1_TX_1 | | | | | - */ - -// DMA1 Channel/Stream Selections -//--------------------------------------------//---------------------------//---------------- -// DMAMAP_UART5_RX // DMA1, Stream 0, Channel 4 -// AVAILABLE // DMA1, Stream 1 -// DMAMAP_UART4_RX // DMA1, Stream 2, Channel 4 -// DMAMAP_UART7_RX // DMA1, Stream 3, Channel 5 -// AVAILABLE // DMA1, Stream 4 -// DMAMAP_USART2_RX // DMA1, Stream 5, Channel 4 - - -// DMA2 Channel/Stream Selections -//--------------------------------------------//---------------------------//---------------- -#define DMACHAN_SPI1_RX DMAMAP_SPI1_RX_1 // DMA2, Stream 0, Channel 3 (SPI sensors RX) -#define DMAMAP_USART6_RX DMAMAP_USART6_RX_1 // DMA2, Stream 1, Channel 4 (CONSOLE) -#define DMAMAP_USART1_RX DMAMAP_USART1_RX_1 // DMA2, Stream 2, Channel 4 -#define DMACHAN_SPI1_TX DMAMAP_SPI1_TX_1 // DMA2, Stream 3, Channel 3 (SPI sensors TX) -// AVAILABLE // DMA2, Stream 4 -// AVAILABLE // DMA2, Stream 5 diff --git a/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig b/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig deleted file mode 100644 index 08a325f04a..0000000000 --- a/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig +++ /dev/null @@ -1,197 +0,0 @@ -# -# This file is autogenerated: PLEASE DO NOT EDIT IT. -# -# You can use "make menuconfig" to make any modifications to the installed .config file. -# You can then do "make savedefconfig" to generate a new defconfig file that includes your -# modifications. -# -# CONFIG_DISABLE_ENVIRON is not set -# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set -# CONFIG_FSUTILS_MKFATFS is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set -# CONFIG_NSH_DISABLE_DF is not set -# CONFIG_NSH_DISABLE_EXEC is not set -# CONFIG_NSH_DISABLE_EXIT is not set -# CONFIG_NSH_DISABLE_GET is not set -# CONFIG_NSH_DISABLE_ITEF is not set -# CONFIG_NSH_DISABLE_LOOPS is not set -# CONFIG_NSH_DISABLE_SEMICOLON is not set -# CONFIG_NSH_DISABLE_TIME is not set -# CONFIG_STM32_CCMEXCLUDE is not set -CONFIG_ARCH="arm" -CONFIG_ARCH_BOARD_CUSTOM=y -CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config" -CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y -CONFIG_ARCH_BOARD_CUSTOM_NAME="px4" -CONFIG_ARCH_CHIP="stm32" -CONFIG_ARCH_CHIP_STM32=y -CONFIG_ARCH_CHIP_STM32F429V=y -CONFIG_ARCH_INTERRUPTSTACK=512 -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARMV7M_MEMCPY=y -CONFIG_ARMV7M_USEBASEPRI=y -CONFIG_BOARDCTL_RESET=y -CONFIG_BOARD_LOOPSPERMSEC=16717 -CONFIG_BOARD_RESET_ON_ASSERT=2 -CONFIG_BUILTIN=y -CONFIG_C99_BOOL8=y -CONFIG_CLOCK_MONOTONIC=y -CONFIG_DEBUG_FULLOPT=y -CONFIG_DEBUG_HARDFAULT_ALERT=y -CONFIG_DEBUG_SYMBOLS=y -CONFIG_DEFAULT_SMALL=y -CONFIG_DEV_FIFO_SIZE=0 -CONFIG_DEV_PIPE_MAXSIZE=1024 -CONFIG_DEV_PIPE_SIZE=70 -CONFIG_FAT_LCNAMES=y -CONFIG_FAT_LFN=y -CONFIG_FAT_LFN_ALIAS_HASH=y -CONFIG_FDCLONE_STDIO=y -CONFIG_FS_BINFS=y -CONFIG_FS_CROMFS=y -CONFIG_FS_FAT=y -CONFIG_FS_FATTIME=y -CONFIG_FS_PROCFS=y -CONFIG_FS_PROCFS_EXCLUDE_BLOCKS=y -CONFIG_FS_PROCFS_EXCLUDE_MOUNT=y -CONFIG_FS_PROCFS_EXCLUDE_MOUNTS=y -CONFIG_FS_PROCFS_EXCLUDE_PARTITIONS=y -CONFIG_FS_PROCFS_EXCLUDE_USAGE=y -CONFIG_FS_PROCFS_REGISTER=y -CONFIG_FS_ROMFS=y -CONFIG_GRAN=y -CONFIG_GRAN_INTR=y -CONFIG_HAVE_CXX=y -CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_I2C=y -CONFIG_I2C_RESET=y -CONFIG_IDLETHREAD_STACKSIZE=750 -CONFIG_LIBC_FLOATINGPOINT=y -CONFIG_LIBC_LONG_LONG=y -CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y -CONFIG_MM_REGIONS=2 -CONFIG_MTD=y -CONFIG_MTD_BYTE_WRITE=y -CONFIG_MTD_PARTITION=y -CONFIG_NFILE_DESCRIPTORS=12 -CONFIG_NSH_ARCHINIT=y -CONFIG_NSH_ARCHROMFS=y -CONFIG_NSH_ARGCAT=y -CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_CMDPARMS=y -CONFIG_NSH_CROMFSETC=y -CONFIG_NSH_DISABLE_IFCONFIG=y -CONFIG_NSH_DISABLE_IFUPDOWN=y -CONFIG_NSH_DISABLE_MB=y -CONFIG_NSH_DISABLE_MH=y -CONFIG_NSH_DISABLE_TELNETD=y -CONFIG_NSH_LINELEN=128 -CONFIG_NSH_MAXARGUMENTS=15 -CONFIG_NSH_NESTDEPTH=8 -CONFIG_NSH_QUOTE=y -CONFIG_NSH_ROMFSETC=y -CONFIG_NSH_ROMFSSECTSIZE=128 -CONFIG_NSH_STRERROR=y -CONFIG_NSH_VARS=y -CONFIG_PIPES=y -CONFIG_PREALLOC_TIMERS=50 -CONFIG_PRIORITY_INHERITANCE=y -CONFIG_PTHREAD_MUTEX_ROBUST=y -CONFIG_PTHREAD_STACK_MIN=512 -CONFIG_RAM_SIZE=262144 -CONFIG_RAM_START=0x20000000 -CONFIG_RAW_BINARY=y -CONFIG_RTC_DATETIME=y -CONFIG_SCHED_ATEXIT=y -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_HPWORKPRIORITY=249 -CONFIG_SCHED_HPWORKSTACKSIZE=1280 -CONFIG_SCHED_INSTRUMENTATION=y -CONFIG_SCHED_INSTRUMENTATION_EXTERNAL=y -CONFIG_SCHED_LPWORK=y -CONFIG_SCHED_LPWORKPRIORITY=50 -CONFIG_SCHED_LPWORKSTACKSIZE=1632 -CONFIG_SCHED_WAITPID=y -CONFIG_SDCLONE_DISABLE=y -CONFIG_SEM_NNESTPRIO=8 -CONFIG_SEM_PREALLOCHOLDERS=0 -CONFIG_SERIAL_TERMIOS=y -CONFIG_SIG_DEFAULT=y -CONFIG_SIG_SIGALRM_ACTION=y -CONFIG_SIG_SIGUSR1_ACTION=y -CONFIG_SIG_SIGUSR2_ACTION=y -CONFIG_SIG_SIGWORK=4 -CONFIG_STACK_COLORATION=y -CONFIG_START_DAY=30 -CONFIG_START_MONTH=11 -CONFIG_STDIO_BUFFER_SIZE=32 -CONFIG_STM32_BBSRAM_FILES=5 -CONFIG_STM32_BKPSRAM=y -CONFIG_STM32_CCMDATARAM=y -CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y -CONFIG_STM32_DMA1=y -CONFIG_STM32_DMA2=y -CONFIG_STM32_FLASH_CONFIG_I=y -CONFIG_STM32_FLASH_WORKAROUND_DATA_CACHE_CORRUPTION_ON_RWW=y -CONFIG_STM32_FLOWCONTROL_BROKEN=y -CONFIG_STM32_I2C1=y -CONFIG_STM32_I2C2=y -CONFIG_STM32_I2C3=y -CONFIG_STM32_I2CTIMEOMS=10 -CONFIG_STM32_I2CTIMEOTICKS=10 -CONFIG_STM32_JTAG_SW_ENABLE=y -CONFIG_STM32_OTGFS=y -CONFIG_STM32_PWR=y -CONFIG_STM32_RTC=y -CONFIG_STM32_RTC_HSECLOCK=y -CONFIG_STM32_RTC_MAGIC_REG=1 -CONFIG_STM32_SERIALBRK_BSDCOMPAT=y -CONFIG_STM32_SERIAL_DISABLE_REORDERING=y -CONFIG_STM32_SPI1=y -CONFIG_STM32_SPI1_DMA=y -CONFIG_STM32_SPI1_DMA_BUFFER=1024 -CONFIG_STM32_SPI_DMA=y -CONFIG_STM32_SPI_DMATHRESHOLD=8 -CONFIG_STM32_TIM10=y -CONFIG_STM32_TIM11=y -CONFIG_STM32_TIM1=y -CONFIG_STM32_TIM8=y -CONFIG_STM32_TIM9=y -CONFIG_STM32_UART4=y -CONFIG_STM32_UART5=y -CONFIG_STM32_UART7=y -CONFIG_STM32_USART1=y -CONFIG_STM32_USART2=y -CONFIG_STM32_USART6=y -CONFIG_STM32_USART_BREAKS=y -CONFIG_STM32_USART_SINGLEWIRE=y -CONFIG_STM32_WWDG=y -CONFIG_SYSTEM_NSH=y -CONFIG_TASK_NAME_SIZE=24 -CONFIG_UART4_BAUD=57600 -CONFIG_UART4_RXBUFSIZE=300 -CONFIG_UART4_RXDMA=y -CONFIG_UART4_TXBUFSIZE=300 -CONFIG_UART5_RXDMA=y -CONFIG_UART7_BAUD=57600 -CONFIG_UART7_RXBUFSIZE=300 -CONFIG_UART7_RXDMA=y -CONFIG_UART7_TXBUFSIZE=300 -CONFIG_USART1_RXBUFSIZE=600 -CONFIG_USART1_RXDMA=y -CONFIG_USART1_TXBUFSIZE=2500 -CONFIG_USART2_BAUD=57600 -CONFIG_USART2_RXBUFSIZE=600 -CONFIG_USART2_RXDMA=y -CONFIG_USART2_TXBUFSIZE=1100 -CONFIG_USART6_BAUD=57600 -CONFIG_USART6_RXBUFSIZE=300 -CONFIG_USART6_RXDMA=y -CONFIG_USART6_SERIAL_CONSOLE=y -CONFIG_USART6_TXBUFSIZE=300 -CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2944 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/intel/aerofc-v1/nuttx-config/scripts/script.ld b/boards/intel/aerofc-v1/nuttx-config/scripts/script.ld deleted file mode 100644 index 41f3e87f83..0000000000 --- a/boards/intel/aerofc-v1/nuttx-config/scripts/script.ld +++ /dev/null @@ -1,139 +0,0 @@ -/**************************************************************************** - * configs/aerofc-v1/scripts/ld.script - * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/* The STM32F405RG has 1024Kb of FLASH beginning at address 0x0800:0000 and - * 192Kb of SRAM. SRAM is split up into three blocks: - * - * 1) 112Kb of SRAM beginning at address 0x2000:0000 - * 2) 16Kb of SRAM beginning at address 0x2001:c000 - * 3) 64Kb of CCM SRAM beginning at address 0x1000:0000 - * - * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000 - * where the code expects to begin execution by jumping to the entry point in - * the 0x0800:0000 address range. - * - * The first 16 KiB of flash is reserved for the bootloader. - * Paramater storage will use the next 2 16KiB Sectors. - */ - -MEMORY -{ - flash (rx) : ORIGIN = 0x0800C000, LENGTH = 976K - sram (rwx) : ORIGIN = 0x20000000, LENGTH = 128K - ccsram (rwx) : ORIGIN = 0x10000000, LENGTH = 64K -} - -OUTPUT_ARCH(arm) - -ENTRY(__start) /* treat __start as the anchor for dead code stripping */ -EXTERN(_vectors) /* force the vectors to be included in the output */ - -/* - * Ensure that abort() is present in the final object. The exception handling - * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). - */ -EXTERN(abort) -EXTERN(board_get_manifest) - -SECTIONS -{ - .text : { - _stext = ABSOLUTE(.); - *(.vectors) - *(.text .text.*) - *(.fixup) - *(.gnu.warning) - *(.rodata .rodata.*) - *(.gnu.linkonce.t.*) - *(.got) - *(.gcc_except_table) - *(.gnu.linkonce.r.*) - _etext = ABSOLUTE(.); - - } > flash - - /* - * Init functions (static constructors and the like) - */ - .init_section : { - _sinit = ABSOLUTE(.); - KEEP(*(.init_array .init_array.*)) - _einit = ABSOLUTE(.); - } > flash - - - .ARM.extab : { - *(.ARM.extab*) - } > flash - - __exidx_start = ABSOLUTE(.); - .ARM.exidx : { - *(.ARM.exidx*) - } > flash - __exidx_end = ABSOLUTE(.); - - _eronly = ABSOLUTE(.); - - .data : { - _sdata = ABSOLUTE(.); - *(.data .data.*) - *(.gnu.linkonce.d.*) - CONSTRUCTORS - _edata = ABSOLUTE(.); - } > sram AT > flash - - .bss : { - _sbss = ABSOLUTE(.); - *(.bss .bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - . = ALIGN(4); - _ebss = ABSOLUTE(.); - } > sram - - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_info 0 : { *(.debug_info) } - .debug_line 0 : { *(.debug_line) } - .debug_pubnames 0 : { *(.debug_pubnames) } - .debug_aranges 0 : { *(.debug_aranges) } -} diff --git a/boards/intel/aerofc-v1/scripts/aero_upload.sh b/boards/intel/aerofc-v1/scripts/aero_upload.sh deleted file mode 100755 index d63e27f302..0000000000 --- a/boards/intel/aerofc-v1/scripts/aero_upload.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash -############################################################################ -# -# Copyright (C) 2016 Intel Corporation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name PX4 nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ - -set -e - -USER=${AERO_USER:-root} -HOSTNAME=${AERO_HOSTNAME:-intel-aero.local} -SCRIPT_DIR=$(dirname $(realpath ${BASH_SOURCE[0]})) - -target=$USER@$HOSTNAME -firmware=$1 -px_uploader=${SCRIPT_DIR}/px_uploader.py - -echo "Copying files to Aero board ($target)..." -scp $firmware $px_uploader $target: - -ssh $target /bin/bash < -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name PX4 nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ - -add_library(drivers_board - i2c.cpp - init.c - led.c - mtd.cpp - spi.cpp - timer_config.cpp -) -target_link_libraries(drivers_board - PRIVATE - arch_spi - drivers__led # drv_led_start - px4_layer - modules__dataman # dm_flash_sector_description_set # TODO: fix this -) diff --git a/boards/intel/aerofc-v1/src/board_config.h b/boards/intel/aerofc-v1/src/board_config.h deleted file mode 100644 index ea265027ce..0000000000 --- a/boards/intel/aerofc-v1/src/board_config.h +++ /dev/null @@ -1,168 +0,0 @@ -/**************************************************************************** - * - * Copyright (c) 2012-2016 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 - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file board_config.h - * - * @author David Sidrane - * @author Lorenz Meier - * - * AEROFC_V1 internal definitions - */ - -#pragma once - -/**************************************************************************************************** - * Included Files - ****************************************************************************************************/ - -#include -#include -#include - -/**************************************************************************************************** - * Definitions - ****************************************************************************************************/ -/* Configuration ************************************************************************************/ - -/* PX4FMU GPIOs ***********************************************************************************/ -/* LEDs */ -#define GPIO_LED0 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN9) -#define GPIO_LED1 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN10) -#define GPIO_LED2 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN11) -#define GPIO_LED3 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN12) - -#define BOARD_HAS_CONTROL_STATUS_LEDS 1 -#define BOARD_OVERLOAD_LED LED_RED -#define BOARD_ARMED_LED LED_BLUE -#define BOARD_ARMED_STATE_LED LED_GREEN - -#define GPIO_VDD_5V_SENSORS_EN (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|GPIO_OUTPUT_SET|GPIO_PORTD|GPIO_PIN13) - -#define GPIO_FORCE_BOOTLOADER (GPIO_INPUT|GPIO_PULLDOWN|GPIO_SPEED_50MHz|GPIO_PORTA|GPIO_PIN11|GPIO_EXTI) - -#define PX4_I2C_BUS_MTD 3 - -/* - * STM32 ADC channels - * - * These are the channel numbers of the ADCs of the microcontroller that can - * be used by the PX4 Firmware in the adc driver - */ -#define ADC_CHANNELS 0 - -/* - * ADC channels: these use the ADC block implemented in the FPGA. There are 5 - * channels in the FPGA, but only 1 is phisically connected, that's dedicated - * for voltage reading. - */ -#define ADC_BATTERY_VOLTAGE_CHANNEL 1 -#define ADC_BATTERY_CURRENT_CHANNEL ((uint8_t)(-1)) - -/* - * Define Battery 1 Voltage Divider, using default for A/V - */ -#define BOARD_BATTERY1_V_DIV (9.0f) - -#define DIRECT_PWM_OUTPUT_CHANNELS 1 -#define BOARD_HAS_PWM 0 - -/* - * USB OTG FS - */ - -/* - * RC Serial port - */ -#define RC_SERIAL_PORT "/dev/ttyS2" /* No HW invert support */ -/* - * High-resolution timer - */ -#define HRT_TIMER 3 /* use timer3 for the HRT */ -#define HRT_TIMER_CHANNEL 4 /* use capture/compare channel */ - -#define FLASH_BASED_PARAMS -#define FLASH_BASED_DATAMAN - -/* - * ESCs do not respond - */ -#define BOARD_TAP_ESC_MODE 1 - -#define MEMORY_CONSTRAINED_SYSTEM - -#define BOARD_CRASHDUMP_RESET_ONLY - -__BEGIN_DECLS - -/**************************************************************************************************** - * Public Types - ****************************************************************************************************/ - -/**************************************************************************************************** - * Public data - ****************************************************************************************************/ - -#ifndef __ASSEMBLY__ - -/**************************************************************************************************** - * Public Functions - ****************************************************************************************************/ - -/**************************************************************************************************** - * Name: stm32_spiinitialize - * - * Description: - * Called to configure SPI chip select GPIO pins for the PX4FMU board. - * - ****************************************************************************************************/ - -extern void stm32_spiinitialize(void); - -#define board_peripheral_reset(ms) - -/************************************************************************************ - * Name: board_sdio_initialize - * - * Description: - * Called to configure SDIO. - * - ************************************************************************************/ - -extern int board_sdio_initialize(void); - -#include - -#endif /* __ASSEMBLY__ */ - -__END_DECLS diff --git a/boards/intel/aerofc-v1/src/i2c.cpp b/boards/intel/aerofc-v1/src/i2c.cpp deleted file mode 100644 index a79588da46..0000000000 --- a/boards/intel/aerofc-v1/src/i2c.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2020 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 - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#include - -constexpr px4_i2c_bus_t px4_i2c_buses[I2C_BUS_MAX_BUS_ITEMS] = { - initI2CBusExternal(1), - initI2CBusExternal(2), - initI2CBusInternal(3), -}; diff --git a/boards/intel/aerofc-v1/src/init.c b/boards/intel/aerofc-v1/src/init.c deleted file mode 100644 index 4033b8d62f..0000000000 --- a/boards/intel/aerofc-v1/src/init.c +++ /dev/null @@ -1,227 +0,0 @@ -/**************************************************************************** - * - * Copyright (c) 2012-2016 PX4 Development Team. All rights reserved. - * Author: David Sidrane - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file aerofc-v1_init.c - * - * aerofc-specific early startup code. This file implements the - * board_app_initialize() function that is called early by nsh during startup. - * - * Code here is run before the rcS script is invoked; it should start required - * subsystems and perform board-specific initialization. - */ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#include "board_config.h" -#include "stm32_uart.h" - -#include - -#include -#include - -#include - -#include -#include - -# if defined(FLASH_BASED_PARAMS) -# include -#endif - -/**************************************************************************** - * Pre-Processor Definitions - ****************************************************************************/ - -/* - * Ideally we'd be able to get these from arm_internal.h, - * but since we want to be able to disable the NuttX use - * of leds for system indication at will and there is no - * separate switch, we need to build independent of the - * CONFIG_ARCH_LEDS configuration switch. - */ -__BEGIN_DECLS -extern void led_init(void); -extern void led_on(int led); -extern void led_off(int led); -__END_DECLS - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - -static int _bootloader_force_pin_callback(int irq, void *context, void *args) -{ - if (stm32_gpioread(GPIO_FORCE_BOOTLOADER)) { - board_reset(0); - } - - return 0; -} - -/**************************************************************************** - * Protected Functions - ****************************************************************************/ - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/************************************************************************************ - * Name: stm32_boardinitialize - * - * Description: - * All STM32 architectures must provide the following entry point. This entry point - * is called early in the initialization -- after all memory has been configured - * and mapped but before any devices have been initialized. - * - ************************************************************************************/ - -__EXPORT void stm32_boardinitialize(void) -{ - stm32_configgpio(GPIO_FORCE_BOOTLOADER); - _bootloader_force_pin_callback(0, NULL, NULL); - - /* configure LEDs */ - board_autoled_initialize(); - - /* turn sensors on */ - stm32_configgpio(GPIO_VDD_5V_SENSORS_EN); - - /* configure SPI interfaces */ - stm32_spiinitialize(); - -} - -/**************************************************************************** - * Name: board_app_initialize - * - * Description: - * Perform architecture specific initialization - * - ****************************************************************************/ - -__EXPORT int board_app_initialize(uintptr_t arg) -{ - int result; - - /* the interruption subsystem is not initialized when stm32_boardinitialize() is called */ - stm32_gpiosetevent(GPIO_FORCE_BOOTLOADER, true, false, false, _bootloader_force_pin_callback, NULL); - - px4_platform_init(); - - /* set up the serial DMA polling */ - static struct hrt_call serial_dma_call; - struct timespec ts; - - /* - * Poll at 1ms intervals for received bytes that have not triggered - * a DMA event. - */ - ts.tv_sec = 0; - ts.tv_nsec = 1000000; - - hrt_call_every(&serial_dma_call, - ts_to_abstime(&ts), - ts_to_abstime(&ts), - (hrt_callout)stm32_serial_dma_poll, - NULL); - - - /* initial LED state */ - drv_led_start(); - led_off(LED_AMBER); - led_off(LED_BLUE); - - /* - * Bootloader(sector 0): - * start: 0x08000000, len: 16K, end: 0x08003E80 - * - * FlashFS(sector 1 and 2): - * start: 0x08004000, len: 32K, end: 0x0800BFFF - * - * Firmware(sector 3 to 11): - * start: 0x0800C000, len: 976K, end: 0x080FFFFF - * - * Dataman(sector 23): - * start: 0x081E0000, len: 128K, end: 0x08200000 - * - * First 1MB memory bank complete assigned. - * Second 1MB memory bank is mostly empty. - */ - -#if defined(FLASH_BASED_PARAMS) - static sector_descriptor_t params_sector_map[] = { - {1, 16 * 1024, 0x08004000}, - {2, 16 * 1024, 0x08008000}, - {0, 0, 0}, - }; - - /* Initialize the flashfs layer to use heap allocated memory */ - result = parameter_flashfs_init(params_sector_map, NULL, 0); - - if (result != OK) { - syslog(LOG_ERR, "[boot] FAILED to init params in FLASH %d\n", result); - led_on(LED_AMBER); - return -ENODEV; - } - -#endif - -#if defined(FLASH_BASED_DATAMAN) - static dm_sector_descriptor_t dm_sector_map = {23, 128 * 1024, 0x081E0000}; - dm_flash_sector_description_set(&dm_sector_map); -#endif - - /* Configure the HW based on the manifest */ - - px4_platform_configure(); - - return OK; -} diff --git a/boards/intel/aerofc-v1/src/led.c b/boards/intel/aerofc-v1/src/led.c deleted file mode 100644 index 30fb9dd9b0..0000000000 --- a/boards/intel/aerofc-v1/src/led.c +++ /dev/null @@ -1,119 +0,0 @@ -/**************************************************************************** - * - * Copyright (c) 2012-2016 PX4 Development Team. All rights reserved. - * Author: David Sidrane - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file led.c - * - * AEROFC_V1 LED backend. - */ - -#include - -#include - -#include "stm32.h" -#include "board_config.h" - -#include - -/* - * Ideally we'd be able to get these from arm_internal.h, - * but since we want to be able to disable the NuttX use - * of leds for system indication at will and there is no - * separate switch, we need to build independent of the - * CONFIG_ARCH_LEDS configuration switch. - */ -__BEGIN_DECLS -extern void led_init(void); -extern void led_on(int led); -extern void led_off(int led); -extern void led_toggle(int led); -__END_DECLS - -__EXPORT void led_init(void) -{ - /* Configure LED0-3 GPIOs for output */ - - stm32_configgpio(GPIO_LED0); - stm32_configgpio(GPIO_LED1); - stm32_configgpio(GPIO_LED2); - stm32_configgpio(GPIO_LED3); -} - -static uint32_t _led_param_get(int led) -{ - switch (led) { - case 0: - return GPIO_LED0; // LED_BLUE - - case 1: - return GPIO_LED1; // LED_RED - - case 2: - return GPIO_LED2; // LED SAFETY - - case 3: - return GPIO_LED3; // LED GREEN - - } - - return 0; -} - -__EXPORT void led_on(int led) -{ - const uint32_t param = _led_param_get(led); - - if (param) { - stm32_gpiowrite(param, false); - } -} - -__EXPORT void led_off(int led) -{ - const uint32_t param = _led_param_get(led); - - if (param) { - stm32_gpiowrite(param, true); - } -} - -__EXPORT void led_toggle(int led) -{ - const uint32_t param = _led_param_get(led); - - if (param) { - stm32_gpiowrite(param, !stm32_gpioread(param)); - } -} diff --git a/boards/intel/aerofc-v1/src/mtd.cpp b/boards/intel/aerofc-v1/src/mtd.cpp deleted file mode 100644 index 769a084a2b..0000000000 --- a/boards/intel/aerofc-v1/src/mtd.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2020 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 - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#include -#include -// KiB BS nB -static const px4_mft_device_t i2c3 = { // 24AA64FT on Base 8K 32 X 256 - .bus_type = px4_mft_device_t::I2C, - .devid = PX4_MK_I2C_DEVID(3, 0x50) -}; - - -static const px4_mtd_entry_t fmu_eeprom = { - .device = &i2c3, - .npart = 2, - .partd = { - { - .type = MTD_PARAMETERS, - .path = "/fs/mtd_params", - .nblocks = 128 - }, - { - .type = MTD_WAYPOINTS, - .path = "/fs/mtd_waypoints", - .nblocks = 128 - - } - }, -}; - -static const px4_mtd_manifest_t board_mtd_config = { - .nconfigs = 1, - .entries = { - &fmu_eeprom, - } -}; - -static const px4_mft_entry_s mtd_mft = { - .type = MTD, - .pmft = (void *) &board_mtd_config, -}; - -static const px4_mft_s mft = { - .nmft = 1, - .mfts = &mtd_mft -}; - -const px4_mft_s *board_get_manifest(void) -{ - return &mft; -} diff --git a/boards/intel/aerofc-v1/src/spi.cpp b/boards/intel/aerofc-v1/src/spi.cpp deleted file mode 100644 index f90caac916..0000000000 --- a/boards/intel/aerofc-v1/src/spi.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/**************************************************************************** - * - * Copyright (c) 2012-2016 PX4 Development Team. All rights reserved. - * Author: David Sidrane - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#include -#include -#include - -constexpr px4_spi_bus_t px4_spi_buses[SPI_BUS_MAX_BUS_ITEMS] = { - initSPIBus(SPI::Bus::SPI1, { - initSPIDevice(DRV_IMU_DEVTYPE_MPU9250, SPI::CS{GPIO::PortA, GPIO::Pin4}), - }), -}; - -static constexpr bool unused = validateSPIConfig(px4_spi_buses); diff --git a/boards/intel/aerofc-v1/src/timer_config.cpp b/boards/intel/aerofc-v1/src/timer_config.cpp deleted file mode 100644 index b4e7278c10..0000000000 --- a/boards/intel/aerofc-v1/src/timer_config.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** - * - * Copyright (c) 2012-2016 PX4 Development Team. All rights reserved. - * Author: David Sidrane - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -#include - -// Invalidate all timers (base == 0): we don't have any -constexpr io_timers_t io_timers[MAX_IO_TIMERS] = { }; - -// Invalidate all channels (timer_channel == 0): we don't have any -constexpr timer_io_channels_t timer_io_channels[MAX_TIMER_IO_CHANNELS] = { }; - -constexpr io_timers_channel_mapping_t io_timers_channel_mapping = { }; - -// Invalidate all timers (base == 0): we don't have any -constexpr io_timers_t led_pwm_timers[MAX_LED_TIMERS] = { }; - -// Invalidate all channels (timer_channel == 0): we don't have any -constexpr timer_io_channels_t led_pwm_channels[MAX_TIMER_LED_CHANNELS] = { }; diff --git a/src/drivers/drv_sensor.h b/src/drivers/drv_sensor.h index 0e9624b90f..3ad7e1d399 100644 --- a/src/drivers/drv_sensor.h +++ b/src/drivers/drv_sensor.h @@ -114,7 +114,6 @@ #define DRV_IMU_DEVTYPE_ADIS16448 0x57 #define DRV_BARO_DEVTYPE_LPS22HB 0x58 #define DRV_IMU_DEVTYPE_ADIS16477 0x59 -#define DRV_ADC_DEVTYPE_AEROFC 0x5a #define DRV_ACC_DEVTYPE_LSM303AGR 0x61 #define DRV_MAG_DEVTYPE_LSM303AGR 0x62