Skip to content

DEV-197 adding get method for Shimmer charging status #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JongChern merged 2 commits into from
Jun 20, 2025
Merged

DEV-197 adding get method for Shimmer charging status #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
738fd70
DEV-197 #time 5m adding get method for Shimmer charging status
marknolan Jun 19, 2025
ceca4a7
DEV-197 #time 10 support for S3R BT module version parsing
marknolan Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion ...er/src/main/java/com/shimmerresearch/driver/shimmer2r3/BluetoothModuleVersionDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ public static enum BT_MODULE_VERSION {
RN4678_VERSION_RESPONSE_V1_22_0("RN4678 V1.22 12/08/2020 (c)Microchip Technology Inc ", "RN4678 V1.22 ", "RN4678 v1.23"),
RN4678_VERSION_RESPONSE_V1_23_0("RN4678 V1.23 06/30/2021 (c)Microchip Technology Inc", "RN4678 V1.23 ", "RN4678 v1.23"),

VELA_IF820_V01_04_12_12("CYW20820 app=v01.04.12.12", "CYW20820 app=v01.04.12.12", "IF820 v01.04.12.12"),
VELA_IF820_V01_04_16_16("CYW20820 app=v01.04.16.16", "CYW20820 app=v01.04.16.16", "IF820 v01.04.16.16"),

UNKNOWN("Unknown", "Unknown", "Unknown");

public String btModuleVerStrFull = "";
Expand All @@ -46,8 +49,15 @@ public void parseBtModuleVerBytes(byte[] responseData) {

mBtModuleVersionParsed = BT_MODULE_VERSION.UNKNOWN;
for (BT_MODULE_VERSION btModuleVersion : BT_MODULE_VERSION.values()) {
if(mBtModuleVersionReceived.contains(btModuleVersion.btModuleVerStrComparison)) {
if(btModuleVersion == BT_MODULE_VERSION.NOT_READ) {
if(mBtModuleVersionReceived.isEmpty()) {
mBtModuleVersionParsed = BT_MODULE_VERSION.NOT_READ;
break;
}
}
else if(mBtModuleVersionReceived.contains(btModuleVersion.btModuleVerStrComparison)) {
mBtModuleVersionParsed = btModuleVersion;
break;
}
}
}
Expand All @@ -60,4 +70,8 @@ public String getUserFriendlyName() {
}
}

public String getBtModuleVersionReceived() {
return mBtModuleVersionReceived;
}

}
4 changes: 4 additions & 0 deletions ...merDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerBattStatusDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ else if((mChargingStatusRaw & 0xFF) == CHARGING_STATUS_BYTE.UNKNOWN) {
}
}

public CHARGING_STATUS getChargingStatus() {
return mChargingStatus;
}

public static double adcValToBattVoltage(int adcVal){
double calibratedData = SensorADC.calibrateU12AdcValueToMillivolts(adcVal, 0.0, 3.0, 1.0);
double battVoltage = ((calibratedData * 1.988)) / 1000; // 1.988 is due to components on the Shimmmer, 1000 is to convert to volts
Expand Down
Loading