diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-09-30 15:40:11 +0200 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-09-30 15:40:11 +0200 |
commit | e7313683cdee3e436518fd88cbc403c7251673f7 (patch) | |
tree | e47fa29f07ef163ca95e38193f29a62d4cccf1a2 /src/modules/systemlib/circuit_breaker.h | |
parent | 6da52c5543012a1391c5e5c4384434c1292b919b (diff) | |
parent | 47f151d4cefa5d7a9da34d6139aa493259f8b2fd (diff) | |
download | px4-firmware-e7313683cdee3e436518fd88cbc403c7251673f7.tar.gz px4-firmware-e7313683cdee3e436518fd88cbc403c7251673f7.tar.bz2 px4-firmware-e7313683cdee3e436518fd88cbc403c7251673f7.zip |
Merge remote-tracking branch 'upstream/master' into swissfang
Diffstat (limited to 'src/modules/systemlib/circuit_breaker.h')
-rw-r--r-- | src/modules/systemlib/circuit_breaker.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/systemlib/circuit_breaker.h b/src/modules/systemlib/circuit_breaker.h index 6a55e4948..b3431722f 100644 --- a/src/modules/systemlib/circuit_breaker.h +++ b/src/modules/systemlib/circuit_breaker.h @@ -55,6 +55,7 @@ #define CBRK_AIRSPD_CHK_KEY 162128 #define CBRK_FLIGHTTERM_KEY 121212 #define CBRK_ENGINEFAIL_KEY 284953 +#define CBRK_GPSFAIL_KEY 240024 #include <stdbool.h> |