Skip to content

ADC and GSR parsing bugs have been resolved #34

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
RuMolloy merged 3 commits into from
Jul 11, 2019
Merged

ADC and GSR parsing bugs have been resolved #34

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b030a6e
trying to fix ADV_API_00003 unit test
marknolan Jul 11, 2019
da69fe2
reverted GSR resistor value
marknolan Jul 11, 2019
5099656
reverted the revert of a resistance value for GSR calibration
marknolan Jul 11, 2019
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
4 changes: 1 addition & 3 deletions ShimmerDriver/src/main/java/com/shimmerresearch/sensors/SensorADC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,9 +522,7 @@ public static int uncalibrateMspAdcChannelFromVolts(double unCalData){
}

public static double calibrateU12AdcValueToMillivolts(double uncalibratedData, double offset, double vRefP, double gain){
// double calibratedData = (uncalibratedData-offset) * (((vRefP*1000)/gain)/4095);
// return calibratedData;
return calibrateU12AdcValueToVolts(uncalibratedData, offset, vRefP, gain)*1000;
return calibrateU12AdcValueToVolts(uncalibratedData, offset, vRefP*1000, gain);
}

public static double calibrateU12AdcValueToVolts(double uncalibratedData, double offset, double vRefP, double gain){
Expand Down