Browse Source

AP_HAL: support mini-pix

master
ljwang 7 years ago committed by Andrew Tridgell
parent
commit
59ee3c8f62
  1. 1
      Tools/ardupilotwaf/boards.py
  2. 2
      Tools/ardupilotwaf/px_uploader.py
  3. 2
      libraries/AP_HAL/AP_HAL_Boards.h
  4. 3
      libraries/AP_HAL/board/chibios.h

1
Tools/ardupilotwaf/boards.py

@ -452,7 +452,6 @@ class mini_pix(chibios): @@ -452,7 +452,6 @@ class mini_pix(chibios):
env.DEFINES.update(
CONFIG_HAL_BOARD_SUBTYPE = 'HAL_BOARD_SUBTYPE_CHIBIOS_MINIPIX',
)
env.CHIBIOS_FATFS_FLAG = 'USE_FATFS=no'
class linux(Board):
def configure_env(self, cfg, env):

2
Tools/ardupilotwaf/px_uploader.py

@ -604,7 +604,7 @@ def main(): @@ -604,7 +604,7 @@ def main():
# Parse commandline arguments
parser = argparse.ArgumentParser(description="Firmware uploader for the PX autopilot system.")
parser.add_argument('--port', action="store", help="Comma-separated list of serial port(s) to which the FMU may be attached",
default="/dev/serial/by-id/usb-3D*,/dev/serial/by-id/usb-Ardu*,/dev/tty.usbmodem*")
default="/dev/serial/by-id/usb-3D*,/dev/serial/by-id/usb-Ardu*,/dev/serial/by-id/usb-Radiolink*,/dev/tty.usbmodem*")
parser.add_argument('--baud-bootloader', action="store", type=int, default=115200, help="Baud rate of the serial port (default is 115200) when communicating with bootloader, only required for true serial ports.")
parser.add_argument('--baud-bootloader-flash', action="store", type=int, default=None, help="Attempt to negotiate this baudrate with bootloader for flashing.")
parser.add_argument('--baud-flightstack', action="store", default="57600", help="Comma-separated list of baud rate of the serial port (default is 57600) when communicating with flight stack (Mavlink or NSH), only required for true serial ports.")

2
libraries/AP_HAL/AP_HAL_Boards.h

@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
#define HAL_BARO_LPS25H 13
#define HAL_BARO_20789_I2C_I2C 14
#define HAL_BARO_20789_I2C_SPI 15
#define HAL_BARO_LPS22H_SPI 16
/* Compass driver types */
#define HAL_COMPASS_NONE 0
@ -133,6 +134,7 @@ @@ -133,6 +134,7 @@
#define HAL_COMPASS_LIS3MDL 19
#define HAL_COMPASS_MAG3110 20
#define HAL_COMPASS_BMM150_I2C 21
#define HAL_COMPASS_QMC5883L 22
/* Heat Types */
#define HAL_LINUX_HEAT_PWM 1

3
libraries/AP_HAL/board/chibios.h

@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@
#define HAL_BARO_MS5611_NAME "ms5611"
#define HAL_BARO_MS5611_SPI_INT_NAME "ms5611_int"
#define HAL_BARO_MS5611_SPI_EXT_NAME "ms5611_ext"
#define HAL_BARO_LPS22H_NAME "lps22h"
#define HAL_INS_MPU60x0_NAME "mpu6000"
#define HAL_INS_MPU60x0_EXT_NAME "mpu6000_ext"
@ -68,3 +69,5 @@ @@ -68,3 +69,5 @@
#define HAL_COMPASS_HMC5843_NAME "hmc5843"
#define HAL_COMPASS_LIS3MDL_NAME "lis3mdl"

Loading…
Cancel
Save