Merge branch 'development' of github.com:open-ephys/plugin-GUI into development

Author: aacuevas

Source/Processors/Editors/GenericEditor.cpp

@@ -550,7 +550,7 @@ void GenericEditor::update()
             drawerButton->setVisible(true);
     }
 
-    
+
 
     updateVisualizer(); // does nothing unless this method
     // has been implemented
@@ -649,9 +649,9 @@ void GenericEditor::setChannelSelectionState(int chan, bool p, bool r, bool a)
 {
     if (!isSplitOrMerge)
     {
-        channelSelector->setParamStatus(chan+1, p);
-        channelSelector->setRecordStatus(chan+1, r);
-        channelSelector->setAudioStatus(chan+1, a);
+        channelSelector->setParamStatus(chan, p);
+        channelSelector->setRecordStatus(chan, r);
+        channelSelector->setAudioStatus(chan, a);
     }
 }
 
@@ -1438,4 +1438,3 @@ void ThresholdSlider::setValues(Array<double> v)
 {
 	valueArray = v;
 }
-

Source/Processors/GenericProcessor/GenericProcessor.cpp

@@ -1082,7 +1082,7 @@ void GenericProcessor::loadChannelParametersFromXml(XmlElement* channelInfo, Inf
 		{
 			if (subNode->hasTagName("SELECTIONSTATE"))
 			{
-				getEditor()->setChannelSelectionState(channelNum - 1,
+				getEditor()->setChannelSelectionState(channelNum,
 					subNode->getBoolAttribute("param"),
 					subNode->getBoolAttribute("record"),
 					subNode->getBoolAttribute("audio"));

Source/Processors/Serial/ofSerial.cpp

@@ -12,6 +12,9 @@
 #include <dirent.h>
 #endif
 
+#ifdef TARGET_LINUX
+	#include <linux/serial.h>
+#endif
 
 #pragma comment(lib, "setupapi.lib")
 #include <fcntl.h>
@@ -418,8 +421,21 @@ bool ofSerial::setup(string portName, int baud)
     options.c_cflag &= ~PARENB;
     options.c_cflag &= ~CSTOPB;
     options.c_cflag &= ~CSIZE;
+	options.c_iflag &= (tcflag_t) ~(INLCR | IGNCR | ICRNL | IGNBRK);
+	options.c_oflag &= (tcflag_t) ~(OPOST);
+	#if defined( TARGET_LINUX )
+		options.c_cflag |= CRTSCTS;
+		options.c_lflag &= ~(ICANON | ECHO | ISIG);
+	#endif
     options.c_cflag |= CS8;
     tcsetattr(fd,TCSANOW,&options);
+	#ifdef TARGET_LINUX
+		struct serial_struct kernel_serial_settings;
+		if (ioctl(fd, TIOCGSERIAL, &kernel_serial_settings) == 0) {
+			kernel_serial_settings.flags |= ASYNC_LOW_LATENCY;
+			ioctl(fd, TIOCSSERIAL, &kernel_serial_settings);
+		}
+	#endif
 
     bInited = true;
     printf("Success in opening serial connection!\n\n");