Merge branch 'pulsepalnew' of https://github.com/CINPLA/open-ephys-plugin-GUI into pulsepalnew

alejoe91 · alejoe91 · commit 74fc6ae2ea59 · 2017-12-14T08:44:57.000-08:00
diff --git a/Source/Plugins/PulsePalOutput/PulsePalOutputEditor.cpp b/Source/Plugins/PulsePalOutput/PulsePalOutputEditor.cpp
@@ -152,7 +152,7 @@ void ChannelTriggerInterface::paint(Graphics& g)
 
 void ChannelTriggerInterface::buttonClicked(Button* button)
 {
-    pulsePal->triggerChannel(channelNumber);
+    pulsePal->triggerChannel(channelNumber + 1);
 }
 
 void ChannelTriggerInterface::updateSources()

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ void ChannelTriggerInterface::paint(Graphics& g)`
`152`	`152`
`153`	`153`	`void ChannelTriggerInterface::buttonClicked(Button* button)`
`154`	`154`	`{`
`155`		`- pulsePal->triggerChannel(channelNumber);`
	`155`	`+ pulsePal->triggerChannel(channelNumber + 1);`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`void ChannelTriggerInterface::updateSources()`