Skip to content

AA-269 #52

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
merged 1 commit into from
Aug 5, 2022
Merged

AA-269 #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 32 additions & 28 deletions .../java/com/shimmerresearch/android/guiUtilities/supportfragments/DeviceConfigFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.shimmerresearch.driverUtilities.AssembleShimmerConfig;
import com.shimmerresearch.driverUtilities.ConfigOptionDetailsSensor;
import com.shimmerresearch.driverUtilities.SensorDetails;
import com.shimmerresearch.verisense.VerisenseDevice;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -143,7 +144,6 @@ public boolean onChildClick(ExpandableListView parent, View v, int groupPosition
buttonLayout.setOrientation(LinearLayout.VERTICAL);
Button writeConfigButton = new Button(context);
Button resetListButton = new Button(context);
Button setDefaultConfigButton = new Button(context);
writeConfigButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand All @@ -167,39 +167,43 @@ public void onClick(View v) {
Toast.makeText(context, "Settings have been reset", Toast.LENGTH_SHORT).show();
}
});
setDefaultConfigButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
final Map<String, Integer> defaultConfigMap = new HashMap<String, Integer>();
defaultConfigMap.put("Accel_Range", 3);
defaultConfigMap.put("Gyro_Range", 3);
defaultConfigMap.put("Accel_Rate", 2);
defaultConfigMap.put("Mode", 1);
defaultConfigMap.put("Accel_Gyro_Rate", 6);
defaultConfigMap.put("LP Mode", 1);
defaultConfigMap.put("Range", 3);
defaultConfigMap.put("PPG Rate", 3);
writeConfigButton.setText("Write config to Shimmer");
resetListButton.setText("Reset settings");

shimmerDeviceClone = shimmerDevice.deepClone();
for(String key : listOfKeys) {
if(defaultConfigMap.containsKey(key)){
final ConfigOptionDetailsSensor cods = configOptionsMap.get(key);
if(cods != null){
shimmerDeviceClone.setConfigValueUsingConfigLabel(key, cods.mConfigValues[defaultConfigMap.get(key)]);
if(shimmerDevice instanceof VerisenseDevice){
Button setDefaultConfigButton = new Button(context);
setDefaultConfigButton.setText("Set default config");
setDefaultConfigButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
final Map<String, Integer> defaultConfigMap = new HashMap<String, Integer>();
defaultConfigMap.put("Accel_Range", 3);
defaultConfigMap.put("Gyro_Range", 3);
defaultConfigMap.put("Accel_Rate", 2);
defaultConfigMap.put("Mode", 1);
defaultConfigMap.put("Accel_Gyro_Rate", 6);
defaultConfigMap.put("LP Mode", 1);
defaultConfigMap.put("Range", 3);
defaultConfigMap.put("PPG Rate", 3);

shimmerDeviceClone = shimmerDevice.deepClone();
for(String key : listOfKeys) {
if(defaultConfigMap.containsKey(key)){
final ConfigOptionDetailsSensor cods = configOptionsMap.get(key);
if(cods != null){
shimmerDeviceClone.setConfigValueUsingConfigLabel(key, cods.mConfigValues[defaultConfigMap.get(key)]);
}
}
}
expandListAdapter.updateCloneDevice(shimmerDeviceClone);
expandListAdapter.notifyDataSetChanged();
Toast.makeText(context, "Settings have been set to default", Toast.LENGTH_SHORT).show();
}
expandListAdapter.updateCloneDevice(shimmerDeviceClone);
expandListAdapter.notifyDataSetChanged();
Toast.makeText(context, "Settings have been set to default", Toast.LENGTH_SHORT).show();
}
});
writeConfigButton.setText("Write config to Shimmer");
resetListButton.setText("Reset settings");
setDefaultConfigButton.setText("Set default config");
});
buttonLayout.addView(setDefaultConfigButton);
}
buttonLayout.addView(resetListButton);
buttonLayout.addView(writeConfigButton);
buttonLayout.addView(setDefaultConfigButton);
expandListView.addFooterView(buttonLayout);
}

Expand Down