@@ -133,6 +133,7 @@ public class ADS1299SettingsValues {
133133 // Used for Channel On/Off to reflect what happens in Firmware
134134 public Bias [] previousBias;
135135 public Srb2 [] previousSrb2;
136+ public Srb1 [] previousSrb1;
136137 public InputType [] previousInputType;
137138
138139 public ADS1299SettingsValues () {
@@ -186,6 +187,7 @@ class ADS1299Settings {
186187
187188 values. previousBias = values. bias. clone();
188189 values. previousSrb2 = values. srb2. clone();
190+ values. previousSrb1 = values. srb1. clone();
189191 values. previousInputType = values. inputType. clone();
190192
191193 String currentVals = getJson();
@@ -237,14 +239,17 @@ class ADS1299Settings {
237239 if (active) {
238240 values. bias[chan] = values. previousBias[chan];
239241 values. srb2[chan] = values. previousSrb2[chan];
242+ values. srb1[chan] = values. previousSrb1[chan];
240243 values. inputType[chan] = values. previousInputType[chan];
241244 } else {
242245 values. previousBias[chan] = values. bias[chan];
243246 values. previousSrb2[chan] = values. srb2[chan];
247+ values. previousSrb1[chan] = values. srb1[chan];
244248 values. previousInputType[chan] = values. inputType[chan];
245249
246250 values. bias[chan] = Bias . NO_INCLUDE ;
247251 values. srb2[chan] = Srb2 . DISCONNECT ;
252+ values. srb1[chan] = Srb1 . DISCONNECT ;
248253 values. inputType[chan] = InputType . SHORTED ;
249254 }
250255
@@ -290,7 +295,6 @@ class ADS1299Settings {
290295 return board. sendCommand(sb. toString()). getKey(). booleanValue();
291296 }
292297
293- // Return true if all commits are successful
294298 public void revertAllChannelsToDefaultValues () {
295299 Gson gson = new GsonBuilder (). setPrettyPrinting(). create();
296300 String defaultValsAsString = gson. toJson(defaultValues);
@@ -311,7 +315,12 @@ class ADS1299Settings {
311315 previousValues. srb1[chan] = values. srb1[chan];
312316 }
313317
314- public void revertToLastValues (int chan ) {
318+ public boolean revertToLastValues (int chan ) {
319+ revertToLastValuesWithoutCommitting(chan);
320+ return commit(chan);
321+ }
322+
323+ public void revertToLastValuesWithoutCommitting (int chan ) {
315324 values. gain[chan] = previousValues. gain[chan];
316325 values. inputType[chan] = previousValues. inputType[chan];
317326 values. bias[chan] = previousValues. bias[chan];
@@ -337,6 +346,12 @@ class ADS1299Settings {
337346 vals. srb2[chan]. ordinal(), vals. srb1[chan]. ordinal());
338347 return commandString;
339348 }
349+
350+ public void saveDefaultValues () {
351+ Gson gson = new Gson ();
352+ String defaultValsAsString = gson. toJson(values);
353+ defaultValues = gson. fromJson(defaultValsAsString, ADS1299SettingsValues . class);
354+ }
340355}
341356
342357interface ADS1299SettingsBoard {
0 commit comments