Skip to content

Commit 73ce754

Browse files
Temporarily remove progress bar from modem dfu dialog
1 parent 1d51c19 commit 73ce754

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

Changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.1
2+
### Changed
3+
- Simplify modem DFU progress indicator temporarily
4+
15
## 2.0.0 - 2021-11-01
26
### Added
37
- Documentation section in `About` pane.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pc-nrfconnect-programmer",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"description": "Program a Nordic SoC with HEX files from nRF Connect",
55
"displayName": "Programmer",
66
"repository": {

src/actions/modemTargetActions.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,17 @@ export const programDfuModem =
6969
progressJson: progress,
7070
}: nrfdl.Progress.CallbackParameters) => {
7171
let updatedProgress = progress;
72+
// temporary until new nRF Command Line Tools comes out which includes proper progress callbacks again
73+
const skipProgressReport = true;
74+
if (skipProgressReport) {
75+
updatedProgress = {
76+
...progress,
77+
message: 'Uploading image. This might take some time.',
78+
};
79+
dispatch(modemProcessUpdate(updatedProgress));
80+
return;
81+
}
82+
// For now we will not get these progress callbacks, until this is fixed in nRF Command Line Tools
7283
if (progress.operation === 'erase_image') {
7384
updatedProgress = {
7485
...progress,

src/components/ModemUpdateDialogView.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ const ModemUpdateDialogView = () => {
5353
pause();
5454
}
5555

56+
const temporarilySkippingProgressBar = true;
57+
5658
return (
5759
<Modal show={isVisible} onHide={onCancel} backdrop="static">
5860
<Modal.Header>
@@ -74,7 +76,7 @@ const ModemUpdateDialogView = () => {
7476
<b>Status</b>
7577
</Form.Label>
7678
<div>{progressMsg}</div>
77-
{isWriting && (
79+
{isWriting && !temporarilySkippingProgressBar && (
7880
<ProgressBar
7981
hidden={!isWriting}
8082
animated

0 commit comments

Comments
 (0)