Browse Source

Tools: remove more px4 remnants

master
Andrew Tridgell 6 years ago
parent
commit
b619e1e560
  1. 23
      Tools/ardupilotwaf/px4/cmake/configs/nuttx_aerofc-v1_apm.cmake
  2. 61
      Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-common_apm.cmake
  3. 11
      Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v1_apm.cmake
  4. 11
      Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v2_apm.cmake
  5. 12
      Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v3_apm.cmake
  6. 7
      Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v4_apm.cmake
  7. 11
      Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v4pro_apm.cmake
  8. 18
      Tools/bootloaders/README.md
  9. BIN
      Tools/bootloaders/px4fmu_bl.bin
  10. BIN
      Tools/bootloaders/px4fmuv2_bl.bin
  11. BIN
      Tools/bootloaders/px4fmuv2_bl.elf
  12. BIN
      Tools/bootloaders/px4fmuv4_bl.bin
  13. BIN
      Tools/bootloaders/px4fmuv4pro_bl.bin
  14. 57
      Tools/scripts/add_git_hashes.py

23
Tools/ardupilotwaf/px4/cmake/configs/nuttx_aerofc-v1_apm.cmake

@ -1,23 +0,0 @@ @@ -1,23 +0,0 @@
include(configs/nuttx_px4fmu-common_apm)
list(APPEND config_module_list
drivers/boards/aerofc-v1
drivers/aerofc_adc
lib/rc
# replace stm32 tone_alarm with a dummy one
modules/dummy
)
list(REMOVE_ITEM config_module_list
drivers/stm32/adc
drivers/stm32/tone_alarm
systemcmds/bl_update
systemcmds/mtd
systemcmds/usb_connected
systemcmds/otp
)
list(REMOVE_ITEM config_extra_builtin_cmds
sercon
)

61
Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-common_apm.cmake

@ -1,61 +0,0 @@ @@ -1,61 +0,0 @@
include(nuttx/px4_impl_nuttx)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-none-eabi.cmake)
set(config_module_list
platforms/common
platforms/nuttx
platforms/nuttx/px4_layer
modules/param
#
# Board support modules
#
drivers/device
drivers/stm32
drivers/stm32/adc
drivers/stm32/tone_alarm
drivers/led
drivers/px4fmu
#
# System commands
#
systemcmds/bl_update
systemcmds/mixer
systemcmds/perf
systemcmds/reboot
systemcmds/top
systemcmds/nshterm
systemcmds/mtd
systemcmds/ver
systemcmds/usb_connected
systemcmds/otp
#
# Library modules
#
modules/systemlib
modules/systemlib/mixer
modules/uORB
)
set(config_extra_builtin_cmds
sercon
ArduPilot
)
set(config_extra_libs
${APM_PROGRAM_LIB}
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
MAIN "sercon"
STACK "2048"
)
add_custom_target(ArduPilot)
set_target_properties(ArduPilot PROPERTIES
MAIN "ArduPilot"
STACK "4096"
)

11
Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v1_apm.cmake

@ -1,11 +0,0 @@ @@ -1,11 +0,0 @@
include(configs/nuttx_px4fmu-common_apm)
list(APPEND config_module_list
drivers/boards/px4fmu-v1
drivers/px4io
)
set(config_io_board
px4io-v1
)

11
Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v2_apm.cmake

@ -1,11 +0,0 @@ @@ -1,11 +0,0 @@
include(configs/nuttx_px4fmu-common_apm)
list(APPEND config_module_list
drivers/boards/px4fmu-v2
drivers/pwm_input
drivers/px4io
)
set(config_io_board
px4io-v2
)

12
Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v3_apm.cmake

@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
include(configs/nuttx_px4fmu-common_apm)
list(APPEND config_module_list
drivers/boards/px4fmu-v2
drivers/pwm_input
drivers/px4io
drivers/oreoled
)
set(config_io_board
px4io-v2
)

7
Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v4_apm.cmake

@ -1,7 +0,0 @@ @@ -1,7 +0,0 @@
include(configs/nuttx_px4fmu-common_apm)
list(APPEND config_module_list
drivers/boards/px4fmu-v4
drivers/pwm_input
lib/rc
)

11
Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v4pro_apm.cmake

@ -1,11 +0,0 @@ @@ -1,11 +0,0 @@
include(configs/nuttx_px4fmu-common_apm)
list(APPEND config_module_list
drivers/boards/px4fmu-v4pro
drivers/pwm_input
drivers/px4io
)
set(config_io_board
px4io-v2
)

18
Tools/bootloaders/README.md

@ -26,27 +26,9 @@ libraries/AP_HAL_ChibiOS/hwdef, in the files called hwdef-bl.dat @@ -26,27 +26,9 @@ libraries/AP_HAL_ChibiOS/hwdef, in the files called hwdef-bl.dat
We also have copies of binaries for some of the older bootloaders in
this directory. They are:
px4fmu_bl.bin:
for F405 based fmuv1
boots at 0x08004000
board ID 5
px4fmuv2_bl.bin:
for F427 based fmuv2 boards
boots at 0x08004000
board ID 9
px4fmuv4_bl.bin:
for F427 based fmuv4 boards
boots at 0x08004000
board ID 11
iomcu_bl.bin:
for IOMCU on fmuv2
px4fmuv4pro_bl.bin:
for F427 based p4pro board from drotek
skyviper_v2450_bl.bin:
for F427 based skyviper-v2450 boards (based on fmuv3)
reserves sectors 22 and 23 for ArduPilot storage

BIN
Tools/bootloaders/px4fmu_bl.bin

Binary file not shown.

BIN
Tools/bootloaders/px4fmuv2_bl.bin

Binary file not shown.

BIN
Tools/bootloaders/px4fmuv2_bl.elf

Binary file not shown.

BIN
Tools/bootloaders/px4fmuv4_bl.bin

Binary file not shown.

BIN
Tools/bootloaders/px4fmuv4pro_bl.bin

Binary file not shown.

57
Tools/scripts/add_git_hashes.py

@ -1,57 +0,0 @@ @@ -1,57 +0,0 @@
#!/usr/bin/env python
'''
Add git hashes to .px4 file for PX4/Pixhawk build
Written by Jon Challinger January 2015
'''
import json
import sys
import os
import posixpath
import subprocess
import argparse
parser = argparse.ArgumentParser()
parser.add_argument('input_file')
parser.add_argument('output_file')
parser.add_argument('--ardupilot')
parser.add_argument('--px4')
parser.add_argument('--nuttx')
parser.add_argument('--uavcan')
args = parser.parse_args()
f = open(args.input_file,'r')
fw_json = json.load(f)
f.close()
if args.ardupilot is not None:
try:
fw_json["ardupilot_git_hash"] = subprocess.check_output(["git", "--git-dir", posixpath.join(args.ardupilot,".git"), "rev-parse", "HEAD"]).strip().decode('ascii')
except:
print("Failed to get apm hash")
if args.px4 is not None:
try:
fw_json["px4_git_hash"] = subprocess.check_output(["git", "--git-dir", posixpath.join(args.px4,".git"), "rev-parse", "HEAD"]).strip().decode('ascii')
except:
print("Failed to get px4 hash")
if args.nuttx is not None:
try:
fw_json["nuttx_git_hash"] = subprocess.check_output(["git", "--git-dir", posixpath.join(args.nuttx,".git"), "rev-parse", "HEAD"]).strip().decode('ascii')
except:
print("Failed to get nuttx hash")
if args.uavcan is not None:
try:
fw_json["uavcan_git_hash"] = subprocess.check_output(["git", "--git-dir", posixpath.join(args.uavcan,".git"), "rev-parse", "HEAD"]).strip().decode('ascii')
except:
print("Failed to get uavcan hash")
f=open(args.output_file,'w')
json.dump(fw_json,f,indent=4)
f.truncate()
f.close()
Loading…
Cancel
Save