diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-28 14:57:19 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-28 14:57:19 +0200 |
| commit | 1984e609b62a9d3bfabe01b882dd08e7c0b6c8b6 (patch) | |
| tree | 0eb2ce55886f40a0b9f39a669e3c0883147b061b | |
| parent | 87cb066bed1eb9ddb36b233964a77403e0c2ba09 (diff) | |
| parent | 30405331bdd8f3b6b49801bf68a605c093c2628e (diff) | |
| download | px4-firmware-1984e609b62a9d3bfabe01b882dd08e7c0b6c8b6.tar.gz px4-firmware-1984e609b62a9d3bfabe01b882dd08e7c0b6c8b6.tar.bz2 px4-firmware-1984e609b62a9d3bfabe01b882dd08e7c0b6c8b6.zip | |
Merged in RAMTRON update
| -rw-r--r-- | Documentation/flight_mode_state_machine.odg | bin | 18105 -> 18452 bytes | |||
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 1 | ||||
| -rw-r--r-- | src/systemcmds/ramtron/ramtron.c | 11 |
3 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/flight_mode_state_machine.odg b/Documentation/flight_mode_state_machine.odg Binary files differindex b630ecb40..f9fa7a032 100644 --- a/Documentation/flight_mode_state_machine.odg +++ b/Documentation/flight_mode_state_machine.odg diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 74be1cd23..3f88b8c8c 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -39,6 +39,7 @@ MODULES += modules/sensors # System commands # MODULES += systemcmds/eeprom +MODULES += systemcmds/ramtron MODULES += systemcmds/bl_update MODULES += systemcmds/boardinfo MODULES += systemcmds/i2c diff --git a/src/systemcmds/ramtron/ramtron.c b/src/systemcmds/ramtron/ramtron.c index 5e9499c55..03c713987 100644 --- a/src/systemcmds/ramtron/ramtron.c +++ b/src/systemcmds/ramtron/ramtron.c @@ -63,6 +63,15 @@ __EXPORT int ramtron_main(int argc, char *argv[]); +#ifndef CONFIG_MTD_RAMTRON + +/* create a fake command with decent message to not confuse users */ +int ramtron_main(int argc, char *argv[]) +{ + errx(1, "RAMTRON not enabled, skipping."); +} +#else + static void ramtron_attach(void); static void ramtron_start(void); static void ramtron_erase(void); @@ -266,3 +275,5 @@ ramtron_test(void) // at24c_test(); exit(0); } + +#endif |