modbusRTU with new wirelessSystem (notTested)

mods/eln/sixnode/modbusrtu/ModbusRtuElement.java

@@ -6,10 +6,12 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 
 import mods.eln.Eln;
 import mods.eln.misc.Direction;
 import mods.eln.misc.LRDU;
+import mods.eln.misc.Utils;
 import mods.eln.node.NodeBase;
 import mods.eln.node.six.SixNode;
 import mods.eln.node.six.SixNodeDescriptor;
@@ -19,6 +21,9 @@
 import mods.eln.sim.ThermalLoad;
 import mods.eln.sim.nbt.NbtElectricalGateInputOutput;
 import mods.eln.sim.nbt.NbtElectricalGateOutputProcess;
+import mods.eln.sixnode.wirelesssignal.IWirelessSignalSpot;
+import mods.eln.sixnode.wirelesssignal.WirelessUtils;
+import mods.eln.sixnode.wirelesssignal.tx.IWirelessSignalTx;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
@@ -68,12 +73,23 @@ public ModbusRtuElement(SixNode sixNode,Direction side,SixNodeDescriptor descrip
 
 
 
+	HashMap<String, HashSet<IWirelessSignalTx>> txSet = new HashMap<String, HashSet<IWirelessSignalTx>>();
+	HashMap<IWirelessSignalTx, Double> txStrength = new HashMap<IWirelessSignalTx, Double>();	
 
 
 	class ModbusRtuSlowProcess implements IProcess{
-
+		double sleepTimer = 0;
+
 		@Override
 		public void process(double time) {
+			sleepTimer -= time;
+			if(sleepTimer < 0){
+				sleepTimer += Utils.rand(1.2, 2);
+
+				IWirelessSignalSpot spot = WirelessUtils.buildSpot(getCoordonate(), null, 0);
+				WirelessUtils.getTx(spot, txSet, txStrength);
+			}
+
 			for (ServerWirelessRxStatus rx : wirelessRxStatusList.values()) {
 				if(rx.isConnected() != rx.connected){
 					rx.connected = ! rx.connected;

mods/eln/sixnode/modbusrtu/ServerWirelessRxStatus.java

@@ -5,6 +5,7 @@
 import com.google.common.base.CaseFormat;
 
 import mods.eln.misc.Utils;
+import mods.eln.sixnode.wirelesssignal.aggregator.BiggerAggregator;
 import mods.eln.sixnode.wirelesssignal.tx.IWirelessSignalTx;
 import mods.eln.sixnode.wirelesssignal.tx.WirelessSignalTxElement;
 
@@ -28,16 +29,13 @@ void delete(){
 	}
 
 	boolean isConnected(){
-		return false;
-		//0xEE return null != WirelessSignalTxElement.getBestTx(name, rtu.sixNode.coordonate);
+		return null != rtu.txSet.get(name);
 	}
 
+	BiggerAggregator aggregator = new BiggerAggregator();
 	double readWireless(){
-		/*IWirelessSignalTx tx = WirelessSignalTxElement.getBestTx(name, rtu.sixNode.coordonate);
-		if(tx == null) return 0;
-		return tx.getValue();*/
-		//0xEE
-		return 0;
+		if(isConnected() == false) return 0;
+		return aggregator.aggregate(rtu.txSet.get(name));
 	}