dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #414 from julianoes/fix_io_upload_filenames 

Look for the appropriate images in the uploader
This commit is contained in:
Lorenz Meier 2013-09-21 02:41:41 -07:00
parent cd8854e622 327f1f8001
commit 463565ad13
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/drivers/px4io/px4io.cpp
View File

@ -2245,7 +2245,7 @@ px4io_main(int argc, char *argv[])
} }
PX4IO_Uploader *up; PX4IO_Uploader *up;
const char *fn[5]; const char *fn[3];
/* work out what we're uploading... */ /* work out what we're uploading... */
if (argc > 2) { if (argc > 2) {
@ -2253,11 +2253,19 @@ px4io_main(int argc, char *argv[])
fn[1] = nullptr; fn[1] = nullptr;
} else { } else {
fn[0] = "/etc/extras/px4io-v2_default.bin"; #if defined(CONFIG_ARCH_BOARD_PX4FMU_V1)
fn[1] = "/etc/extras/px4io-v1_default.bin"; fn[0] = "/etc/extras/px4io-v1_default.bin";
fn[1] = "/fs/microsd/px4io1.bin";
fn[2] = "/fs/microsd/px4io.bin"; fn[2] = "/fs/microsd/px4io.bin";
fn[3] = "/fs/microsd/px4io2.bin"; fn[3] = nullptr;
fn[4] = nullptr; #elif defined(CONFIG_ARCH_BOARD_PX4FMU_V2)
fn[0] = "/etc/extras/px4io-v2_default.bin";
fn[1] = "/fs/microsd/px4io2.bin";
fn[2] = "/fs/microsd/px4io.bin";
fn[3] = nullptr;
#else
#error "unknown board"
#endif
} }
up = new PX4IO_Uploader; up = new PX4IO_Uploader;