1. Small refactoring. 2. Fixed several bugs of lora gateway emulator.

Author: XDongger

client/concentrator/src/main/java/com/thefirstlineofcode/sand/client/concentrator/Concentrator.java

@@ -305,7 +305,7 @@ protected <PA extends IAddress> void executeOnLanNode(Iq iq, Object action, bool
 		}
 
 		try {
-			if (lanTraceable) {			
+			if (lanTraceable) {
 				LanExecution lanExecution = new LanExecution(ThingsTinyId.createRequestId(0), action);
 				traceLanExecution(iq.getFrom(), iq.getTo(), iq.getId(), node, lanExecution, lanTimeout);
 				communicator.send((PA)node.getCommunicationNet().parse(node.getAddress()), ObxFactory.getInstance().toBinary(lanExecution));

client/lora-dac/src/main/java/com/thefirstlineofcode/sand/client/lora/dac/LoraDacClient.java

@@ -112,8 +112,7 @@ public void received(LoraAddress from, byte[] data) {
 				try {
 					Allocation allocation = (Allocation)obxFactory.toObject(data);
 					LoraAddress[] uplinkAddresses = getUplinkAddresses(allocation.getUplinkChannelBegin(),
-							allocation.getUplinkChannelEnd(), allocation.getUplinkAddressHighByte(),
-							allocation.getUplinkAddressLowByte());
+							allocation.getUplinkChannelEnd(), allocation.getUplinkAddress());
 					if (listener != null) {
 						listener.allocated(uplinkAddresses,
 								new LoraAddress(allocation.getAllocatedAddress()));
@@ -164,13 +163,13 @@ public void isConfigured(String thingId) {
 	}
 
 	private LoraAddress[] getUplinkAddresses(int gatewayUplinkChannelBegin, int gatewayUplinkChannelEnd,
-			byte gatewayUplinkAddressHighByte, byte gatewayUplinkAddressLowByte) {
+			byte[] gatewayUplinkAddress) {
 		int uplinkAddressesSize = gatewayUplinkChannelEnd - gatewayUplinkChannelBegin + 1;
 		LoraAddress[] addresses = new LoraAddress[uplinkAddressesSize];
 
 		for (int i = 0; i < uplinkAddressesSize; i++) {
-			addresses[i] = new LoraAddress(gatewayUplinkAddressHighByte,
-					gatewayUplinkAddressLowByte, (byte)(gatewayUplinkChannelBegin + i));
+			addresses[i] = new LoraAddress(gatewayUplinkAddress[0],
+					gatewayUplinkAddress[1], (byte)(gatewayUplinkChannelBegin + i));
 		}
 
 		return addresses;

client/lora-dac/src/main/java/com/thefirstlineofcode/sand/client/lora/dac/LoraDacService.java

@@ -58,8 +58,7 @@ public enum State {
 
 	private int uplinkChannelBegin;
 	private int uplinkChannelEnd;
-	private byte uplinkAddressHighByte;
-	private byte uplinkAddressLowByte;
+	private byte[] uplinkAddress;
 
 	private LoraAddress dacServiceAddress;
 	private byte thingCommunicationChannel;
@@ -302,8 +301,7 @@ protected Allocation allocate() {
 		Allocation allocation = new Allocation();
 		allocation.setUplinkChannelBegin(uplinkChannelBegin);
 		allocation.setUplinkChannelEnd(uplinkChannelEnd);
-		allocation.setUplinkAddressHighByte(uplinkAddressHighByte);
-		allocation.setUplinkAddressLowByte(uplinkAddressLowByte);
+		allocation.setUplinkAddress(uplinkAddress);
 
 		int nodeLanId = concentrator.getBestSuitedNewLanId();
 		nodeAllocatedAddress = new LoraAddress(new byte[] {0x0, Byte.parseByte(String.valueOf(nodeLanId)), thingCommunicationChannel});
@@ -543,13 +541,12 @@ public void setUplinkAddress(byte[] uplinkAddress) {
 		if (uplinkAddress == null || uplinkAddress.length != 2)
 			throw new IllegalArgumentException("Null or illegal uplink address.");
 
-		this.uplinkAddressHighByte = uplinkAddress[0];
-		this.uplinkAddressLowByte = uplinkAddress[1];
+		this.uplinkAddress = uplinkAddress;
 	}
 
 	@Override
 	public byte[] getUplinkAddress() {
-		return new byte[] {uplinkAddressHighByte, uplinkAddressLowByte};
+		return uplinkAddress;
 	}
 
 	@Override

client/lora-gateway/src/main/java/com/thefirstlineofcode/sand/client/lora/gateway/ChangeWorkingModeExecutor.java

@@ -3,11 +3,17 @@
 import com.thefirstlineofcode.basalt.xmpp.core.ProtocolException;
 import com.thefirstlineofcode.basalt.xmpp.core.stanza.Iq;
 import com.thefirstlineofcode.sand.client.actuator.IExecutor;
+import com.thefirstlineofcode.sand.client.actuator.IThingControllerAware;
 import com.thefirstlineofcode.sand.protocols.lora.gateway.ChangeWorkingMode;
 
-public class ChangeWorkingModeExecutor implements IExecutor<ChangeWorkingMode> {
+public class ChangeWorkingModeExecutor implements IExecutor<ChangeWorkingMode>,
+			IThingControllerAware<ILoraGateway> {
 	private ILoraGateway loraGateway;
 
+	public ChangeWorkingModeExecutor() {
+		this(null);
+	}
+	
 	public ChangeWorkingModeExecutor(ILoraGateway loraGateway) {
 		this.loraGateway = loraGateway;
 	}
@@ -17,4 +23,9 @@ public Object execute(Iq iq, ChangeWorkingMode changeWorkingMode) throws Protoco
 		loraGateway.setWorkingMode(changeWorkingMode.getWorkingMode());
 		return null;
 	}
+
+	@Override
+	public void setThingController(ILoraGateway loraGateway) {
+		this.loraGateway = loraGateway;
+	}
 }

client/lora-gateway/src/main/java/com/thefirstlineofcode/sand/client/lora/gateway/ILoraGateway.java

@@ -9,8 +9,8 @@
 import com.thefirstlineofcode.sand.protocols.thing.lora.LoraAddress;
 
 public interface ILoraGateway {
-	public static final byte DEFAULT_UPLINK_ADDRESS_HIGH_BYTE = 0x00;
-	public static final byte DEFAULT_UPLINK_ADDRESS_LOW_BYTE = 0x00;
+	public static final byte[] DEFAULT_DOWNLINK_ADDRESS = new byte[] {0x00, 0x00};
+	public static final byte[] DEFAULT_UPLINK_ADDRESS = new byte[] {0x00, 0x00};
 	public static final byte DEFAULT_THING_COMMUNICATION_CHANNEL = 0x17;
 
 	public enum Mode {

client/lora-gateway/src/main/java/com/thefirstlineofcode/sand/client/lora/gateway/LoraGateway.java

@@ -108,10 +108,15 @@ public ILoraDacService getDacService() {
 		if (dacService == null) {
 			INotificationService notificationService = chatServices.createApi(INotificationService.class);
 			INotifier notifier = notificationService.getNotifier();
-			dacService = new LoraDacService(downlinkCommunicator, 0, uplinkCommunicators.size() - 1,
-					new byte[] {DEFAULT_UPLINK_ADDRESS_HIGH_BYTE, DEFAULT_UPLINK_ADDRESS_LOW_BYTE},
-						getConcentrator(), notifier);
-			dacService.setThingCommunicationChannel(thingCommunicationChannel);
+			
+			if (uplinkCommunicators.size() == 1 && downlinkCommunicator == uplinkCommunicators.get(0)) {
+				dacService = new LoraDacService(downlinkCommunicator, thingCommunicationChannel, thingCommunicationChannel,
+						DEFAULT_UPLINK_ADDRESS, getConcentrator(), notifier);
+			} else {
+				dacService = new LoraDacService(downlinkCommunicator, 0, uplinkCommunicators.size() - 1,
+						DEFAULT_UPLINK_ADDRESS, getConcentrator(), notifier);
+				dacService.setThingCommunicationChannel(thingCommunicationChannel);
+			}
 		}
 
 		return dacService;
@@ -140,17 +145,16 @@ protected void doStart() {
 
 		try {
 			if (uplinkCommunicators.size() == 1 && downlinkCommunicator.equals(uplinkCommunicators.get(0))) {
-				downlinkCommunicator.changeAddress(new LoraAddress(
-						new byte[] {DEFAULT_UPLINK_ADDRESS_HIGH_BYTE, DEFAULT_UPLINK_ADDRESS_LOW_BYTE, 0x00}), false);
+				downlinkCommunicator.changeAddress(new LoraAddress(new byte[] {DEFAULT_DOWNLINK_ADDRESS[0],
+						DEFAULT_DOWNLINK_ADDRESS[1], thingCommunicationChannel}), false);
 			} else {
 				downlinkCommunicator.changeAddress(new LoraAddress(
-						new byte[] {DEFAULT_UPLINK_ADDRESS_HIGH_BYTE,
-								DEFAULT_UPLINK_ADDRESS_LOW_BYTE, thingCommunicationChannel}), false);
+						new byte[] {DEFAULT_DOWNLINK_ADDRESS[0], DEFAULT_DOWNLINK_ADDRESS[1],
+								thingCommunicationChannel}), false);
 
 				for (int i = 0; i < uplinkCommunicators.size(); i++) {
 					uplinkCommunicators.get(i).changeAddress(new LoraAddress(
-							new byte[] {DEFAULT_UPLINK_ADDRESS_HIGH_BYTE,
-									DEFAULT_UPLINK_ADDRESS_LOW_BYTE, (byte)i}), false);
+							new byte[] {DEFAULT_UPLINK_ADDRESS[0], DEFAULT_UPLINK_ADDRESS[1], (byte)i}), false);
 				}
 			}
 		} catch (CommunicationException e) {
@@ -230,8 +234,7 @@ public LoraAddress[] getUplinkAddresses() {
 		LoraAddress[] addresses = new LoraAddress[uplinkCommunicators.size()];
 
 		for (int i = 0; i < uplinkCommunicators.size(); i++) {
-			addresses[i] = new LoraAddress(DEFAULT_UPLINK_ADDRESS_HIGH_BYTE,
-					DEFAULT_UPLINK_ADDRESS_LOW_BYTE, (byte)i);
+			addresses[i] = new LoraAddress(DEFAULT_DOWNLINK_ADDRESS[0], DEFAULT_DOWNLINK_ADDRESS[0], (byte)i);
 		}
 
 		return addresses;

demo/mud_adaptations/mud_configuration/src/mud_configuration.h

@@ -1,12 +1,17 @@
 #ifndef MUD_CONFIGURATION_H
 #define MUD_CONFIGURATION_H
 
-// #define ENABLE_DEBUG 1
+#define ENABLE_DEBUG 1
 
 // For my two Arduino Micro boards.
-/*#define ARDUINO_MICRO 1
+#define ARDUINO_MICRO 1
 
-// STR-01
+// HLT
+#define LORA_CHIP_MD0_PIN 2
+#define LORA_CHIP_MD1_PIN 3
+#define LORA_CHIP_AUX_PIN 4
+
+/*// STR-01
 #define LORA_CHIP_MD0_PIN 2
 #define LORA_CHIP_MD1_PIN 3
 #define LORA_CHIP_AUX_PIN 4
@@ -16,7 +21,7 @@
 #define LORA_CHIP_MD0_PIN 11
 #define LORA_CHIP_MD1_PIN 12*/
 
-// For my Arduino UNO R3 board.
+/*// For my Arduino UNO R3 board.
 #define ARDUINO_UNO 1
 // #define USE_SOFTWARE_SERIAL 1
 #define LORA_CHIP_MD0_PIN 3
@@ -27,6 +32,6 @@
 // For my Arduino UNO R3 board.
 #define SOFTWARE_SERIAL_RX_PIN 11
 #define SOFTWARE_SERIAL_TX_PIN 12
-#endif
+#endif*/
 
 #endif

emulators/lora/lora-gateway/src/main/java/com/thefirstlineofcode/sand/emulators/lora/gateway/Gateway.java

@@ -250,8 +250,9 @@ public SimpleLight create() {
 
 	protected LoraCommunicator createGatewayCommunicator() {
 		ILoraChip chip = null;
-		chip = network.createChip(new LoraAddress(new byte[] {ILoraGateway.DEFAULT_UPLINK_ADDRESS_HIGH_BYTE,
-				ILoraGateway.DEFAULT_UPLINK_ADDRESS_LOW_BYTE,
+		chip = network.createChip(new LoraAddress(new byte[] {
+				ILoraGateway.DEFAULT_UPLINK_ADDRESS[0],
+				ILoraGateway.DEFAULT_UPLINK_ADDRESS[1],
 				ILoraGateway.DEFAULT_THING_COMMUNICATION_CHANNEL}));
 
 		return new LoraCommunicator(chip);

emulators/lora/simple-light/src/main/java/com/thefirstlineofcode/sand/emulators/lora/simple/light/SimpleLight.java

@@ -17,6 +17,8 @@
 import com.thefirstlineofcode.sand.protocols.things.simple.light.Flash;
 import com.thefirstlineofcode.sand.protocols.things.simple.light.SwitchState;
 import com.thefirstlineofcode.sand.protocols.things.simple.light.SwitchStateChanged;
+import com.thefirstlineofcode.sand.protocols.things.simple.light.TurnOff;
+import com.thefirstlineofcode.sand.protocols.things.simple.light.TurnOn;
 
 public class SimpleLight extends AbstractLoraThingEmulator implements ISimpleLightEmulator {
 	private static final SwitchState DEFAULT_SWITCH_STATE = SwitchState.OFF;
@@ -124,14 +126,30 @@ protected void doPowerOff() {
 	@Override
 	protected void processAction(Object action) throws ExecutionException {
 		if (action instanceof Flash) {
-			if (switchState != SwitchState.CONTROL)
-				throw new ExecutionException(ISimpleLight.ERROR_CODE_NOT_REMOTE_CONTROL_STATE);
-			
-			flash(((Flash)action).getRepeat());
+			processSimpleLightAction(action);
+		} else if (action instanceof TurnOn) {
+			processSimpleLightAction(action);
+		} else if (action instanceof TurnOff) {
+			processSimpleLightAction(action);
 		} else {
 			super.processAction(action);
 		}
 	}
+
+	private void processSimpleLightAction(Object action) throws ExecutionException {
+		if (switchState != SwitchState.CONTROL)
+			throw new ExecutionException(ISimpleLight.ERROR_CODE_NOT_REMOTE_CONTROL_STATE);
+		
+		if (action instanceof Flash) {
+			flash(((Flash)action).getRepeat());
+		} else if (action instanceof TurnOn) {
+			turnOn();
+		} else if (action instanceof TurnOff) {
+			turnOff();
+		} else {
+			throw new RuntimeException(String.format("Not a simple light action. Action type: %s.", action.getClass().getName()));
+		}
+	}
 
 	public void flash(int repeat) throws ExecutionException {
 		if (!isPowered() || batteryPower == 0)

protocols/bxmpp-extensions/src/main/resources/META-INF/lora-dac-bxmpp-extension.properties

@@ -5,10 +5,9 @@
 0x03=allocation
 0x04=uplink-channel-begin
 0x05=uplink-channel-end
-0x06=uplink-address-high-byte
-0x07=uplink-address-low-byte
-0x08=allocated-address
-0x09=allocated
-0x0a=configured
-0x0b=is-configured
-0x0c=not-configured
+0x06=uplink-address
+0x07=allocated-address
+0x08=allocated
+0x09=configured
+0x0a=is-configured
+0x0b=not-configured