Skip to content

Commit 6bf989f

Browse files
committed
Rename rc to return code for clarity
1 parent b9b2478 commit 6bf989f

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

mcumgr-android-lib/src/main/java/io/runtime/mcumgr/dfu/FirmwareUpgradeManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ public void onResponse(@NonNull final McuMgrImageStateResponse response) {
337337

338338
// Check for an error return code
339339
if (!response.isSuccess()) {
340-
fail(new McuMgrErrorException(response.getRc()));
340+
fail(new McuMgrErrorException(response.getReturnCode()));
341341
return;
342342
}
343343

@@ -432,7 +432,7 @@ public void onResponse(@NonNull McuMgrImageStateResponse response) {
432432
Log.v(TAG, "Test response: " + response.toString());
433433
// Check for an error return code
434434
if (!response.isSuccess()) {
435-
fail(new McuMgrErrorException(response.getRc()));
435+
fail(new McuMgrErrorException(response.getReturnCode()));
436436
return;
437437
}
438438
if (response.images.length != 2) {
@@ -495,7 +495,7 @@ public void onResponse(@NonNull McuMgrResponse response) {
495495
Log.v(TAG, "Reset request sent. Waiting for reset");
496496
// Check for an error return code
497497
if (!response.isSuccess()) {
498-
fail(new McuMgrErrorException(response.getRc()));
498+
fail(new McuMgrErrorException(response.getReturnCode()));
499499
}
500500
}
501501

@@ -516,7 +516,7 @@ public void onResponse(@NonNull McuMgrImageStateResponse response) {
516516
Log.v(TAG, "Confirm response: " + response.toString());
517517
// Check for an error return code
518518
if (!response.isSuccess()) {
519-
fail(new McuMgrErrorException(response.getRc()));
519+
fail(new McuMgrErrorException(response.getReturnCode()));
520520
return;
521521
}
522522
if (response.images.length == 0) {

mcumgr-android-lib/src/main/java/io/runtime/mcumgr/response/McuMgrResponse.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class McuMgrResponse {
4949
/**
5050
* The return code (enum) for this response. For the raw return code use the "rc" property.
5151
*/
52-
private McuMgrErrorCode mRc;
52+
private McuMgrErrorCode mReturnCode;
5353

5454
/**
5555
* McuMgr payload for this response. This does not include the McuMgr header for standard
@@ -91,12 +91,12 @@ public McuMgrHeader getHeader() {
9191
*
9292
* @return Mcu Manager return code.
9393
*/
94-
public int getRcValue() {
95-
if (mRc == null) {
94+
public int getReturnCodeValue() {
95+
if (mReturnCode == null) {
9696
Log.w(TAG, "Response does not contain a McuMgr return code.");
9797
return 0;
9898
} else {
99-
return mRc.value();
99+
return mReturnCode.value();
100100
}
101101
}
102102

@@ -105,8 +105,8 @@ public int getRcValue() {
105105
*
106106
* @return The return code enum.
107107
*/
108-
public McuMgrErrorCode getRc() {
109-
return mRc;
108+
public McuMgrErrorCode getReturnCode() {
109+
return mReturnCode;
110110
}
111111

112112
/**
@@ -187,7 +187,7 @@ void initFields(McuMgrScheme scheme, byte[] bytes, McuMgrHeader header, byte[] p
187187
mBytes = bytes;
188188
mHeader = header;
189189
mPayload = payload;
190-
mRc = rc;
190+
mReturnCode = rc;
191191
}
192192

193193
/**

0 commit comments

Comments
 (0)