diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-22 12:04:10 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-22 12:04:10 +0200 |
commit | 3189b4a9b4b1817e9f908a3edeeda83181b71450 (patch) | |
tree | 42767f912166a698f35b80fd9ace248949f02da2 /src/drivers/px4io/px4io.cpp | |
parent | ebd16975d01b3a2200e94e164199b88527a27e3c (diff) | |
parent | 669d4c6dd26cec44196f755b223da588439816c6 (diff) | |
download | px4-firmware-3189b4a9b4b1817e9f908a3edeeda83181b71450.tar.gz px4-firmware-3189b4a9b4b1817e9f908a3edeeda83181b71450.tar.bz2 px4-firmware-3189b4a9b4b1817e9f908a3edeeda83181b71450.zip |
Merge branch 'master' of github.com:PX4/Firmware
Diffstat (limited to 'src/drivers/px4io/px4io.cpp')
-rw-r--r-- | src/drivers/px4io/px4io.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index aca411b1e..9597dad9a 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -2245,7 +2245,7 @@ px4io_main(int argc, char *argv[]) } PX4IO_Uploader *up; - const char *fn[5]; + const char *fn[3]; /* work out what we're uploading... */ if (argc > 2) { @@ -2253,11 +2253,19 @@ px4io_main(int argc, char *argv[]) fn[1] = nullptr; } else { +#if defined(CONFIG_ARCH_BOARD_PX4FMU_V1) + fn[0] = "/etc/extras/px4io-v1_default.bin"; + fn[1] = "/fs/microsd/px4io1.bin"; + fn[2] = "/fs/microsd/px4io.bin"; + fn[3] = nullptr; +#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V2) fn[0] = "/etc/extras/px4io-v2_default.bin"; - fn[1] = "/etc/extras/px4io-v1_default.bin"; + fn[1] = "/fs/microsd/px4io2.bin"; fn[2] = "/fs/microsd/px4io.bin"; - fn[3] = "/fs/microsd/px4io2.bin"; - fn[4] = nullptr; + fn[3] = nullptr; +#else +#error "unknown board" +#endif } up = new PX4IO_Uploader; |