FW update exception fix #8018
Merged
FW update exception fix #8018
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ev-mp
requested changes
Dec 22, 2020
| _hw_monitor->get_gvd(gvd_buff.size(), gvd_buff.data(), ds::GVD); | ||
| this_thread::sleep_for(milliseconds(50)); | ||
| } | ||
| throw std::runtime_error("Device still connected!"); |
There was a problem hiding this comment.
Reword with "Device failed to switch to DFU within the predefined time"
src/ds5/ds5-device.cpp
Outdated
|
|
||
| try { | ||
| LOG_INFO("entering to update state, device disconnect is expected"); | ||
| command cmd(ds::DFU); | ||
| cmd.param1 = 1; | ||
| _hw_monitor->send(cmd); | ||
| std::vector<uint8_t> gvd_buff(HW_MONITOR_BUFFER_SIZE); | ||
| for (auto i = 0; i < 10; i++) |
There was a problem hiding this comment.
Increase iterations count to cover 1000msec
Comment in code as to how the mechanism is expected to work
| @@ -435,12 +435,26 @@ namespace librealsense | |||
| { | |||
| // Stop all data streaming/exchange pipes with HW | |||
| stop_activity(); | |||
| using namespace std; | |||
| using namespace std::chrono; | |||
There was a problem hiding this comment.
In this case use of explicit std::this_thread... std::chrono:millisec(..) is preferred
src/l500/l500-device.cpp
Outdated
|
|
||
| try { | ||
| LOG_INFO("entering to update state, device disconnect is expected"); | ||
| command cmd(ivcam2::DFU); | ||
| cmd.param1 = 1; | ||
| _hw_monitor->send(cmd); | ||
| std::vector<uint8_t> gvd_buff(HW_MONITOR_BUFFER_SIZE); | ||
| for (auto i = 0; i < 25; i++) |
There was a problem hiding this comment.
The counter here and for DS5.cpp should probably be synchronized
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When FW update runs, the device disconnects when it switches to DFU.
Exception is thrown when FW update calls query devices while device still connected (not switch to DFU already).
In this fix, after sending the command of switching device to DFU, I checked when device is disconnected then continue to next step of querying devices.
Tracked on DSO-16069