diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-22 13:25:52 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-22 13:25:52 +0200 |
| commit | 05648d80d25febd220bac503aad3756d6dc5401b (patch) | |
| tree | 0442a564409a6aeecea80d07bdc1802f48b9fc63 /src/lib | |
| parent | a6a2efb651d875171aaec698a836f26b548ca0d6 (diff) | |
| parent | 9ea0b2189992830f2698c7d4703ff472072a61b1 (diff) | |
| download | px4-firmware-05648d80d25febd220bac503aad3756d6dc5401b.tar.gz px4-firmware-05648d80d25febd220bac503aad3756d6dc5401b.tar.bz2 px4-firmware-05648d80d25febd220bac503aad3756d6dc5401b.zip | |
Merge remote-tracking branch 'upstream/master' into geo
Conflicts:
src/modules/commander/commander.cpp
src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/version/version.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/version/version.h b/src/lib/version/version.h index af733aaf0..d8ccb6774 100644 --- a/src/lib/version/version.h +++ b/src/lib/version/version.h @@ -59,4 +59,8 @@ #define HW_ARCH "PX4FMU_V2" #endif +#ifdef CONFIG_ARCH_BOARD_AEROCORE +#define HW_ARCH "AEROCORE" +#endif + #endif /* VERSION_H_ */ |