Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-27 17:06:31 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Improved defaults for Lisa M / Lisa MX

Browse Source
This commit is contained in:
Michal Podhradsky
2017-02-16 11:05:11 -08:00
parent 72f0a5cc28
commit cc779b6191
10 changed files with 97 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/boards/lisa_m_2.0.makefile
+1
View File
@@ -8,4 +8,5 @@
BOARD=lisa_m
BOARD_VERSION=2.0
include $(PAPARAZZI_SRC)/conf/boards/lisa_m_defaults.makefile
include $(PAPARAZZI_SRC)/conf/boards/lisa_m_common.makefile
conf/boards/lisa_m_2.0_chibios.makefile
+1
View File
@@ -19,4 +19,5 @@ else
$(error Unknown RADIO_CONTROL_PPM_PIN, configure it to either PA01 or PA10)
endif
include $(PAPARAZZI_SRC)/conf/boards/lisa_m_defaults.makefile
include $(PAPARAZZI_SRC)/conf/boards/lisa_m_common_chibios.makefile
conf/boards/lisa_m_2.1.makefile
+1
View File
@@ -8,4 +8,5 @@
BOARD=lisa_m
BOARD_VERSION=2.1
include $(PAPARAZZI_SRC)/conf/boards/lisa_m_defaults.makefile
include $(PAPARAZZI_SRC)/conf/boards/lisa_m_common.makefile
conf/boards/lisa_m_2.1_chibios.makefile
+1
View File
@@ -8,3 +8,4 @@ BOARD=lisa_m
BOARD_VERSION=2.1
include $(PAPARAZZI_SRC)/conf/boards/lisa_m_common_chibios.makefile
include $(PAPARAZZI_SRC)/conf/boards/lisa_m_defaults.makefile
conf/boards/lisa_m_common_chibios.makefile
-33
View File
@@ -44,36 +44,3 @@ CHIBIOS_BOARD_LINKER = STM32F107xC_luftboot.ld
else
CHIBIOS_BOARD_LINKER = STM32F107xC.ld
endif
#
# default LED configuration
#
RADIO_CONTROL_LED ?= 4
BARO_LED ?= none
AHRS_ALIGNER_LED ?= 2
GPS_LED ?= 3
SYS_TIME_LED ?= 1
#
# default uart configuration
#
RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT ?= UART1
RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT ?= UART5
MODEM_PORT ?= UART2
MODEM_BAUD ?= B57600
GPS_PORT ?= UART3
GPS_BAUD ?= B38400
#
# default actuator configuration
#
# you can use different actuators by adding a configure option to your firmware section
# e.g. <configure name="ACTUATORS" value="actuators_ppm/>
# and by setting the correct "driver" attribute in servo section
# e.g. <servo driver="Ppm">
#
ACTUATORS ?= actuators_pwm
conf/boards/lisa_m_defaults.makefile
+36
View File
@@ -0,0 +1,36 @@
# Hey Emacs, this is a -*- makefile -*-
#
# Defaults for Lia 1.1, Lisa M 2.0, and Lisa M 2.1
#
#
# default LED configuration
#
RADIO_CONTROL_LED ?= 4
BARO_LED ?= none
AHRS_ALIGNER_LED ?= 2
GPS_LED ?= 3
SYS_TIME_LED ?= 1
#
# default uart configuration
#
RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT ?= UART1
RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT ?= UART5
MODEM_PORT ?= UART2
MODEM_BAUD ?= B57600
GPS_PORT ?= UART3
GPS_BAUD ?= B38400
#
# default actuator configuration
#
# you can use different actuators by adding a configure option to your firmware section
# e.g. <configure name="ACTUATORS" value="actuators_ppm/>
# and by setting the correct "driver" attribute in servo section
# e.g. <servo driver="Ppm">
#
ACTUATORS ?= actuators_pwm
conf/boards/lisa_mx_2.0.makefile
+1 -48
View File
@@ -17,10 +17,6 @@ $(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-mx.ld
# -----------------------------------------------------------------------
# default flash mode is via usb dfu bootloader (luftboot)
# other possibilities: DFU-UTIL, SWD, JTAG_BMP, STLINK, SERIAL
FLASH_MODE ?= SWD
HAS_LUFTBOOT ?= 0
ifeq (,$(findstring $(HAS_LUFTBOOT),0 FALSE))
$(TARGET).CFLAGS+=-DLUFTBOOT
@@ -29,47 +25,4 @@ DFU_ADDR = 0x8004000
DFU_PRODUCT = Lisa/Lia
endif
#
# default LED configuration
#
RADIO_CONTROL_LED ?= 4
BARO_LED ?= none
AHRS_ALIGNER_LED ?= 2
GPS_LED ?= 3
SYS_TIME_LED ?= 1
#
# default uart configuration
#
RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT ?= UART1
RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT ?= UART5
MODEM_PORT ?= UART2
MODEM_BAUD ?= B57600
GPS_PORT ?= UART3
GPS_BAUD ?= B38400
#
# default PPM input is on PA01 (SERVO6)
#
RADIO_CONTROL_PPM_PIN ?= PA01
ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PA_10 PA10 UART1_RX))
PPM_CONFIG=1
else ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PA_01 PA01 PA1 SERVO6))
PPM_CONFIG=2
else
$(error Unknown RADIO_CONTROL_PPM_PIN, configure it to either PA01 or PA10)
endif
#
# default actuator configuration
#
# you can use different actuators by adding a configure option to your firmware section
# e.g. <configure name="ACTUATORS" value="actuators_ppm/>
# and by setting the correct "driver" attribute in servo section
# e.g. <servo driver="Ppm">
#
ACTUATORS ?= actuators_pwm
include $(PAPARAZZI_SRC)/conf/boards/lisa_m_defaults.makefile
conf/boards/lisa_mx_2.1.makefile
+1 -48
View File
@@ -17,10 +17,6 @@ $(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-mx.ld
# -----------------------------------------------------------------------
# default flash mode is via usb dfu bootloader (luftboot)
# other possibilities: DFU-UTIL, SWD, JTAG_BMP, STLINK, SERIAL
FLASH_MODE ?= SWD
HAS_LUFTBOOT ?= 0
ifeq (,$(findstring $(HAS_LUFTBOOT),0 FALSE))
$(TARGET).CFLAGS+=-DLUFTBOOT
@@ -29,47 +25,4 @@ DFU_ADDR = 0x8004000
DFU_PRODUCT = Lisa/Lia
endif
#
# default LED configuration
#
RADIO_CONTROL_LED ?= 4
BARO_LED ?= none
AHRS_ALIGNER_LED ?= 2
GPS_LED ?= 3
SYS_TIME_LED ?= 1
#
# default uart configuration
#
RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT ?= UART1
RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT ?= UART5
MODEM_PORT ?= UART2
MODEM_BAUD ?= B57600
GPS_PORT ?= UART3
GPS_BAUD ?= B38400
#
# default PPM input is on PA01 (SERVO6)
#
RADIO_CONTROL_PPM_PIN ?= PA01
ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PA_10 PA10 UART1_RX))
PPM_CONFIG=1
else ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PA_01 PA01 PA1 SERVO6))
PPM_CONFIG=2
else
$(error Unknown RADIO_CONTROL_PPM_PIN, configure it to either PA01 or PA10)
endif
#
# default actuator configuration
#
# you can use different actuators by adding a configure option to your firmware section
# e.g. <configure name="ACTUATORS" value="actuators_ppm/>
# and by setting the correct "driver" attribute in servo section
# e.g. <servo driver="Ppm">
#
ACTUATORS ?= actuators_pwm
include $(PAPARAZZI_SRC)/conf/boards/lisa_m_defaults.makefile
conf/boards/lisa_mx_2.1_chibios.makefile
+1 -36
View File
@@ -36,41 +36,6 @@ CHIBIOS_BOARD_STARTUP = startup_stm32f4xx.mk
#
MCU = cortex-m4
# default flash mode is via usb dfu bootloader
# possibilities: DFU-UTIL, SWD, STLINK
FLASH_MODE ?= SWD
HAS_LUFTBOOT = FALSE
#
# default LED configuration
#
RADIO_CONTROL_LED ?= 4
BARO_LED ?= none
AHRS_ALIGNER_LED ?= 2
GPS_LED ?= 3
SYS_TIME_LED ?= 1
#
# default UART configuration (modem, gps, spektrum)
#
RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT ?= UART1
RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT ?= UART5
MODEM_PORT ?= UART2
MODEM_BAUD ?= B57600
GPS_PORT ?= UART3
GPS_BAUD ?= B38400
#
# default actuator configuration
#
# you can use different actuators by adding a configure option to your firmware section
# e.g. <configure name="ACTUATORS" value="actuators_ppm/>
# and by setting the correct "driver" attribute in servo section
# e.g. <servo driver="Ppm">
#
ACTUATORS ?= actuators_pwm
include $(PAPARAZZI_SRC)/conf/boards/lisa_mx_defaults.makefile
conf/boards/lisa_mx_defaults.makefile
+54
View File
@@ -0,0 +1,54 @@
# Hey Emacs, this is a -*- makefile -*-
#
# lisa_mx_defaults.makefile
#
# http://wiki.paparazziuav.org/wiki/Lisa/M_v20
#
# default flash mode is via usb dfu bootloader
# possibilities: DFU-UTIL, SWD, STLINK
FLASH_MODE ?= SWD
#
# default LED configuration
#
RADIO_CONTROL_LED ?= 4
BARO_LED ?= none
AHRS_ALIGNER_LED ?= 2
GPS_LED ?= 3
SYS_TIME_LED ?= 1
#
# default uart configuration
#
RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT ?= UART1
RADIO_CONTROL_SPEKTRUM_SECONDARY_PORT ?= UART5
MODEM_PORT ?= UART2
MODEM_BAUD ?= B57600
GPS_PORT ?= UART3
GPS_BAUD ?= B38400
#
# default PPM input is on PA01 (SERVO6)
#
RADIO_CONTROL_PPM_PIN ?= PA01
ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PA_10 PA10 UART1_RX))
PPM_CONFIG=1
else ifeq ($(RADIO_CONTROL_PPM_PIN),$(filter $(RADIO_CONTROL_PPM_PIN),PA_01 PA01 PA1 SERVO6))
PPM_CONFIG=2
else
$(error Unknown RADIO_CONTROL_PPM_PIN, configure it to either PA01 or PA10)
endif
#
# default actuator configuration
#
# you can use different actuators by adding a configure option to your firmware section
# e.g. <configure name="ACTUATORS" value="actuators_ppm/>
# and by setting the correct "driver" attribute in servo section
# e.g. <servo driver="Ppm">
#
ACTUATORS ?= actuators_pwm