diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-19 15:06:51 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-19 15:06:51 +0200 |
| commit | d79b82b946d487298598f66469cb09b0b0532443 (patch) | |
| tree | 2f625f59c1c7f4509dd7db55d58c910057a2dcef /src | |
| parent | 12eae1777d11138a0730d6fa54e0f63f98144d11 (diff) | |
| parent | 282f40d16247db6ae2598e7f28cd5cc42c4600d0 (diff) | |
| download | px4-firmware-d79b82b946d487298598f66469cb09b0b0532443.tar.gz px4-firmware-d79b82b946d487298598f66469cb09b0b0532443.tar.bz2 px4-firmware-d79b82b946d487298598f66469cb09b0b0532443.zip | |
Merge pull request #829 from PX4/uploader_hotfix
Hotfix to PX4IO uploader. There are no known mishaps due to it, but very...
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/px4io/px4io_uploader.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/drivers/px4io/px4io_uploader.cpp b/src/drivers/px4io/px4io_uploader.cpp index dd8abbac5..28ec62356 100644 --- a/src/drivers/px4io/px4io_uploader.cpp +++ b/src/drivers/px4io/px4io_uploader.cpp @@ -201,9 +201,14 @@ PX4IO_Uploader::upload(const char *filenames[]) continue; } - if (bl_rev <= 2) + if (bl_rev <= 2) { ret = verify_rev2(fw_size); - else if(bl_rev == 3) { + } else if(bl_rev == 3) { + ret = verify_rev3(fw_size); + } else { + /* verify rev 4 and higher still uses the same approach and + * every version *needs* to be verified. + */ ret = verify_rev3(fw_size); } |