Merge branch 'testing' into development

Author: aacuevas

README.rst

@@ -19,7 +19,7 @@ If you want to add files to the core GUI, you'll have to do that through the "In
 New plugin developers can publish links to their work in `this list`_ to make them available to the general public.
 
 .. _source: https://github.com/julianstorer/juce
-.. _JUCE: http://www.rawmaterialsoftware.com/juce.php
+.. _JUCE: https://juce.com/
 .. _wiki: http://open-ephys.atlassian.net
 .. _different branches: https://open-ephys.atlassian.net/wiki/display/OEW/Using+Git
 .. _this list: https://open-ephys.atlassian.net/wiki/display/OEW/Third-party+plugin+repositories

Source/Plugins/BinaryWriter/BinaryRecording.cpp

@@ -521,13 +521,13 @@ void BinaryRecording::writeEvent(int eventIndex, const MidiMessage& event)
 	int64 ts = ev->getTimestamp();
 	rec->timestampFile->writeData(&ts, sizeof(int64));
 
-	uint16 chan = ev->getChannel();
+	uint16 chan = ev->getChannel() +1;
 	rec->channelFile->writeData(&chan, sizeof(uint16));
 
 	if (ev->getEventType() == EventChannel::TTL)
 	{
 		TTLEvent* ttl = static_cast<TTLEvent*>(ev.get());
-		int16 data = ttl->getChannel() * (ttl->getState() ? 1 : -1);
+		int16 data = (ttl->getChannel()+1) * (ttl->getState() ? 1 : -1);
 		rec->mainFile->writeData(&data, sizeof(int16));
 		if (rec->extraFile)
 			rec->extraFile->writeData(ttl->getTTLWordPointer(), info->getDataSize());
@@ -636,4 +636,4 @@ String BinaryRecording::jsonTypeValue(BaseType type)
 	default:
 		return String::empty;
 	}
-}
+}