Merge branch 'master' into fix-tests

This commit is contained in:
Michael Hope 2015-05-27 07:21:21 +02:00
commit bb62b0fdaa
2 changed files with 5 additions and 1 deletions

View file

@ -39,6 +39,8 @@ Current meter cannot be used in conjunction with Sonar.
| ------------- | ------------- | ------------------- |
| PB5 | PB0 | YES (3.3v input) |
Sonar support is not available when using the OpenPilot bootloader (OPBL).
#### Constraints
Sonar cannot be used in conjuction with SoftSerial or Parallel PWM.

View file

@ -117,7 +117,9 @@
#define USE_CLI
#if defined(OPBL)
#undef AUTOTUNE // disabled for OPBL build due to code size.
// disabled some features for OPBL build due to code size.
#undef AUTOTUNE
#undef SONAR
#endif