Use new interfaces for thing registration.

Author: XDongger

client/pi/ashining/src/main/java/com/thefirstlineofcode/sand/client/pi/ashining/As32Ttl100LoraCommunicator.java

@@ -34,9 +34,9 @@ public class As32Ttl100LoraCommunicator extends AbstractCommunicator<LoraAddress
 	private static final String PROVIDER_PIGPIO_DIGITAL_OUTPUT = "pigpio-digital-output";
 	private static final String PROVIDER_PIGPIO_SERIAL = "pigpio-serial";
 
-	private static final int DEFAULT_MD0_PIN = 23;
-	private static final int DEFAULT_MD1_PIN = 24;
-	private static final int DEFAULT_AUX_PIN = 25;
+	private static final int DEFAULT_MD0_PIN = 2;
+	private static final int DEFAULT_MD1_PIN = 3;
+	private static final int DEFAULT_AUX_PIN = 4;
 
 	private static final String DEFAULT_SERIAL_ID = "uart";
 	private static final String DEFAULT_SERIAL_NAME = "Serial UART";

demo/server/src/main/java/com/thefirstlineofcode/sand/demo/server/ThingRegistrationCustomizer.java

@@ -0,0 +1,18 @@
+package com.thefirstlineofcode.sand.demo.server;
+
+import org.pf4j.Extension;
+
+import com.thefirstlineofcode.sand.server.things.ThingRegistrationCustomizerAdapter;
+
+@Extension
+public class ThingRegistrationCustomizer extends ThingRegistrationCustomizerAdapter {
+	private static final String HARD_CODED_REGISTRATION_CODE = "abcdefghijkl";
+	
+	@Override
+	public boolean isUnregisteredThing(String thingId, String registrationCode) {
+		if (!super.isUnregisteredThing(thingId, registrationCode))
+			return false;
+		
+		return HARD_CODED_REGISTRATION_CODE.equals(registrationCode);
+	}
+}

demo/things/lgsc-01/pi@192.168.1.180

@@ -87,7 +87,7 @@ private void run(String[] args) {
 		WebcamConfig webcamConfig = new WebcamConfig(dontRunWebrtcNativeService, webrtcNativeServicePath, requestedWebcamCapability);
 		ICommunicator<LoraAddress, LoraAddress, byte[]> communicator = null;
 		if (!disableLoraGateway)
-			communicator = new As32Ttl100LoraCommunicator();
+			communicator = createLoraCommunicator();
 
 		gatewayAndCamera = new LoraGatewayAndCamera(webcamConfig, communicator, disableCamera, disableLoraGateway, startConsole);
 		StandardStreamConfig mergedStreamConfig = mergeStreamConfig(gatewayAndCamera.getStreamConfig(), host, port, tlsPreferred);
@@ -96,6 +96,15 @@ private void run(String[] args) {
 		gatewayAndCamera.start();
 	}
 
+	private ICommunicator<LoraAddress, LoraAddress, byte[]> createLoraCommunicator() {
+		As32Ttl100LoraCommunicator loraCommunicator = new As32Ttl100LoraCommunicator();
+		loraCommunicator.setMd0Pin(2);
+		loraCommunicator.setMd1Pin(3);
+		loraCommunicator.setAuxPin(4);
+		
+		return loraCommunicator;
+	}
+
 	private StandardStreamConfig mergeStreamConfig(StandardStreamConfig streamConfig, String host, Integer port,
 			Boolean tlsPreferred) {
 		if (streamConfig == null) {

demo/things/lgsc-01/src/main/java/com/thefirstlineofcode/sand/demo/things/lgsc01/Main.java

@@ -5,6 +5,7 @@
 #include <debug.h>
 #include <mcu_board_adaptation.h>
 #include <radio_module_adaptation.h>
+#include <arduino_unique_id_generator.h>
 
 // For my Arduino Micro board.
 /*#define LED_PIN 5
@@ -25,15 +26,20 @@
 };
 enum SwitchState lastSwitchState;*/
 
+#define MODEL_NAME "SL-02"
+
 #define SWITCH_STATE_RED 0
 #define SWITCH_STATE_YELLOW 1
 #define SWITCH_STATE_GREEN 2
 
 uint8_t lastSwitchState;
 
 void setup() {
-  configureMcuBoard("SL-02");
+  configureMcuBoard(MODEL_NAME);
   configureRadioModule();
+  
+  registerThingIdLoader(loadThingId);
+  registerRegistrationCodeLoader(loadRegistrationCode);
 
   registerThingProtocolsConfigurer(configureThingProtocolsImpl);
 
@@ -44,6 +50,14 @@ void setup() {
   toBeAThing();
 }
 
+char *loadThingId() {
+  return generateThingIdUsingUniqueIdLibrary(MODEL_NAME);
+}
+
+char *loadRegistrationCode() {
+  return "abcdefghigkl";
+}
+
 bool isRedSwitchPressed() {
   int redSwitchState = digitalRead(SWITCH_RED_BUTTON_PIN);
   return redSwitchState == LOW;

demo/things/sl-02/sl-02.ino

@@ -4,20 +4,24 @@
 #include <thing.h>
 #include <mcu_board_adaptation.h>
 #include <radio_module_adaptation.h>
+#include <arduino_unique_id_generator.h>
 
 #include <OneWire.h>
 #include <DallasTemperature.h>
 
 #define TEMPERATURE_OUT_PIN 5
 
+#define MODEL_NAME "STR-01"
+
 OneWire oneWire(TEMPERATURE_OUT_PIN);
 DallasTemperature temperture(&oneWire);
 
 void setup() {
-  char modelName[] = "STR-01";
-  configureMcuBoard(modelName);
+  configureMcuBoard(MODEL_NAME);
   configureRadioModule();
 
+  // sresetThing();
+
   registerThingIdLoader(generateThingIdUsingUniqueIdLibrary);
   registerRegistrationCodeLoader(loadRegistrationCode);
 
@@ -27,6 +31,10 @@ void setup() {
   temperture.begin();
 }
 
+char *loadThingId() {
+  return generateThingIdUsingUniqueIdLibrary(MODEL_NAME);
+}
+
 char *loadRegistrationCode() {
   return "abcdefghigkl";
 }