diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-26 17:28:01 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-26 17:28:01 +0200 |
| commit | 0fe8ed509ad2d45a16eba1fe2683f586e530ee02 (patch) | |
| tree | ea4454175c5600a411c5828c3278a812dd7563ab /makefiles | |
| parent | 8ea5fd20c1c268c6baf145606186592bf5bd3699 (diff) | |
| parent | f3a77705a701a92ae510e18280136b3b7f204b3e (diff) | |
| download | px4-firmware-0fe8ed509ad2d45a16eba1fe2683f586e530ee02.tar.gz px4-firmware-0fe8ed509ad2d45a16eba1fe2683f586e530ee02.tar.bz2 px4-firmware-0fe8ed509ad2d45a16eba1fe2683f586e530ee02.zip | |
Merge branch 'master' into power_enforce
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 1 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index d6e88859c..a68cc32f4 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -40,6 +40,7 @@ MODULES += drivers/meas_airspeed MODULES += drivers/frsky_telemetry MODULES += modules/sensors MODULES += drivers/mkblctrl +MODULES += drivers/pca8574 # Needs to be burned to the ground and re-written; for now, diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index 84274bf75..66b2157ed 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -24,6 +24,7 @@ MODULES += drivers/lsm303d MODULES += drivers/l3gd20 MODULES += drivers/hmc5883 MODULES += drivers/ms5611 +MODULES += drivers/pca8574 MODULES += systemcmds/perf MODULES += systemcmds/reboot MODULES += systemcmds/tests |