Merge pull request #1041 from OpenBCI/downgrade-processing-3

Downgrade to Processing 3

Author: retiutut

.travis.yml

@@ -29,16 +29,16 @@ install:
   - mkdir $TRAVIS_BUILD_DIR/temp; cd $TRAVIS_BUILD_DIR/temp
 
 ### ### LINUX ### ###
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then curl -O -L --insecure https://github.com/processing/processing4/releases/download/processing-1282-4.0b7/processing-4.0b7-linux-x64.tgz                 ;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then tar -xzvf processing-4.0b7-linux-x64.tgz                                                               ;fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export PATH=$TRAVIS_BUILD_DIR/temp/processing-4.0b7:$PATH                                          ;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then curl -O -L --insecure https://github.com/processing/processing/releases/download/processing-0269-3.5.3/processing-3.5.3-linux64.tgz                 ;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then tar -xzvf processing-3.5.3-linux64.tgz                                                               ;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export PATH=$TRAVIS_BUILD_DIR/temp/processing-3.5.3:$PATH                                          ;fi
   # copy libraries to linux location
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then mkdir -p $HOME/sketchbook/libraries/                                                               ;fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cp -a $TRAVIS_BUILD_DIR/OpenBCI_GUI/libraries/. $HOME/sketchbook/libraries/                        ;fi
 
 ### ### MAC ### ###
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then curl -O -L --insecure https://github.com/processing/processing4/releases/download/processing-1282-4.0b7/processing-4.0b7-macos-x64.zip                   ;fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then unzip processing-4.0b7-macos-x64.zip                                                                   ;fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then curl -O -L --insecure https://github.com/processing/processing/releases/download/processing-0269-3.5.3/processing-3.5.3-macosx.zip                   ;fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then unzip processing-3.5.3-macosx.zip                                                                   ;fi
   # Processing.app must be in this location for processing-java to work
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then mv Processing.app /Applications/Processing.app                                                       ;fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export PATH=$TRAVIS_BUILD_DIR/release_script/mac_only:$PATH                                          ;fi

CHANGELOG.md

@@ -6,10 +6,9 @@
 * Fix dropdown backgrounds in Networking Widget
 
 ### Improvements
-* Update to Processing 4 #674 #1025
 * Add new FilterUI to allow custom filters per channel #988
 * Add BrainFlow Streamer for File and Network to Control Panel #1007
-* Update to BrainFlow v4.9.0 and print version to console log #1028
+* Update to BrainFlow v4.9.0+ and print version to console log #1028
 * Update OpenBCI Logo #1010
 * Clarify Cyton Smoothing feature #1027
 * Set Cyton Smoothing on by default and increase communication with a popup and additional Help button #1026

OpenBCI_GUI/FilterUI.pde

@@ -402,7 +402,7 @@ class FilterUIPopup extends PApplet implements Runnable {
         }
     }
 
-    private void createOnOffButton(String name, final String text, int chan, int _x, int _y, int _w, int _h) {
+    private void createOnOffButton(String name, final String text, final int chan, int _x, int _y, int _w, int _h) {
         onOffButtons[chan] = createButton(cp5, name, text, _x, _y, _w, _h, 0, h2, 16, channelColors[chan%8], WHITE, BUTTON_HOVER, BUTTON_PRESSED, (Integer) null, -2);
         onOffButtons[chan].setCircularButton(true);
         onOffButtons[chan].onRelease(new CallbackListener() {

OpenBCI_GUI/GuiSettings.pde

@@ -132,7 +132,9 @@ class GuiSettings {
         List<String> foundKeys = new ArrayList<String>();
         Gson gson = new Gson();
         Map<String, Object> map = gson.fromJson(stringToSearch, new TypeToken<Map<String, Object>>() {}.getType());
-        map.forEach((x, y) -> foundKeys.add(x));
+        for (String mapKey : map.keySet()) {
+            foundKeys.add(mapKey);
+        }
 
         Collections.sort(valueKeys);
         Collections.sort(foundKeys);

OpenBCI_GUI/OpenBCI_GUI.pde

@@ -60,7 +60,7 @@ import http.requests.*;
 //                       Global Variables & Instances
 //------------------------------------------------------------------------
 //Used to check GUI version in TopNav.pde and displayed on the splash screen on startup
-String localGUIVersionString = "v5.1.0-alpha.7";
+String localGUIVersionString = "v5.1.0-alpha.8";
 String localGUIVersionDate = "April 2022";
 String guiLatestVersionGithubAPI = "https://api.github.com/repos/OpenBCI/OpenBCI_GUI/releases/latest";
 String guiLatestReleaseLocation = "https://github.com/OpenBCI/OpenBCI_GUI/releases/latest";

OpenBCI_GUI/TopNav.pde

@@ -354,7 +354,7 @@ class TopNav {
         filtersButton.setDescription("Here you can adjust the Filters that are applied to \"Filtered\" data.");
     }
 
-    private void createSmoothingButton(String text, int _x, int _y, int _w, int _h, PFont font, int _fontSize, color _bg, color _textColor) {
+    private void createSmoothingButton(String text, int _x, int _y, int _w, int _h, PFont font, int _fontSize, final color _bg, color _textColor) {
         SmoothingCapableBoard smoothBoard = (SmoothingCapableBoard)currentBoard;
         color bgColor = smoothBoard.getSmoothingActive() ? _bg : BUTTON_LOCKED_GREY;
         smoothingButton = createTNButton("smoothingButton", text, _x, _y, _w, _h, font, _fontSize, bgColor, _textColor);

OpenBCI_GUI/libraries/brainflow/library/brainflow.jar

@@ -95,6 +95,8 @@ Thank you so much (Danke schön! Merci beaucoup!) for visiting the project and w
 
 Follow the guide to [Run the OpenBCI GUI From Processing IDE][link_gui_run_from_processing]. If you find issues in the guide, please [suggest changes](https://github.com/OpenBCI/Docs/edit/master/OpenBCI%20Software/01-OpenBCI_GUI.md)!
 
+**Please use Processing 3.5.4 or 3.5.3 for all operating systems.**
+
 ### System Requirements
 #### Hardware
 - 1.6 GHz or faster processor

README.md

@@ -21,7 +21,7 @@ build: off
 
 init:
   # add processing-java to the path as well as mt.exe (release script uses it to modify the manifest.xml)
-  - cmd: set PATH=%APPVEYOR_BUILD_FOLDER%\temp\processing-4.0b7;C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\;%PATH%
+  - cmd: set PATH=%APPVEYOR_BUILD_FOLDER%\temp\processing-3.5.3;C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\;%PATH%
 
 install:
   # used for getting commit timestamp
@@ -34,8 +34,8 @@ install:
 
   - mkdir %APPVEYOR_BUILD_FOLDER%\temp
   - cd %APPVEYOR_BUILD_FOLDER%\temp
-  - appveyor DownloadFile https://github.com/processing/processing4/releases/download/processing-1282-4.0b7/processing-4.0b7-windows-x64.zip
-  - 7z x processing-4.0b7-windows-x64.zip -y -aoa
+  - appveyor DownloadFile https://github.com/processing/processing/releases/download/processing-0269-3.5.3/processing-3.5.3-windows64.zip
+  - 7z x processing-3.5.3-windows64.zip -y -aoa
   # cp libraries
   - mkdir %userprofile%\documents\processing\libraries
   - xcopy %APPVEYOR_BUILD_FOLDER%\OpenBCI_GUI\libraries\* %userprofile%\documents\processing\libraries /s /i /q

appveyor.yml

@@ -10,4 +10,4 @@ do
     fi
 done
 
-cd "/Applications/Processing.app/Contents/Java" && /Applications/Processing.app/Contents/PlugIns/jdk-17.0.2+8/Contents/Home/bin/java -Djna.nosys=true $OPTION_FOR_HEADLESS_RUN -cp "ant.jar:ant-launcher.jar:core.jar:jna.jar:pde.jar:jna-platform.jar:core/library/jogl-all.jar:core/library/gluegen-rt.jar:core/library/core.jar:modes/java/mode/com.ibm.icu.jar:modes/java/mode/org.eclipse.core.contenttype.jar:modes/java/mode/org.eclipse.core.jobs.jar:modes/java/mode/org.eclipse.text.jar:modes/java/mode/org.eclipse.jdt.compiler.apt.jar:modes/java/mode/antlr-4.7.2-complete.jar:modes/java/mode/org.eclipse.core.runtime.jar:modes/java/mode/jdtCompilerAdapter.jar:modes/java/mode/classpath-explorer-1.0.jar:modes/java/mode/org.eclipse.equinox.common.jar:modes/java/mode/org.netbeans.swing.outline.jar:modes/java/mode/org.eclipse.osgi.jar:modes/java/mode/JavaMode.jar:modes/java/mode/jsoup-1.7.1.jar:modes/java/mode/antlr.jar:modes/java/mode/org.eclipse.core.resources.jar:modes/java/mode/org.eclipse.jdt.core.jar:modes/java/mode/org.eclipse.equinox.preferences.jar" processing.mode.java.Commander "$@"
+cd "/Applications/Processing.app/Contents/Java" && /Applications/Processing.app/Contents/PlugIns/jdk1.8.0_202.jdk/Contents/Home/jre/bin/java -Djna.nosys=true $OPTION_FOR_HEADLESS_RUN -cp "ant.jar:ant-launcher.jar:core.jar:jna.jar:pde.jar:jna-platform.jar:core/library/gluegen-rt-natives-linux-armv6hf.jar:core/library/jogl-all-natives-linux-armv6hf.jar:core/library/gluegen-rt-natives-linux-aarch64.jar:core/library/jogl-all-natives-linux-aarch64.jar:core/library/gluegen-rt-natives-macosx-universal.jar:core/library/gluegen-rt-natives-linux-amd64.jar:core/library/jogl-all-natives-linux-i586.jar:core/library/gluegen-rt-natives-windows-i586.jar:core/library/jogl-all.jar:core/library/gluegen-rt-natives-linux-i586.jar:core/library/jogl-all-natives-linux-amd64.jar:core/library/gluegen-rt.jar:core/library/core.jar:core/library/jogl-all-natives-macosx-universal.jar:core/library/jogl-all-natives-windows-i586.jar:core/library/gluegen-rt-natives-windows-amd64.jar:core/library/jogl-all-natives-windows-amd64.jar:modes/java/mode/com.ibm.icu.jar:modes/java/mode/org.eclipse.core.contenttype.jar:modes/java/mode/org.eclipse.core.jobs.jar:modes/java/mode/org.eclipse.text.jar:modes/java/mode/org.eclipse.core.runtime.jar:modes/java/mode/jdtCompilerAdapter.jar:modes/java/mode/classpath-explorer-1.0.jar:modes/java/mode/jdi.jar:modes/java/mode/org.eclipse.equinox.common.jar:modes/java/mode/org.netbeans.swing.outline.jar:modes/java/mode/org.eclipse.osgi.jar:modes/java/mode/JavaMode.jar:modes/java/mode/jsoup-1.7.1.jar:modes/java/mode/antlr.jar:modes/java/mode/jdimodel.jar:modes/java/mode/org.eclipse.core.resources.jar:modes/java/mode/org.eclipse.jdt.core.jar:modes/java/mode/org.eclipse.equinox.preferences.jar" processing.mode.java.Commander "$@"