From eff0ad266f8d89f96b2cd709f2348b3df6d57259 Mon Sep 17 00:00:00 2001 From: Richard Waltman Date: Wed, 20 Sep 2023 15:35:06 -0500 Subject: [PATCH] Update usingGanglionV3andMacOS to false by default --- OpenBCI_GUI/ControlPanel.pde | 13 +++++++++++-- OpenBCI_GUI/OpenBCI_GUI.pde | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/OpenBCI_GUI/ControlPanel.pde b/OpenBCI_GUI/ControlPanel.pde index 05d5aa97e..0dd95c2a2 100644 --- a/OpenBCI_GUI/ControlPanel.pde +++ b/OpenBCI_GUI/ControlPanel.pde @@ -855,7 +855,12 @@ class BLEBox { private void createV2FirmwareButton(String name, String text, int _x, int _y, int _w, int _h) { v2FirmwareButton = createButton(bleBox_cp5, name, text, _x, _y, _w, _h); v2FirmwareButton.setSwitch(true); - v2FirmwareButton.setOff(); + if (usingGanglionV3andMacOS) { + v2FirmwareButton.setOff(); + } else { + v2FirmwareButton.setOn(); + } + v2FirmwareButton.setOn(); v2FirmwareButton.onRelease(new CallbackListener() { public void controlEvent(CallbackEvent theEvent) { v3FirmwareButton.setOff(); @@ -868,7 +873,11 @@ class BLEBox { private void createV3FirmwareButton(String name, String text, int _x, int _y, int _w, int _h) { v3FirmwareButton = createButton(bleBox_cp5, name, text, _x, _y, _w, _h); v3FirmwareButton.setSwitch(true); - v3FirmwareButton.setOn(); + if (usingGanglionV3andMacOS) { + v3FirmwareButton.setOn(); + } else { + v3FirmwareButton.setOff(); + } v3FirmwareButton.onRelease(new CallbackListener() { public void controlEvent(CallbackEvent theEvent) { v2FirmwareButton.setOff(); diff --git a/OpenBCI_GUI/OpenBCI_GUI.pde b/OpenBCI_GUI/OpenBCI_GUI.pde index 0700084ae..34f8fe5cb 100644 --- a/OpenBCI_GUI/OpenBCI_GUI.pde +++ b/OpenBCI_GUI/OpenBCI_GUI.pde @@ -312,7 +312,7 @@ boolean isFFTFiltered = true; //yes by default ... this is used in dataProcessin StringBuilder globalScreenResolution; StringBuilder globalScreenDPI; -boolean usingGanglionV3andMacOS = true; +boolean usingGanglionV3andMacOS = false; //------------------------------------------------------------------------ // Global Functions