Grbl Polling preferences

cncgoko · May 2, 2017 · 1086ce9 · 1086ce9
1 parent 66e4ee2
commit 1086ce9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/org.goko.controller.grbl.commons/build.properties b/org.goko.controller.grbl.commons/build.properties
@@ -1,4 +1,5 @@
-source.. = src/
+source.. = src/,\
+           ui/
 output.. = bin/
 bin.includes = META-INF/,\
                .
diff --git a/...ller.grbl.commons/src/org/goko/controller/grbl/commons/AbstractGrblControllerService.java b/...ller.grbl.commons/src/org/goko/controller/grbl/commons/AbstractGrblControllerService.java
@@ -134,7 +134,7 @@ public AbstractGrblControllerService(S internalState, C configuration) throws Gk
 		this.actionFactory.createActions();
 		this.jogger = createJogger();
 		this.executor = createExecutor();
-		this.statusPoller = new GrblStatusPoller(this);
+		this.statusPoller = new GrblStatusPoller(this);		
 		getInternalState().setActivePolling(true);
 		this.pendingCommandsCount = new AtomicInteger(0);
 	}

diff --git a/org.goko.controller.grbl.commons/src/org/goko/controller/grbl/commons/GrblStatusPoller.java b/org.goko.controller.grbl.commons/src/org/goko/controller/grbl/commons/GrblStatusPoller.java
@@ -23,7 +23,7 @@ public class GrblStatusPoller {
 	/** Target service*/
 	private IGrblControllerService<?, ?> grblControllerService;
 	/** The polling period*/
-	private Time period = Time.valueOf(200, TimeUnit.MILLISECOND);
+	private Time period = Time.valueOf(100, TimeUnit.MILLISECOND);
 	/** Running state */
 	private boolean running;
 

diff --git a/org.goko.controller.grbl.v11/META-INF/MANIFEST.MF b/org.goko.controller.grbl.v11/META-INF/MANIFEST.MF
@@ -26,12 +26,12 @@ Require-Bundle: org.goko.core,
  org.eclipse.core.expressions;bundle-version="3.4.600",
  org.eclipse.e4.core.di.extensions,
  org.goko.gcode.rs274ngcv3,
- org.goko.controller.grbl.commons
+ org.goko.controller.grbl.commons,
+ javax.annotation;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: javax.annotation,
- org.eclipse.core.runtime;version="3.4.0",
- org.goko.core.execution.monitor.executor,
- org.osgi.framework;version="1.3.0",
+Import-Package: org.eclipse.core.runtime;version="3.4.0",
+ org.goko.core.execution.monitor.executor,
+ org.osgi.framework;version="1.3.0",
  org.osgi.service.event
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/Grbl11FeatureSetComponent.xml
diff --git a/org.goko.controller.grbl.v11/src/org/goko/controller/grbl/v11/GrblControllerService.java b/org.goko.controller.grbl.v11/src/org/goko/controller/grbl/v11/GrblControllerService.java
@@ -178,6 +178,7 @@ protected GrblExecutor createExecutor() {
 	 */
 	@Override
 	protected void startGrblService() {
+		getStatusPoller().setPeriod( Grblv11Preferences.getInstance().getPollingPeriod() );
 		getInternalState().addListener(this);
 	}