Skip to content
Snippets Groups Projects
Commit a24e50b9 authored by Lorenz Meier's avatar Lorenz Meier
Browse files

Merge branch 'master' of github.com:PX4/Firmware

parents f13c7821 0afeeb5d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/px4/px4io/driver/Makefile → apps/drivers/px4io/Makefile
+ 0
− 0
View file @ a24e50b9
File moved
apps/px4/px4io/driver/px4io.cpp → apps/drivers/px4io/px4io.cpp
+ 0
− 0
View file @ a24e50b9
File moved
apps/px4/px4io/driver/uploader.h → apps/drivers/px4io/uploader.h
+ 0
− 0
View file @ a24e50b9
File moved
apps/px4/px4io/driver/.context deleted 100644 → 0
+ 0
− 0
View file @ f13c7821
nuttx/configs/px4fmu/nsh/appconfig
+ 1
− 1
View file @ a24e50b9
......@@ -93,8 +93,8 @@ CONFIGURED_APPS += drivers/hmc5883
CONFIGURED_APPS += drivers/mpu6000
CONFIGURED_APPS += drivers/bma180
CONFIGURED_APPS += drivers/l3gd20
CONFIGURED_APPS += drivers/px4io
CONFIGURED_APPS += drivers/stm32/tone_alarm
CONFIGURED_APPS += px4/px4io/driver
CONFIGURED_APPS += px4/fmu
# Testing stuff
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment