Merge remote-tracking branch 'origin/field' into improvement
# Conflicts: # src/main/java/ch/hevs/isi/field/FieldConnector.java
This commit is contained in:
		| @@ -2,6 +2,7 @@ package ch.hevs.isi.field; | ||||
|  | ||||
| import ch.hevs.isi.core.DataPoint; | ||||
| import ch.hevs.isi.core.DataPointListener; | ||||
| import ch.hevs.isi.core.FloatDataPoint; | ||||
|  | ||||
| import java.io.BufferedReader; | ||||
| import java.io.FileNotFoundException; | ||||
| @@ -12,12 +13,7 @@ import java.util.Timer; | ||||
| public class FieldConnector implements DataPointListener { | ||||
|     private static FieldConnector mySelf = null; | ||||
|     private FieldConnector(){ | ||||
|  | ||||
|         initialize("LocalHost",1502, "C:/Nils/Hesso/4_Semester/SIN/Minecraft_Electrical_Age_Project/ModbusMap.csv"); | ||||
|  | ||||
|         // Subscribe to the update of DataPoints | ||||
|         DataPointListener.subscribeUpdate(this); | ||||
|  | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|   | ||||
		Reference in New Issue
	
	Block a user