From 2ef440e45f453ede222adf9372659e46a976c265 Mon Sep 17 00:00:00 2001 From: AJ Keller Date: Thu, 5 Jan 2017 23:57:44 -0500 Subject: [PATCH] Finish conversion to Hub v0.3.0 --- OpenBCI_GUI/GanglionSync.pde | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/OpenBCI_GUI/GanglionSync.pde b/OpenBCI_GUI/GanglionSync.pde index 56108b7..79cc02b 100644 --- a/OpenBCI_GUI/GanglionSync.pde +++ b/OpenBCI_GUI/GanglionSync.pde @@ -278,12 +278,13 @@ class OpenBCI_Ganglion { } private void processAccel(String msg) { - // println(msg); String[] list = split(msg, ','); - for (int i = 0; i < NUM_ACCEL_DIMS; i++) { - accelArray[i] = Integer.parseInt(list[i + 2]); + if (Integer.parseInt(list[1]) == RESP_SUCCESS_DATA_ACCEL) { + for (int i = 0; i < NUM_ACCEL_DIMS; i++) { + accelArray[i] = Integer.parseInt(list[i + 2]); + } + newAccelData = true; } - newAccelData = true; } private void processConnect(String msg) { @@ -375,15 +376,17 @@ class OpenBCI_Ganglion { private void processImpedance(String msg) { String[] list = split(msg, ','); - int channel = Integer.parseInt(list[2]); - if (channel < 5) { //<>// - int value = Integer.parseInt(list[3]); - impedanceArray[channel] = value; - if (channel == 0) { - impedanceUpdated = true; - println("Impedance for channel reference is " + value + " ohms."); - } else { - println("? for channel " + channel + " is " + value + " ohms."); + if (Integer.parseInt(list[1]) == RESP_SUCCESS_DATA_IMPEDANCE) { + int channel = Integer.parseInt(list[2]); + if (channel < 5) { //<>// + int value = Integer.parseInt(list[3]); + impedanceArray[channel] = value; + if (channel == 0) { + impedanceUpdated = true; + println("Impedance for channel reference is " + value + " ohms."); + } else { + println("? for channel " + channel + " is " + value + " ohms."); + } } } }